diff options
-rw-r--r-- | audio/boodler/Makefile | 4 | ||||
-rw-r--r-- | audio/libtunepimp-old/Makefile | 2 | ||||
-rw-r--r-- | cad/gtkwave/Makefile | 5 | ||||
-rw-r--r-- | databases/pxlib/Makefile | 1 | ||||
-rw-r--r-- | devel/root/Makefile | 5 | ||||
-rw-r--r-- | lang/dylan/Makefile | 16 | ||||
-rw-r--r-- | lang/ecl/Makefile | 5 | ||||
-rw-r--r-- | lang/gnat/Makefile | 5 | ||||
-rw-r--r-- | lang/squeak-dev/Makefile | 5 | ||||
-rw-r--r-- | lang/squeak/Makefile | 5 | ||||
-rw-r--r-- | palm/jpilot/Makefile | 4 | ||||
-rw-r--r-- | security/courier-authlib/Makefile | 4 | ||||
-rw-r--r-- | www/c-icap/Makefile | 1 | ||||
-rw-r--r-- | x11-themes/phase/Makefile | 4 | ||||
-rw-r--r-- | x11-themes/qinx/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython26/Makefile | 4 |
16 files changed, 25 insertions, 49 deletions
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile index 4411226d7606..382b6a139288 100644 --- a/audio/boodler/Makefile +++ b/audio/boodler/Makefile @@ -7,7 +7,7 @@ PORTNAME= boodler PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.eblong.com/zarf/boodler/ DISTFILES= boodler-153.tar.gz boodler-snd-021902.tar.gz @@ -22,8 +22,6 @@ USE_PYTHON= yes DRIVER?= oss WRKSRC= ${WRKDIR}/${PORTNAME} BHOME= ${PREFIX}/share/boodler -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/share/boodler/boodle pre-everything:: @${ECHO} "" diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index e93650c000ce..1a350a34771e 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -33,8 +33,6 @@ USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/tunepimp-0.4 USE_LDCONFIG= ${PREFIX}/lib/tunepimp-0.4 post-patch: diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index d780839cae4d..6ab7ebf566be 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtkwave PORTVERSION= 2.0.0.p5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= cad MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/ @@ -22,8 +22,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk12 GNU_CONFIGURE= yes -USE_LDCONFIG= yes -LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave +USE_LDCONFIG= ${PREFIX}/lib/gtkwave DOCS= doc/*.html doc/*.png doc/*.ps EXAMPLES= examples/*.gz examples/*.vcd diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index 7e455aa024d7..ea534a91a614 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -25,7 +25,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib OPTIONS= DOCS "Build and install documentation" off diff --git a/devel/root/Makefile b/devel/root/Makefile index cac9ed048c98..4f88a00e43b7 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -7,7 +7,7 @@ PORTNAME= root PORTVERSION= 5.02.00 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel science math MASTER_SITES= ftp://root.cern.ch/root/ DISTNAME= ${PORTNAME}_v${PORTVERSION}.source @@ -83,8 +83,7 @@ CONFIGURE_ARGS= ${CONFIGURE_TARGET} \ --enable-xml \ --enable-xrootd -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/root %%PREFIX%%/lib/root/cint +USE_LDCONFIG= ${PREFIX}/lib/root ${PREFIX}/lib/root/cint MAN1= cint.1 g2root.1 g2rootold.1 h2root.1 hadd.1 makecint.1 MAN1+= memprobe.1 olbd.1 proofd.1 proofserv.1 rlibmap.1 MAN1+= rmkdepend.1 root-config.1 root.1 root.exe.1 rootcint.1 diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile index e28930e03052..60e6f9990e69 100644 --- a/lang/dylan/Makefile +++ b/lang/dylan/Makefile @@ -7,7 +7,7 @@ PORTNAME= dylan PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.gwydiondylan.org/downloads/src/tar/ \ http://www.gwydiondylan.org/downloads/binaries/FreeBSD/x86/ \ @@ -34,19 +34,21 @@ CONFIGURE_ARGS= --srcdir=${WRKSRC} --with-gc-prefix=${PREFIX} CONFIGURE_ENV= D2C="${WRKDIR}/d2c -p${WRKSRC}/d2c/compiler/platforms.descr" GCCVER!= gcc -dumpversion -PLIST_SUB= DYLANVER="${PORTVERSION}" +DYLANVER= ${PORTVERSION} .if ${GCCVER:M3.3*}!="" -PLIST_SUB+= DYLANARCH="x86-freebsd-elf-gcc33" +DYLANARCH= x86-freebsd-elf-gcc33 .elif ${GCCVER:M3.2*}!="" -PLIST_SUB+= DYLANARCH="x86-freebsd-elf-gcc32" +DYLANARCH= x86-freebsd-elf-gcc32 .else -PLIST_SUB+= DYLANARCH="x86-freebsd-elf-gcc" +DYLANARCH= x86-freebsd-elf-gcc .endif +PLIST_SUB= DYLANVER=${DYLANVER} +PLIST_SUB+= DYLANARCH=${DYLANARCH} + ONLY_FOR_ARCHS= i386 -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%% +USE_LDCONFIG= ${PREFIX}/lib/dylan/${DYLANVER}/${DYLANARCH} USE_GMAKE= yes GNU_CONFIGURE= yes MAKEFILE= GNUmakefile diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index 1e7f405dc655..2a73d5b79a85 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -7,7 +7,7 @@ PORTNAME= ecl PORTVERSION= 0.9l -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}s/${PORTNAME}s/${PORTVERSION} EXTRACT_SUFX= .tgz @@ -31,9 +31,6 @@ OPTIONS= ASDF "Enable ASDF building facility" on \ SOCKETS "Enable socket interface" on \ THREADS "Enable threading support" off -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/ecl - .include <bsd.port.pre.mk> .if ${ARCH} == "ia64" || ${ARCH} == "sparc64" diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile index 77603b43843e..1d132f113ec4 100644 --- a/lang/gnat/Makefile +++ b/lang/gnat/Makefile @@ -14,7 +14,7 @@ PORTNAME= gnat PORTVERSION= 2009 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL}:boot MASTER_SITE_SUBDIR= deischen/gcc/:boot @@ -120,8 +120,7 @@ MAKE_ENV+= ${COMPILE_DATA} PATH=${have_boot} WANT_SHAREDLIBS=yes .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib ${targlib} +USE_LDCONFIG= ${PREFIX}/lib ${targlib} LIBRARY_VERSION= 2009 PLIST_SUB+= SHAREDLIB="" .else diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile index 5cec2e667edc..219eb2ab808c 100644 --- a/lang/squeak-dev/Makefile +++ b/lang/squeak-dev/Makefile @@ -7,7 +7,7 @@ PORTNAME= squeak PORTVERSION= 3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang ################################################## MASTER_SITES= http://www.squeakvm.org/unix/release/ \ @@ -66,9 +66,6 @@ GNU_CONFIGURE= yes # be updated. SHAREMODE= 644 -# shared Libaries are to be installed in: -LDCONFIG_DIRS= ${PREFIX}/share/squeak/${VMVERSION} - FILES_TO_GZIP= ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \ ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 5cec2e667edc..219eb2ab808c 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -7,7 +7,7 @@ PORTNAME= squeak PORTVERSION= 3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang ################################################## MASTER_SITES= http://www.squeakvm.org/unix/release/ \ @@ -66,9 +66,6 @@ GNU_CONFIGURE= yes # be updated. SHAREMODE= 644 -# shared Libaries are to be installed in: -LDCONFIG_DIRS= ${PREFIX}/share/squeak/${VMVERSION} - FILES_TO_GZIP= ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \ ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile index 5f28790dd3b4..6579d853c13b 100644 --- a/palm/jpilot/Makefile +++ b/palm/jpilot/Makefile @@ -8,7 +8,7 @@ PORTNAME= jpilot PORTVERSION= 1.6.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= palm comms MASTER_SITES= http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \ http://jpilot.org/ @@ -25,8 +25,6 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE} -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/jpilot/plugins .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 3b9ba052d243..1d121347606b 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -7,6 +7,7 @@ PORTNAME= courier-authlib PORTVERSION= 0.63.0 +PORTREVISION= 1 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} @@ -40,8 +41,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PERL5= yes USE_SUBMAKE= yes -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME} +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} MAILOWN= courier MAILGRP= courier diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index f964eaedd1ad..61364961b1e7 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -20,7 +20,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= c_icap USE_AUTOTOOLS= libtool:22 -LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/c_icap SUB_FILES= pkg-install pkg-deinstall diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile index 36cf7c63ea06..8c61a50ec843 100644 --- a/x11-themes/phase/Makefile +++ b/x11-themes/phase/Makefile @@ -7,7 +7,7 @@ PORTNAME= phase PORTVERSION= 0.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-themes kde MASTER_SITES= http://www.usermode.org/code/ @@ -20,7 +20,5 @@ USE_KDEBASE_VER=3 USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes -USE_LDCONFIG= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include <bsd.port.mk> diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile index 69c62cce3f47..4ee6700fe0eb 100644 --- a/x11-themes/qinx/Makefile +++ b/x11-themes/qinx/Makefile @@ -7,7 +7,7 @@ PORTNAME= qinx PORTVERSION= 1.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-themes kde MASTER_SITES= http://www.usermode.org/code/ @@ -18,7 +18,5 @@ USE_KDEBASE_VER=3 USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes -USE_LDCONFIG= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include <bsd.port.mk> diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 5b79ca5672b3..6d431dec2d52 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxPython PORTVERSION= 2.6.3.3 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -98,7 +98,6 @@ PYDISTUTILS_BUILDARGS+= \ NO_HEADERS=1 \ NO_SCRIPTS=1 \ INSTALL_MULTIVERSION=0 -USE_LDCONFIG= yes . if defined(WITH_WXPYTHON_UNICODE) WX_UNICODE= yes @@ -111,7 +110,6 @@ PYDISTUTILS_BUILDARGS+= \ # plist substitutions and library dirs PLIST_SUB+= WX_PYTHON_DIR=${WX_PYTHON_DIR} -LDCONFIG_DIRS+= %%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/ .endif # !defined(WITH_COMMON_ONLY) |