FreeBSD Bugzilla – Attachment 105830 Details for
Bug 146365
[patch] converts LDCONFIG_DIRS to USE_LDCONFIG
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 12.49 KB, created by
Alex Kozlov
on 2010-05-07 01:40:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Alex Kozlov
Created:
2010-05-07 01:40:01 UTC
Size:
12.49 KB
patch
obsolete
>Index: Mk/bsd.gnustep.mk >@@ -534,11 +534,8 @@ > # > .if defined(USE_GNUSTEP_LDCONFIG) > .for i in ${USE_GNUSTEP_LDCONFIG} >-# don't remove INSTALLS_SHLIB, see ports/123042 >-#USE_LDCONFIG+= ${i} >-LDCONFIG_DIRS+= ${i} >+USE_LDCONFIG+= ${i} > .endfor >-INSTALLS_SHLIB= yes > .endif > > # eof >Index: arabic/libitl/Makefile >@@ -14,8 +14,7 @@ > COMMENT= An API abstraction to common Islamic calculations > > GNU_CONFIGURE= yes >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib/itl >+USE_LDCONFIG= ${PREFIX}/lib/itl > MAKE_JOBS_UNSAFE= yes > > .include <bsd.port.mk> >Index: audio/boodler/Makefile >@@ -22,8 +22,7 @@ > DRIVER?= oss > WRKSRC= ${WRKDIR}/${PORTNAME} > BHOME= ${PREFIX}/share/boodler >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/share/boodler/boodle >+USE_LDCONFIG= ${PREFIX}/share/boodler/boodle > > pre-everything:: > @${ECHO} "" >Index: audio/libtunepimp-old/Makefile >@@ -33,8 +33,6 @@ > 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: >Index: audio/xmms-infopipe/Makefile >@@ -21,12 +21,11 @@ > USE_GNOME= gtk12 > USE_GMAKE= yes > GNU_CONFIGURE= yes >-USE_LDCONFIG= yes >- > LIBDIR?= ${PREFIX}/lib/xmms/General >+USE_LDCONFIG= ${LIBDIR} >+ > SRCLIBDIR?= src/.libs > >-LDCONFIG_DIRS= %%LOCALBASE%%/lib/xmms/General > PLIST_FILES= lib/xmms/General/libinfopipe.so > > post-patch: >Index: cad/gtkwave/Makefile >@@ -22,8 +22,7 @@ > 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 >Index: databases/pxlib/Makefile >@@ -24,7 +24,6 @@ > CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib > > USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib > > OPTIONS= DOCS "Build and install documentation" off > >Index: deskutils/kdepim3/Makefile >@@ -32,8 +32,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde3 > CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ > --with-gpgsm=${LOCALBASE}/bin/gpgsm \ > --with-ssl-dir=${OPENSSLBASE} >Index: devel/asmutils/Makefile >@@ -20,8 +20,7 @@ > > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= ${PREFIX}/lib/asmutils >+USE_LDCONFIG= ${PREFIX}/lib/asmutils > > # This will play merry hell with portlint > BINS= bonus/asmutils basename cal cat chmod chown chroot cmp cp \ >Index: devel/root/Makefile >@@ -83,8 +83,7 @@ > --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 >Index: devel/sfslite/Makefile >@@ -45,8 +45,7 @@ > CONFIGURE_ARGS += --enable-system-bin > .endif # define(BUILD_MODE) > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}/${BUILD_MODE} >+USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${BUILD_MODE} > > CONFIGURE_ARGS+=--with-mode=${BUILD_MODE} > >Index: editors/kate-plugins/Makefile >@@ -26,8 +26,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: games/atlantikdesigner/Makefile >@@ -27,8 +27,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: games/kdegames3/Makefile >@@ -24,7 +24,6 @@ > USE_AUTOTOOLS= libtool:22 > > USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib > > CONFIGURE_ARGS= --disable-setgid > >Index: lang/dylan/Makefile >@@ -34,19 +34,21 @@ > 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 >Index: lang/ecl/Makefile >@@ -31,8 +31,7 @@ > SOCKETS "Enable socket interface" on \ > THREADS "Enable threading support" off > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib/ecl >+USE_LDCONFIG= ${PREFIX}/lib/ecl > > .include <bsd.port.pre.mk> > >Index: lang/gnat/Makefile >@@ -120,8 +120,7 @@ > 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 >Index: lang/squeak/Makefile >@@ -67,7 +67,7 @@ > SHAREMODE= 644 > > # shared Libaries are to be installed in: >-LDCONFIG_DIRS= ${PREFIX}/share/squeak/${VMVERSION} >+USE_LDCONFIG= ${PREFIX}/share/squeak/${VMVERSION} > > FILES_TO_GZIP= ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \ > ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes >Index: lang/squeak-dev/Makefile >@@ -67,7 +67,7 @@ > SHAREMODE= 644 > > # shared Libaries are to be installed in: >-LDCONFIG_DIRS= ${PREFIX}/share/squeak/${VMVERSION} >+USE_LDCONFIG= ${PREFIX}/share/squeak/${VMVERSION} > > FILES_TO_GZIP= ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \ > ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes >Index: mail/evolution/Makefile >@@ -28,8 +28,6 @@ > USE_AUTOTOOLS= libtool:22 > INSTALLS_OMF= yes > INSTALLS_ICONS= yes >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%% > CONFIGURE_ARGS= --enable-nss=yes \ > --enable-mono=no \ > --disable-nm \ >@@ -59,7 +57,6 @@ > .include <bsd.port.pre.mk> > > USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION} >-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" > > .if defined(WITH_PILOT) > LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot >Index: misc/compat3x/Makefile >@@ -27,8 +27,7 @@ > > TARGET_DIR= ${PREFIX}/lib/compat > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib/compat >+USE_LDCONFIG= ${TARGET_DIR} > > .include <bsd.port.pre.mk> > >Index: misc/kaddressbook-plugins/Makefile >@@ -29,8 +29,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/kdeedu3/Makefile >@@ -31,8 +31,7 @@ > CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} \ > --disable-ocamlsolver > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde3 > > .include "${.CURDIR}/../../x11/kde3/Makefile.kde" > >Index: misc/kfile-plugins/Makefile >@@ -26,8 +26,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/kicker-applets/Makefile >@@ -25,8 +25,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/knewsticker-scripts/Makefile >@@ -25,8 +25,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/konq-plugins/Makefile >@@ -25,8 +25,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/ksig/Makefile >@@ -25,8 +25,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: misc/renamedlgplugins/Makefile >@@ -25,8 +25,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: multimedia/kdemultimedia3/Makefile >@@ -39,8 +39,7 @@ > > CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" --disable-xinetest > CONFIGURE_ENV+= AKODE_CONFIG=${LOCALBASE}/bin/akode-config >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde3 > DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin > > OPTIONS= AKODE "Use akode for audio playback" on \ >Index: multimedia/noatun-plugins/Makefile >@@ -28,8 +28,7 @@ > USE_GMAKE= yes > USE_SDL= sdl > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > PLIST_SUB+= KDE_VER="${KDE_VERSION}" > >Index: palm/jpilot/Makefile >@@ -25,8 +25,7 @@ > 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 >+USE_LDCONFIG= ${PREFIX}/lib/jpilot/plugins > > .if !defined(WITHOUT_NLS) > USE_GETTEXT= yes >Index: security/courier-authlib/Makefile >@@ -40,8 +40,7 @@ > 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 >Index: sysutils/k3b/Makefile >@@ -23,8 +23,7 @@ > CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal > USE_GMAKE= yes > USE_CDRTOOLS= yes >-USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde3 > USE_KDELIBS_VER= 3 > INSTALLS_ICONS= yes > >Index: sysutils/kdeadmin3/Makefile >@@ -24,8 +24,7 @@ > USE_GMAKE= yes > USE_AUTOTOOLS= libtool:22 > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > post-patch: > ${REINPLACE_CMD} -e \ >Index: sysutils/kmilo/Makefile >@@ -27,8 +27,7 @@ > USE_GMAKE= yes > WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION} > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde3 > > pre-configure: > ${ECHO_CMD} ${PORTNAME} > ${WRKSRC}/inst-apps >Index: textproc/lemmatizer/Makefile >@@ -29,7 +29,6 @@ > CONFIGURE_ARGS= --with-datadir=${DB_DIR} > > USE_LDCONFIG= yes >-LDCONFIG_DIRS= %%PREFIX%%/lib > > pre-fetch: > @${ECHO} "" >Index: www/c-icap/Makefile >@@ -17,10 +17,9 @@ > COMMENT= An implementation of an ICAP server > > GNU_CONFIGURE= yes >-USE_LDCONFIG= yes >+USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/c_icap > USE_RC_SUBR= c_icap > USE_AUTOTOOLS= libtool:22 >-LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/c_icap > > SUB_FILES= pkg-install pkg-deinstall > >Index: x11-clocks/kdetoys3/Makefile >@@ -24,8 +24,7 @@ > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes > >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > .include "${.CURDIR}/../../x11/kde3/Makefile.kde" > .include <bsd.port.pre.mk> >Index: x11-themes/kdeartwork3/Makefile >@@ -27,8 +27,7 @@ > USE_GMAKE= yes > > USE_AUTOTOOLS= libtool:22 >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > .include "${.CURDIR}/../../x11/kde3/Makefile.kde" > .include <bsd.port.pre.mk> >Index: x11-themes/phase/Makefile >@@ -20,7 +20,6 @@ > USE_BZIP2= yes > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > .include <bsd.port.mk> >Index: x11-themes/qinx/Makefile >@@ -18,7 +18,6 @@ > USE_BZIP2= yes > USE_AUTOTOOLS= libtool:22 > USE_GMAKE= yes >-USE_LDCONFIG= yes >-LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 >+USE_LDCONFIG= ${PREFIX}/lib/kde3 > > .include <bsd.port.mk> >Index: x11-toolkits/py-wxPython26/Makefile >@@ -98,7 +98,7 @@ > NO_HEADERS=1 \ > NO_SCRIPTS=1 \ > INSTALL_MULTIVERSION=0 >-USE_LDCONFIG= yes >+USE_LDCONFIG= ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/wx > > . if defined(WITH_WXPYTHON_UNICODE) > WX_UNICODE= yes >@@ -111,7 +111,6 @@ > > # 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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 146365
: 105830 |
105831