diff options
| author | tijl <tijl@FreeBSD.org> | 2014-06-11 14:49:59 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-06-11 14:49:59 +0000 |
| commit | 67f12d415fec83113a7ddfbc9655db98b4e70a28 (patch) | |
| tree | c4f78cbaf45ab044db3e157be708afd711a4e841 | |
| parent | 2088f53b95d04c86b1aece3d66aaca36ec5aaec2 (diff) | |
| download | FreeBSD-ports-67f12d415fec83113a7ddfbc9655db98b4e70a28.zip FreeBSD-ports-67f12d415fec83113a7ddfbc9655db98b4e70a28.tar.gz | |
Support LIBS like LDFLAGS.
- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV.
- Add an option helper for LIBS.
- Adjust all ports that already use LIBS. Also remove references to
PTHREAD_CFLAGS and PTHREAD_LIBS while here.
- Some ports did not support having a LIBS environment variable and
required additional patches.
Somewhat simplified a linker command line looks like:
${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS}
where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and
LIBS can be controlled by us. If possible -L and -l flags need to be
added to LIBS to make sure they appear after any -L and -l flags set by
upstream. Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this
may appear too early on the command line causing installed libraries to
be linked in instead of freshly built ones.
Additional changes:
benchmarks/netio: Replace WITH_IPV6 with an IPV6 option.
comms/gnokii: Replace some patches with USES=pathfix. Also remove -fPIC.
graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR.
graphics/visionworkbench: Remove FreeBSD 7 support.
multimedia/libmovtar: New LIB_DEPENDS syntax.
multimedia/opencinematools: Use standard do-build.
net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins)
net-mgmt/nagios: Remove -fPIC.
net-mgmt/nagios4: Remove -fPIC.
print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036.
security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with
ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS. This skips a test
in configure that falsely detects pthread_mutexattr_init in our libc.
sysutils/dar: Fix iconv detection.
x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD
hack and use $CXX as linker as on other platforms.
PR: 190592
Exp-run by: antoine
Approved by: portmgr (antoine)
297 files changed, 620 insertions, 850 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 9f9abeb..714ea84 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -114,7 +114,7 @@ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin MOZ_EXPORT+= ${CONFIGURE_ENV} \ - LIBS="${LIBS}" PERL="${PERL}" + PERL="${PERL}" MOZ_OPTIONS+= --prefix="${PREFIX}" CPPFLAGS+= -isystem${LOCALBASE}/include diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 129d2cf..61bd0a4 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -104,11 +104,11 @@ # FOO=bar,baz and you'll get USE_FOO=bar baz # # For each of: -# ALL_TARGET CATEGORIES CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD -# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES FLAGS -# INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS -# PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will add its -# content to the actual variable when the option is enabled. Defining +# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD +# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES +# INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES +# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will +# add its content to the actual variable when the option is enabled. Defining # ${opt}_${variable}_OFF will add its content to the actual variable when the # option is disabled. # @@ -131,7 +131,7 @@ OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \ - EXTRA_PATCHES INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV \ + EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \ PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \ USES _OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index be3e44b..a21f6e8 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2032,7 +2032,7 @@ MAKE_ENV+= PREFIX=${PREFIX} \ LIBDIR="${LIBDIR}" \ CC="${CC}" CFLAGS="${CFLAGS}" \ CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ MANPREFIX="${MANPREFIX}" @@ -3629,7 +3629,7 @@ do-configure: ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_LIB="${INSTALL_LIB}" \ diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 996aa35..399f4f0 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -28,7 +28,7 @@ MAKE_ENV= OLD_PO_FILE_INPUT=1 OPTIONS_SUB= yes NLS_USES= gettext NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}" +NLS_LIBS= -L${LOCALBASE}/lib -lintl ${ICONV_LIB} NLS_CONFIGURE_ENABLE= nls post-patch: diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile index a14921a..1a08cf6 100644 --- a/astro/cfitsio/Makefile +++ b/astro/cfitsio/Makefile @@ -23,8 +23,8 @@ OPTIONS_DEFINE= DOCS ALL_TARGET= libcfitsio.a shared CFLAGS+= -I${INCLUDEDIR} +LIBS+= -L${LIBDIR} -lz CONFIGURE_ARGS= ac_cv_prog_FC=f2c -CONFIGURE_ENV= LIBS="-L${LIBDIR} -lz" GNU_CONFIGURE= yes MAKE_ARGS= ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c" USE_LDCONFIG= yes diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index 2c60c3b..a56edee 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -21,8 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ -CONFIGURE_ENV= LIBS="-lcompat" CPPFLAGS+= -I${LOCALBASE}/include/GL -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lm +LIBS+= -L${LOCALBASE}/lib -lm -lcompat .include <bsd.port.mk> diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile index 7415be6..4adfe6d 100644 --- a/astro/roadmap/Makefile +++ b/astro/roadmap/Makefile @@ -52,6 +52,9 @@ post-patch: s|/usr/include|${LOCALBASE}/include|g ; \ s|/usr/local/include|${LOCALBASE}/include|g ; \ s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/src/options.mk + @${ECHO_CMD} 'CFLAGS=${CFLAGS}' > ${WRKSRC}/src/overrides.mk + @${ECHO_CMD} 'LDFLAGS=${LDFLAGS}' >> ${WRKSRC}/src/overrides.mk + @${ECHO_CMD} 'LIBS=${LIBS}' >> ${WRKSRC}/src/overrides.mk do-install: .for _BIN in ${BINS} diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index d9cf113..d231b64 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -14,8 +14,8 @@ GNU_CONFIGURE= yes USES= iconv USE_XORG= xt xscrnsaver CONFIGURE_ARGS= --with-map-extension=jpg -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lm" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= FREETYPE PANGO GIF JPEG PNG PNM TIFF OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 2fe0511..249ff39 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -21,9 +21,9 @@ GNU_CONFIGURE= yes USES= gmake pkgconfig gettext iconv shebangfix tar:bzip2 desktop-file-utils \ libtool USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-alsa --disable-nullout \ - CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl" +CONFIGURE_ARGS= --disable-alsa --disable-nullout +CPPFLAGS+= -I../dumb/dumb-kode54/include -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lexecinfo -lintl WANT_GNOME= yes INSTALLS_ICONS= yes CONFIGURE_ENV+= CONFIG_SHELL="${LOCALBASE}/bin/bash" diff --git a/audio/fdk-aac/Makefile b/audio/fdk-aac/Makefile index 7b6a45b..20b0595 100644 --- a/audio/fdk-aac/Makefile +++ b/audio/fdk-aac/Makefile @@ -17,7 +17,7 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON= not yet ported to this architecture -CONFIGURE_ENV= LIBS="-lm" +LIBS+= -lm GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= pathfix diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 41a5815..5fb2cd5 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -37,11 +37,9 @@ CONFIGURE_WRKSRC= ${WRKDIR}/festival USES= gmake SPEECHTOOLS= ${WRKSRC}/speech_tools FESTIVAL= ${WRKSRC}/festival -MAKE_ENV+= GCC="${CC}" \ - GXX="${CXX}" \ - EST_HOME=${SPEECHTOOLS} \ - EGCS_CC="${CC}" \ - EGCS_CXX="${CXX}" +MAKE_ARGS+= CC="${CC}" GCC="${CC}" \ + CXX="${CXX}" GXX="${CXX}" \ + EST_HOME=${SPEECHTOOLS} WRKSRC= ${WRKDIR} SPT_PATCHES= base__class_EST__TVector.cc \ @@ -60,14 +58,13 @@ SPT_PATCHES= base__class_EST__TVector.cc \ do-build: .for d in speech_tools festival - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile \ - ${MAKE_ARGS} + ${MAKE_CMD} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile ${MAKE_ARGS} .endfor # Can not make test in `festival', because the voices may not be installed # XXX: this should fail, if the verdict is not "CORRECT"... post-build test: - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test + ${MAKE_CMD} -C ${WRKDIR}/speech_tools test # The below is needed, because Debian's patches expect a different # directory-name @@ -96,8 +93,8 @@ CONFIGURE_ARGS+=--disable-$m do-configure: .for d in speech_tools festival @cd ${WRKDIR}/$d && \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}; then \ ${ECHO_CMD} "===> configuration script for $d failed."; \ ${FALSE}; \ @@ -105,8 +102,9 @@ do-configure: # This step helps non-i386 systems and is harmless on i386 -${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH}_unknown.mak .endfor - ${REINPLACE_CMD} -E -e 's,^(CC|CXX) *=,\1 ?=,' \ - -e 's,^(CFLAGS|CXXFLAGS) *=,\1 +=,' \ + ${REINPLACE_CMD} \ + -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \ + -e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \ -e 's,^OPTIMI,#OPTIMI,' \ ${WRKSRC}/speech_tools/config/compilers/gcc*.mak # This step helps to use a compiler, the vendor has not seen before: diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile index cd2ef0f..15f3c53 100644 --- a/audio/firefly/Makefile +++ b/audio/firefly/Makefile @@ -24,10 +24,8 @@ LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg \ GNU_CONFIGURE= yes NO_STAGE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \ --enable-sqlite3 --enable-oggvorbis --enable-flac diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 04b09b3..55cdb5a 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -20,11 +20,10 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= gmake pathfix pkgconfig libtool:keepla -CONFIGURE_ENV= LIBS="-pthread" CONFIGURE_ARGS= --enable-portaudio \ --with-default-tmpdir=/tmp CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib LATEST_LINK= jack diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index 43d6c75..91aa6bf 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -20,12 +20,11 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \ --with-boost-thread=boost_thread -CONFIGURE_ENV+= "LIBS=-lboost_system" PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lboost_system .include <bsd.port.options.mk> diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile index a11a235..dda730b 100644 --- a/audio/playgsf/Makefile +++ b/audio/playgsf/Makefile @@ -19,8 +19,6 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= LIBS="${LDFLAGS}" -CONFIGURE_ENV+= LIBS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-ccore --disable-optimisations PLIST_FILES= bin/playgsf @@ -29,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 PORTSCOUT= skipv:0.7.2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} >= 901000 EXTRA_PATCHES= ${FILESDIR}/extrapatch-VBA__Util.cpp @@ -37,19 +35,20 @@ EXTRA_PATCHES= ${FILESDIR}/extrapatch-VBA__Util.cpp post-patch: @${REINPLACE_CMD} \ - -e 's|\(@LDFLAGS@\)|\1 ${LDFLAGS}|' \ -e 's|\([[:space:]]*\).*configure.*|\1@true|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|^\(CFLAGS="\)\(-DLINUX\)|\1${CFLAGS} \2|' \ + @${REINPLACE_CMD} \ + -e '/^CFLAGS="-DLINUX/s|"$$| ${CFLAGS}"|' \ + -e '/^LDFLAGS="-lz/s|"$$| ${LDFLAGS}"|' \ ${WRKSRC}/configure post-configure: - @(cd ${WRKSRC}/libresample-0.1.3; ./configure ${CONFIGURE_ENV}) + @(cd ${WRKSRC}/libresample-0.1.3 && ${SETENV} \ + CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + ${CONFIGURE_ENV} ./configure) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -post-install: - ${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 1a3f126..09b3e04 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -35,10 +35,9 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ OPENSSL_CFLAGS="-I/usr/include" \ OPENSSL_LIBS="-lcrypto -lssl" \ - LIBS="-lm -lintl" \ ac_cv_header_linux_input_h= CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm -lintl .if ${CC} == clang CFLAGS+= -fheinous-gnu-extensions diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 64b131c..737782a 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -36,10 +36,9 @@ CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \ INSTALLS_ICONS= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-lm" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm GCONF_SCHEMAS= rhythmbox.schemas diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 5a7ea83..d77645a 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INFO= RPLAY RPTP librplay rplayd diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index 27d8616..aa14603 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -19,9 +19,9 @@ LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" \ - LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/spiralmodular-0.2.2 diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile index 72c534e..3ad5097 100644 --- a/benchmarks/dbench/Makefile +++ b/benchmarks/dbench/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt LICENSE= GPLv3 CFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--datadir=${DATADIR} post-install: diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile index 1c168bf..82ed98d 100644 --- a/benchmarks/netio/Makefile +++ b/benchmarks/netio/Makefile @@ -15,23 +15,26 @@ WRKSRC= ${WRKDIR} USES= gmake zip PLIST_FILES= bin/netio -CFLAGS+= -DUNIX ${PTHREAD_CFLAGS} -MAKE_ENV+= OUT="-o" LIBS=${PTHREAD_LIBS} -.if defined(WITH_IPV6) -PLIST_FILES+= bin/netio6 -.endif +CFLAGS+= -DUNIX +LIBS+= -pthread +MAKE_ENV+= OUT=-o + +OPTIONS_DEFINE= IPV6 +IPV6_PLIST_FILES= bin/netio6 + +.include <bsd.port.options.mk> do-build: - cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${GMAKE} all -.if defined(WITH_IPV6) - cd ${WRKSRC}; \ - ${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${GMAKE} all + @(cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all) +.if ${PORT_OPTIONS:MIPV6} + @(cd ${WRKSRC} && \ + ${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all) .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} ${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin .endif diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile index 892ed64..11d3ed9 100644 --- a/chinese/oto/Makefile +++ b/chinese/oto/Makefile @@ -12,7 +12,7 @@ COMMENT= Show you font info and add new 'name' and 'cmap' tables USES= gmake iconv GNU_CONFIGURE= YES CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} post-patch: @${FIND} ${WRKSRC}/src/ -type f -print0 | \ diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile index 922de0d..23e6e66 100644 --- a/chinese/reciteword/Makefile +++ b/chinese/reciteword/Makefile @@ -17,10 +17,10 @@ COMMENT= Education software to help people to study English LIB_DEPENDS= libespeak.so:${PORTSDIR}/audio/espeak GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" USES= tar:bzip2 gettext gmake pkgconfig USE_GNOME= gtk20 esound -CPPFLAGS+= "-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO readme.txt diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile index fbc8d51..70a215e 100644 --- a/comms/gmfsk/Makefile +++ b/comms/gmfsk/Makefile @@ -15,10 +15,8 @@ COMMENT= The Gnome MFSK terminal program LIB_DEPENDS= libfftw.so:${PORTSDIR}/math/fftw GNU_CONFIGURE= yes -# This is pure evil but it looks like autoconf 2.53 has a bug in linking the -# preprocessor include tests. The following line is a work around. -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES_CSTD= gnu89 USES= gmake pkgconfig USE_GNOME= libgnomeui gnomehack gnomeprefix diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 1c77a47..77a7dd2 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -19,19 +19,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser GROUPS= ${PORTNAME} -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_CSTD= gnu89 -WANT_GNOME= yes USE_GNOME= intltool GNU_CONFIGURE= yes -CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fPIC CONFIGURE_ARGS+= --enable-security -CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \ - XGETTEXT="${LOCALBASE}/bin/xgettext" \ - LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \ - PKG_CONFIG="${LOCALBASE}/bin/pkg-config" -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES+= pkg-message PORTDOCS= * diff --git a/comms/gnokii/files/patch-common-Makefile.in b/comms/gnokii/files/patch-common-Makefile.in deleted file mode 100644 index 31358b6..0000000 --- a/comms/gnokii/files/patch-common-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- common/Makefile.in.orig 2008-02-23 17:18:24.000000000 +0100 -+++ common/Makefile.in 2008-02-23 17:18:53.000000000 +0100 -@@ -318,7 +318,8 @@ - $(DATA_DIR) - - pkgconfig_DATA = gnokii.pc --pkgconfigdir = $(libdir)/pkgconfig -+libdatadir = $(libdir)data -+pkgconfigdir = $(libdatadir)/pkgconfig - libgnokii_la_CPPFLAGS = -DLIBDIR="\"$(libdir)\"" - libgnokii_la_CFLAGS = -I$(top_srcdir)/include - libgnokii_la_SOURCES = \ diff --git a/comms/gnokii/files/patch-xgnokii-Makefile.in b/comms/gnokii/files/patch-xgnokii-Makefile.in index 75dd784..1a8f094 100644 --- a/comms/gnokii/files/patch-xgnokii-Makefile.in +++ b/comms/gnokii/files/patch-xgnokii-Makefile.in @@ -9,13 +9,3 @@ am__DEPENDENCIES_1 = xgnokii_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la \ -@@ -360,7 +360,8 @@ - #FIXME install help - HELP_DIR = docs/help - pkgconfig_DATA = xgnokii.pc --pkgconfigdir = $(libdir)/pkgconfig -+libdatadir = $(libdir)data -+pkgconfigdir = $(libdatadir)/pkgconfig - desktop_in_files = xgnokii.desktop.in - desktopdir = $(datadir)/applications - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 5c79682..87d6964 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -19,8 +19,8 @@ USE_GNOME= libxml2 USE_PYTHON= yes USE_AUTOTOOLS= autoconf libtool libltdl USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-perl-binding \ --enable-tcl-binding --with-tcl=${TCL_LIBDIR} \ --with-python-binding --without-rigmatrix diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index 56ce1e1..48185ce 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -20,13 +20,12 @@ NLS_CONFIGURE_ENABLE= nls USES= iconv CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lcurses GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-dfl-baud=57600 \ --sysconfdir=${PREFIX}/etc/minicom \ --enable-lock-dir=/var/spool/lock \ --enable-dfl-port=/dev/cuau0 -MAKE_ARGS+= LIBS+="${ICONV_LIB} -lcurses" .include <bsd.port.pre.mk> diff --git a/comms/nokryptia/Makefile b/comms/nokryptia/Makefile index ce7ddb2..058ed25 100644 --- a/comms/nokryptia/Makefile +++ b/comms/nokryptia/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libid3.so:${PORTSDIR}/audio/id3lib GNU_CONFIGURE= yes USE_BZIP2= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/nokryptia man/man1/${PORTNAME}.1.gz diff --git a/comms/predict/Makefile b/comms/predict/Makefile index 86dc781..88af522 100644 --- a/comms/predict/Makefile +++ b/comms/predict/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 INSTALL_TARGET= install install.man -MAKE_ENV= LIBS="${PTHREAD_LIBS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h diff --git a/comms/predict/files/Makefile b/comms/predict/files/Makefile index 35b8406..3385bbb 100644 --- a/comms/predict/files/Makefile +++ b/comms/predict/files/Makefile @@ -16,7 +16,7 @@ CFLAGS = -O2 default: all all: predict vocalizer/vocalizer -LIBS += -lm -lncurses +LIBS = ${LDFLAGS} -pthread -lm -lncurses predict: predict.c predict.h ${CC} ${CFLAGS} -o predict predict.c ${LIBS} diff --git a/converters/fix-mime-charset/Makefile b/converters/fix-mime-charset/Makefile index 1f678d1..2b3ad4b 100644 --- a/converters/fix-mime-charset/Makefile +++ b/converters/fix-mime-charset/Makefile @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes USES= perl5 USE_PERL5= build -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/fix-mime-charset \ man/man1/fix-mime-charset.1.gz diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index c964d19..14ed2a1 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \ libdjvulibre.so:${PORTSDIR}/graphics/djvulibre GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS=-pthread -CPPFLAGS+= -I${LOCALBASE}/include USES= compiler:c++11-lang gmake pkgconfig PLIST_FILES= bin/pdf2djvu man/man1/pdf2djvu.1.gz diff --git a/converters/rcctools/Makefile b/converters/rcctools/Makefile index 1706fde..8441e79 100644 --- a/converters/rcctools/Makefile +++ b/converters/rcctools/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= librcc.so:${PORTSDIR}/devel/librcc USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/rcc-recode diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile index 2eb9c3a..1fe1d3e 100644 --- a/databases/dbtool/Makefile +++ b/databases/dbtool/Makefile @@ -24,8 +24,8 @@ EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake REINPLACE_ARGS= -i "" diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index d02b965..1a5af6c 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ USES= pkgconfig gettext iconv tar:bzip2 USE_PYTHON= yes -CXXFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl +LIBS+= -L${LOCALBASE}/lib -largp -lintl USE_AUTOTOOLS= libtool CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index 28bcffd..8b2e6cd 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -19,9 +19,6 @@ USES= gmake libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-isqlxx -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" -CXXFLAGS+= ${PTHREAD_CFLAGS} -CPPFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET= install-strip LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile index 015ca63..6fe1deb 100644 --- a/databases/oracle_odbc_driver/Makefile +++ b/databases/oracle_odbc_driver/Makefile @@ -22,8 +22,8 @@ ORACLE_HOME= ${LOCALBASE}/oracle8-client GNU_CONFIGURE= yes CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" \ - LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\ AUTOHEADER=true +LIBS+= `${CAT} ${ORACLE_HOME}/lib/sysliblist` USE_LDCONFIG= yes USE_AUTOTOOLS= libtool diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 5813932..267a356 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -18,8 +18,6 @@ IGNORE_WITH_PGSQL= 82 83 USES= gettext gmake pgsql GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" -CPPFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-wx-version=${USE_WX} --enable-databasedesigner USE_GNOME= libxml2 libxslt USE_WX= 2.8 diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile index d60e830..7a5d7a2 100644 --- a/deskutils/gnome-main-menu/Makefile +++ b/deskutils/gnome-main-menu/Makefile @@ -18,9 +18,8 @@ USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \ libgnomeui USES= gettext gmake pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0` GCONF_SCHEMAS= application-browser.schemas slab.schemas diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile index 9f16f0b..0287581 100644 --- a/deskutils/logjam/Makefile +++ b/deskutils/logjam/Makefile @@ -19,8 +19,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gtk20 libxml2 intlhack CONFIGURE_ARGS= --program-transform-name="s/$$//" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .ifndef(WITHOUT_GTKSPELL) LIB_DEPENDS+= libgtkspell.so:${PORTSDIR}/textproc/gtkspell diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index fd2a9e6..31902be 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -17,8 +17,8 @@ USE_BZIP2= yes USE_GNOME= gnomeprefix libgnomeui USES= gmake pathfix pkgconfig USE_AUTOTOOLS= automake:env libtool -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes pre-configure: diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 17f6b0f..8a3c30f 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -114,9 +114,8 @@ APU_CONF_ARGS+= --without-freetds APU_EXTRAS= yes USE_MYSQL= yes APU_CONF_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -LDFLAGS+= -L${LOCALBASE}/lib/mysql +LIBS+= -L${LOCALBASE}/lib/mysql .else APU_CONF_ARGS+= --without-mysql .endif diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 911c941..69bfd1f 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -134,9 +134,8 @@ EXTRAS= yes PLIST_SUB+= MYSQL="" USE_MYSQL= YES CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -LDFLAGS+= -L${LOCALBASE}/lib/mysql +LIBS+= -L${LOCALBASE}/lib/mysql . if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} . else diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile index 5480aca..0bce9d5 100644 --- a/devel/asmutils/Makefile +++ b/devel/asmutils/Makefile @@ -34,10 +34,10 @@ BINS= bonus/asmutils basename cal cat chmod chown chroot cmp cp \ LINKS= arch cpuspeed domainname false halt inflate kldstat kldunload \ mkfifo more poweroff regs rmdir size sln todos umount usleep -LIBS= libc.so.0 libcrypto.so.0 libm.so.0 +LIBRARIES= libc.so.0 libcrypto.so.0 libm.so.0 PLIST_FILES= ${BINS:S/^/bin\/asmutils\//:S/bonus\///} \ - ${LINKS:S/^/bin\/asmutils\//} ${LIBS:S/^/lib\/asmutils\//} + ${LINKS:S/^/bin\/asmutils\//} ${LIBRARIES:S/^/lib\/asmutils\//} PLIST_DIRS= bin/asmutils lib/asmutils PORTDOCS= * @@ -53,7 +53,7 @@ do-install: .for bin in ${BINS} ${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${PREFIX}/bin/asmutils .endfor -.for lib in ${LIBS} +.for lib in ${LIBRARIES} ${INSTALL_PROGRAM} ${WRKSRC}/lib/${lib} ${PREFIX}/lib/asmutils .endfor (cd ${PREFIX}/bin/asmutils && \ diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile index 2e71b55..1962e33 100644 --- a/devel/ccrtp/Makefile +++ b/devel/ccrtp/Makefile @@ -17,8 +17,8 @@ GNU_CONFIGURE= yes USES= gmake gettext iconv pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INFO= ccrtp post-patch: diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile index d6d33d4..76261cd 100644 --- a/devel/google-perftools/Makefile +++ b/devel/google-perftools/Makefile @@ -29,9 +29,7 @@ USE_LDCONFIG= yes USES= compiler CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -lexecinfo -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=LIBS="${LIBS}" +LIBS+= -L${LOCALBASE}/lib -lexecinfo .include <bsd.port.pre.mk> diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile index e09b97e..7330efb 100644 --- a/devel/ifd-test/Makefile +++ b/devel/ifd-test/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite USES= gmake NOMAN= PLIST_FILES= sbin/ifdtest -MAKE_ENV= LIBS="-L${PREFIX}/lib -lpcsclite" +LIBS+= -L${LOCALBASE}/lib -lpcsclite post-patch: ${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g; \ diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index 9e2be41..f755191 100644 --- a/devel/libgutenfetch/Makefile +++ b/devel/libgutenfetch/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake USE_BZIP2= yes diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile index 054949d..05f2697 100644 --- a/devel/libunicode/Makefile +++ b/devel/libunicode/Makefile @@ -19,8 +19,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile index 2293362..60c1272 100644 --- a/devel/libzvbi/Makefile +++ b/devel/libzvbi/Makefile @@ -18,8 +18,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L/usr/lib" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \ diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 2a48ba7..e139e24 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ARGS= --srcdir=${WRKSRC:H} MAKE_ENV= DIST=${WRKSRC}/dist -LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1 +LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1 .include <bsd.port.pre.mk> @@ -44,7 +44,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig -.for lib in ${LIBS} +.for lib in ${LIBRARIES} .if defined(STRIP) && ${STRIP} != "" ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} .endif diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile index a7e2815..b8efd89 100644 --- a/devel/pypersrc/Makefile +++ b/devel/pypersrc/Makefile @@ -19,8 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} -USES+= gmake -USE_BZIP2= yes +USES= gmake tar:bzip2 USE_PYTHON= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh @@ -39,6 +38,11 @@ post-patch: ${REINPLACE_CMD} -e 's|g++|${CXX}|g' ${WRKSRC}/tests/GNUmakefile @${REINPLACE_CMD} -e 's|tolower|::tolower|' ${WRKSRC}/src/cc/utils_string.hh +post-configure: + @(cd ${WRKSRC}/src/ctags-5.5.4 && ${SETENV} CC="${CC}" CPP="${CPP}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ + ${CONFIGURE_ENV} ./configure) + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/pypersrc ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/out/pypersrc.py ${STAGEDIR}${PREFIX}/bin diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile index 54c4e2d..2682773 100644 --- a/devel/srecord/Makefile +++ b/devel/srecord/Makefile @@ -14,8 +14,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes USE_AUTOTOOLS= libtool diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile index 6553f87..f3852b0 100644 --- a/dns/libidn/Makefile +++ b/dns/libidn/Makefile @@ -14,8 +14,8 @@ OPTIONS_DEFINE= DOCS NLS USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_PERL5= build USES= iconv pathfix perl5 pkgconfig diff --git a/editors/joe/Makefile b/editors/joe/Makefile index beb6a10..55bae1d 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -22,8 +22,8 @@ CONFLICTS= joe-2.* USES= gmake iconv ncurses GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index b062575..b6e2a8e 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -19,8 +19,8 @@ CONFLICTS= joe-3* GNU_CONFIGURE= yes USES= iconv gmake -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 3462dea..c50f503 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -15,8 +15,8 @@ USE_AUTOTOOLS= autoconf libtool USES= pathfix gmake iconv pkgconfig tar:bzip2 USE_GNOME= eel2 gnomeprefix gtksourceview libgnomeui USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0` +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB} GCONF_SCHEMAS= mlview.schemas diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index 6952ac2..b1a3bd3 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -11,8 +11,8 @@ COMMENT= Multiwindow mouse-based text editor for X USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lgnuregex" CONFIGURE_ARGS= --libdir=${PREFIX}/share +LIBS+= -lgnuregex MAKE_JOBS_UNSAFE= yes PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 1a36b0d..72ada72 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -21,8 +21,8 @@ USES= pkgconfig gmake USE_GNOME= libxml2 glib20 CONFIGURE_ARGS+=--without-alsa --without-joystick -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= AO ICONS ROMS OPTIONS_DEFAULT= ICONS GTK2 diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile index de8dddc..13b2197 100644 --- a/emulators/vba/Makefile +++ b/emulators/vba/Makefile @@ -19,10 +19,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USES= gettext gmake GNU_CONFIGURE= yes USE_SDL= sdl -CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION} SUB_FILES= pkg-message diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index 1f98980..18afd6e 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= aclocal autoheader automake autoconf AUTOMAKE_ARGS= --add-missing --copy -Wno-portability ACLOCAL_ARGS= # default args (--acdir=...) produce broken configure script CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS=-lutil +LIBS+= -lutil USES= gmake pkgconfig USE_XORG= x11 xext xt NO_WRKSUBDIR= yes diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 8423741..934c198 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -23,11 +23,11 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 USES= iconv shebangfix CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes # XXX FreeBSD 9.x has posix_fallocate() for OSVERSION > 900035, # but is missing the required POSIX_FADV_* macros -CONFIGURE_ENV= i_cv_posix_fallocate_works=no \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= i_cv_posix_fallocate_works=no PORTDOCS= AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \ MIRRORS NEWS README README.debug-levels README.modules \ diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 44f04b6..a9b02f8 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -100,8 +100,8 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" .include <bsd.port.options.mk> .if !defined(_BUILDING_PROFTPD_MODULE) -CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} -PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} +CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} +LIBS+= -lssl -lcrypto -L${OPENSSLLIB} .endif .if !defined(_BUILDING_PROFTPD_MODULE) @@ -180,7 +180,7 @@ MODULES+= mod_memcache \ mod_tls_memcache LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+= --enable-memcache -PROFTPD_LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil +LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil PLIST_SUB+= MEMCACHE="" .else CONFIGURE_ARGS+= --disable-memcache @@ -193,7 +193,6 @@ _MODULES:=${_MODULES}:${m} .endfor # Keep this here below, in case similar constructs need to be made -CONFIGURE_ENV+= LIBS="${PROFTPD_LIBS}" CONFIGURE_ARGS+= --with-shared=${_MODULES:C/^://g} .endif #!defined(_BUILDING_PROFTPD_MODULE) diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile index a21d319..f8ee5a4 100644 --- a/ftp/wput/Makefile +++ b/ftp/wput/Makefile @@ -16,8 +16,6 @@ PORTEXAMPLES= USAGE.examples USAGE.resumehandling USAGE.urlhandling \ passwordfile wputrc GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${LDFLAGS}" -CFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= TLS NLS DOCS EXAMPLES diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 2b33f17..927eea4 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -24,8 +24,8 @@ RUN_DEPENDS= ${DATADIR}/data1/default.cfg:${PORTSDIR}/games/alienarena-data USES= dos2unix gmake GNU_CONFIGURE= yes CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/ -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-xf86vm \ --with-xf86dga diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 67dfedc..355e4c8 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -14,11 +14,11 @@ COMMENT= Monsters, explosions, destruction game for X Window System USE_BZIP2= yes USE_GL= glu -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \ -DLINUXVERSION -DLINUXAUDIO -LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lm +LIBS+= -L${LOCALBASE}/lib -lX11 -lm OPTIONS_DEFINE= DOCS diff --git a/games/chroma/Makefile b/games/chroma/Makefile index d805887..fce1787 100644 --- a/games/chroma/Makefile +++ b/games/chroma/Makefile @@ -13,9 +13,8 @@ COMMENT= Abstract puzzle game USES= tar:bzip2 gettext GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lintl" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl PORTDOCS= * PORTDATA= * diff --git a/games/frobtads/Makefile b/games/frobtads/Makefile index dd2f534..094abbd 100644 --- a/games/frobtads/Makefile +++ b/games/frobtads/Makefile @@ -19,10 +19,9 @@ CONFLICTS= tads-2.* USES= gmake USE_AUTOTOOLS= automake autoconf GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lcompat" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lcompat pre-configure: (cd ${WRKSRC}; ${SH} bootstrap) diff --git a/games/glest/Makefile b/games/glest/Makefile index 5540185..b176270 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -23,8 +23,8 @@ USE_SDL= yes USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -qa diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile index 970a488d..4956738 100644 --- a/games/gnomeattacks/Makefile +++ b/games/gnomeattacks/Makefile @@ -13,8 +13,7 @@ COMMENT= GNOME 2 game featuring a bizarre flying GNOME logo GNU_CONFIGURE= yes USES= pathfix gmake pkgconfig USE_GNOME= gnomeprefix gnomevfs2 libgnomeui -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lm +LIBS+= -L${LOCALBASE}/lib -lm .include <bsd.port.mk> diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile index 23bb8e6..268737f 100644 --- a/games/gnuchess/Makefile +++ b/games/gnuchess/Makefile @@ -36,11 +36,7 @@ PLIST_SUB+= NLS="@comment " .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" MKDIR_P="${MKDIR}" - -post-patch: - @${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS:S/"//g}|g ; \ - s|-pthread ||g' ${WRKSRC}/configure +CONFIGURE_ENV= MKDIR_P="${MKDIR}" post-build: .if ${PORT_OPTIONS:MOPENING_BOOK} diff --git a/games/gracer/Makefile b/games/gracer/Makefile index fdf7f096..69ab2db 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -19,9 +19,9 @@ USE_GL= glut USES= gmake perl5 tcl:84 USE_PERL5= build USE_AUTOTOOLS= autoconf213 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include \ -I${TCL_INCLUDEDIR} +LIBS+= -L${LOCALBASE}/lib # for plib (sound): CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 25f351a..ca0ef14 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -13,8 +13,8 @@ COMMENT= Simple Turing machine simulator for GNOME 2 USE_GNOME= gnomeprefix gnomehack libgnomeui USES= gettext gmake pkgconfig USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALLS_OMF= yes PORTDOCS= AUTHORS COPYING NEWS ChangeLog TODO README INSTALL diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile index 73f3120..07a22a0 100644 --- a/games/highmoon/Makefile +++ b/games/highmoon/Makefile @@ -16,10 +16,10 @@ WRKSRC= ${WRKDIR}/HighMoon USES= gmake USE_SDL= image sdl -MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" +MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LIBS}" CXXFLAGS+= `${SDL_CONFIG} --cflags` -LDFLAGS+= `${SDL_CONFIG} --libs` -lSDL_image +LIBS+= `${SDL_CONFIG} --libs` -lSDL_image PORTDOCS= AUTHORS NEWS README OPTIONS_DEFINE= DOCS diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index d503b3a..22d63a9 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -13,7 +13,7 @@ COMMENT= Nice clone of classical Breakout game USE_SDL= sdl USES= gmake GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lcompat" +LIBS+= -lcompat post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile index dc95a57..a887eb0 100644 --- a/games/pioneers/Makefile +++ b/games/pioneers/Makefile @@ -19,7 +19,7 @@ USE_GNOME= gnomehack gnomeprefix gtk20 libgnome librsvg2 INSTALLS_ICONS= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/games/sdb/Makefile b/games/sdb/Makefile index f714345..35b140b 100644 --- a/games/sdb/Makefile +++ b/games/sdb/Makefile @@ -22,8 +22,8 @@ USE_GL= gl glu BUILD_WRKSRC= ${WRKSRC}/src CXXFLAGS+= `${SDL_CONFIG} --cflags` -LDFLAGS+= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" +LIBS+= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU +MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LIBS}" PLIST_FILES= bin/sdb PORTDOCS= * diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile index 1a93e74..8d859da 100644 --- a/games/spacejunk/Makefile +++ b/games/spacejunk/Makefile @@ -15,9 +15,8 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes USE_SDL= sdl mixer image -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib SUB_FILES= spacejunk diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile index 1d40410..3e08c23 100644 --- a/games/super_methane_brothers/Makefile +++ b/games/super_methane_brothers/Makefile @@ -20,11 +20,11 @@ LIB_DEPENDS= libclan23Core.so:${PORTSDIR}/devel/clanlib \ USES= gmake pkgconfig USE_GCC= yes USE_GL= glu -MAKE_ENV= METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LDFLAGS}" +MAKE_ENV= METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LIBS}" MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -L${LOCALBASE}/lib -lexecinfo PORTDOCS= * PLIST_FILES= bin/methane diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 188dc27..1db7a54 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -27,8 +27,6 @@ USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr USE_GL= glut GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/games/trophy/Makefile b/games/trophy/Makefile index 0c354ae..63e6a9f 100644 --- a/games/trophy/Makefile +++ b/games/trophy/Makefile @@ -17,9 +17,8 @@ LIB_DEPENDS= libclanCore.so:${PORTSDIR}/devel/clanlib1 USES= pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS COPYING ChangeLog README TODO diff --git a/games/tsito/Makefile b/games/tsito/Makefile index 4b11967..22d1a7c 100644 --- a/games/tsito/Makefile +++ b/games/tsito/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Chinese chess (Xiangqi) program HAS_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lcompat" CONFIGURE_ARGS= --prefix="${PREFIX}" +LIBS+= -lcompat .include <bsd.port.mk> diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile index f83d31e..da60c3b 100644 --- a/games/tuxkart/Makefile +++ b/games/tuxkart/Makefile @@ -21,9 +21,9 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib USES= gmake USE_GL= gl GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lusbhid" CONFIGURE_ARGS= --with-plib=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lusbhid PORTDOCS= * diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 6291287..5e528d4 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -32,12 +32,11 @@ USE_SDL= sdl USE_QT4= corelib network script gui moc_build QT_NONSTANDARD= yes CONFIGURE_ARGS= --program-transform-name="" --with-distributor="FreeBSD ports" -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" \ - PATH="${LOCALBASE}/bin:$$PATH" \ +CONFIGURE_ENV= PATH="${LOCALBASE}/bin:$$PATH" \ CCOMPILER="${CC}" \ CXXCOMPILER="${CXX}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib REINPLACE_ARGS= -i '' PORTDOCS= * diff --git a/games/xqf/Makefile b/games/xqf/Makefile index 31fb8ad..23b088b 100644 --- a/games/xqf/Makefile +++ b/games/xqf/Makefile @@ -16,10 +16,9 @@ USE_GNOME= intlhack USES= gettext gmake pkgconfig USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lX11" # uses XGetWindowAttributes but doesn't link with X11 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lX11 PORTDATA= * PORTDOCS= * diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile index 87e1b37..5c9154e 100644 --- a/graphics/EZWGL/Makefile +++ b/graphics/EZWGL/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_XORG= x11 xext USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +LIBS+= -L${LOCALBASE}/lib NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken NO_STAGE= yes diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index 796557d..e62d2bd 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -20,9 +20,8 @@ USE_AUTOTOOLS= libltdl USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} CONFIGURE_ARGS=--enable-ltdl-install=no -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - GL_LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAN1= gldb.1 gldb-gui.1 MAN3= bugle.3 diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index 976bd28..5be1664 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -34,9 +34,8 @@ CONFIGURE_ARGS= --disable-gudev \ # takes ages we don't want to wait. CONFIGURE_ARGS+=--disable-print-profiles CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \ - USB_LIBS="-L/usr/lib -lusb" +LIBS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= USB_CFLAGS=" " USB_LIBS="-lusb" INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile index b7b7445..e6695aa 100644 --- a/graphics/danpei/Makefile +++ b/graphics/danpei/Makefile @@ -22,8 +22,8 @@ IMAGEMAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick USES= gettext USE_GNOME= gtk12 gdkpixbuf GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --without-included-gettext PLIST_FILES= bin/danpei \ diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 0e030b2..a968d57 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -30,10 +30,9 @@ CONFIGURE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" USE_GL= glew glut GNU_CONFIGURE= yes -CONFIGURE_ENV+= "LIBS=-lboost_system" CONFIGURE_ARGS+= --with-boost-filesystem CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lboost_system .include <bsd.port.pre.mk> diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile index 141912e..f4c3b07 100644 --- a/graphics/epeg/Makefile +++ b/graphics/epeg/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USES= pathfix USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile index 10db06f..91bfa03 100644 --- a/graphics/flam3/Makefile +++ b/graphics/flam3/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ GNU_CONFIGURE= yes USES= gmake pathfix pkgconfig -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include/libpng15 -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include/libpng15 -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile index ff5068b..07d65fe 100644 --- a/graphics/gcolor/Makefile +++ b/graphics/gcolor/Makefile @@ -13,8 +13,8 @@ COMMENT= GTK-based color picker PLIST_FILES= bin/gcolor USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib pre-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index d2212e4..17be5d2 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -3,7 +3,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION} @@ -13,15 +13,13 @@ COMMENT= Yet another GTK+ based image viewer LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png -USES= gmake pkgconfig +USES= gmake libtool pkgconfig GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_XORG= xinerama ice CONFIGURE_ARGS= --with-gtk2 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -DUSE_GTK2 CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER LIBXINE IMLIB @@ -56,24 +54,12 @@ MPLAYER_CONFIGURE_ENABLE=mplayer MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer LIBXINE_CONFIGURE_WITH= xine -LIBXINE_LIB_DEPENDS= xine:${PORTSDIR}/multimedia/libxine - -.include <bsd.port.options.mk> +LIBXINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine post-patch: - @${REINPLACE_CMD} -e 's/DATADIRNAME=lib/DATADIRNAME=share/g' \ - -e 's|echo aout|echo elf|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/gnome/apps/|/apps/|' \ - ${WRKSRC}/gimageview.spec \ + @${REINPLACE_CMD} '/^desktopdir =/s|=.*|= ${DESKTOPDIR}|' \ ${WRKSRC}/etc/Makefile.in - @${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \ - 's|= $$(DESTDIR)|= |' {} \; - -post-configure: -.if ${PORT_OPTIONS:MIMLIB} - @${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -Ee \ - 's/^(GDK_IMLIB_(CFLAGS|LIBS) =).*$$/$${1}/' -.endif + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ + -e 's|= $$(DESTDIR)|= |' -e '/^CPPFLAGS =/s/\\/@CPPFLAGS@ \\/' .include <bsd.port.mk> diff --git a/graphics/gimageview/files/patch-ltmain.sh b/graphics/gimageview/files/patch-ltmain.sh deleted file mode 100644 index 8afad63..0000000 --- a/graphics/gimageview/files/patch-ltmain.sh +++ /dev/null @@ -1,25 +0,0 @@ ---- ltmain.sh.orig Sat Nov 17 07:22:26 2001 -+++ ltmain.sh Wed Feb 20 16:21:57 2002 -@@ -2690,6 +2690,9 @@ - # Absolute path. - rpath="$rpath$dir:" - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" -@@ -3360,10 +3363,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist index a27cf3a..d1fa442 100644 --- a/graphics/gimageview/pkg-plist +++ b/graphics/gimageview/pkg-plist @@ -32,7 +32,7 @@ lib/gimageview/thumbnail/libgimv_nautilus_thumb.so lib/gimageview/thumbnail/libgimv_thumb.so lib/gimageview/thumbnail/libgimv_xvpics_thumb.so lib/gimageview/thumbnail_view/libgimv_thumbview_detail.so -share/apps/Graphics/gimageview.desktop +share/applications/gimageview.desktop share/doc/gimageview/html/ja/01.html share/doc/gimageview/html/ja/02.html share/doc/gimageview/html/ja/03.html @@ -136,5 +136,3 @@ share/pixmaps/gimv.png @dirrm share/gimageview/pixmaps/default @dirrm share/gimageview/pixmaps @dirrm share/gimageview -@dirrmtry share/apps/Graphics -@dirrmtry share/apps diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 9151342..e2ff1dc 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -51,10 +51,9 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --enable-default-binary -CONFIGURE_ENV= GIMP_THREAD_LIBS=${PTHREAD_LIBS} \ - LIBS=${LIBS} +CONFIGURE_ENV= GIMP_THREAD_LIBS=${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib .if !defined(GIMP_SLAVE) diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile index cd06ded..0993004 100644 --- a/graphics/gimp-resynthesizer/Makefile +++ b/graphics/gimp-resynthesizer/Makefile @@ -19,7 +19,7 @@ GH_TAGNAME= v${PORTVERSION} GH_COMMIT= 28cade5 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +LIBS+= -L${LOCALBASE}/lib -lintl USES= gettext gmake pkgconfig compiler:nestedfct USE_AUTOTOOLS= aclocal automake AUTOMAKE_ARGS= --add-missing diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index 66a1c55..3af1ffb 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -18,7 +18,7 @@ USE_GL= glut USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= "LIBS=-L${LOCALBASE}/lib -lXext ${PTHREAD_LIBS}" +LIBS+= -L${LOCALBASE}/lib -lXext post-patch: .for file in ex_angle.c ex_cut_round.c ex_raw.c extrude.c round_cap.c segment.c texgen.c diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index d3d43da..5dbfc40 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype USES= gmake libtool USE_GL= gl glut GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \ --with-ttf-libraries=${LOCALBASE}/lib \ --with-gl-includes=${LOCALBASE}/include \ diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 6caa55a..3345087 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -31,8 +31,7 @@ AALIB_CONFIGURE_WITH= aalib NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LDFLAGS= -L${LOCALBASE}/lib -NLS_CONFIGURE_ENV= LIBS="-lintl" +NLS_LIBS= -L${LOCALBASE}/lib -lintl READLINE_USES= readline READLINE_CONFIGURE_WITH= readline diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 89225cc..ac5928f 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -15,8 +15,8 @@ USES= gettext gmake perl5 USE_GNOME= imlib USE_PERL5= build GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/gtkgraph \ share/locale/fr/LC_MESSAGES/gtkgraph.mo \ diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile index b96ab2b..8f0db7f 100644 --- a/graphics/jpeginfo/Makefile +++ b/graphics/jpeginfo/Makefile @@ -13,8 +13,8 @@ COMMENT= Generate listing and MD5, check jpegs for error, delete broken ones LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= mandir=${MANPREFIX}/man INSTALL_ROOT=${STAGEDIR} PLIST_FILES= bin/jpeginfo man/man1/jpeginfo.1.gz diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile index 8000f50..d827189 100644 --- a/graphics/kudu/Makefile +++ b/graphics/kudu/Makefile @@ -20,9 +20,7 @@ USE_GL= gl USE_PYTHON= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -lcompat" +LIBS+= -L${LOCALBASE}/lib -lcompat PLIST_FILES= bin/${PORTNAME} PORTDATA= * diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile index e1069dc..9ad413f 100644 --- a/graphics/libvisual/Makefile +++ b/graphics/libvisual/Makefile @@ -16,8 +16,8 @@ COMMENT= Abstraction library that sits between apps and visual plugin USES= pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile index e6aedd9..bf0832a 100644 --- a/graphics/libvisual04-plugins/Makefile +++ b/graphics/libvisual04-plugins/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS= --disable-alsa \ --disable-gforce \ --disable-jess \ --prefix=${PREFIX} -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAJORMINOR= ${PORTVERSION:C/.[0-9]+$//} diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile index 11dad0f..1b52061 100644 --- a/graphics/php-facedetect/Makefile +++ b/graphics/php-facedetect/Makefile @@ -18,16 +18,14 @@ LIB_DEPENDS= libopencv_objdetect.so:${PORTSDIR}/graphics/opencv GITVERSION= 4b1dfe1 -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= -lopencv_core +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lopencv_core USE_PHP= yes USE_PHPIZE= yes USE_PHPEXT= yes CONFIGURE_ARGS+= --with-facedetect -CONFIGURE_ENV+= LIBS="${LIBS}" NO_STAGE= yes .include <bsd.port.pre.mk> diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile index 159c486..f7471a1 100644 --- a/graphics/phplot/Makefile +++ b/graphics/phplot/Makefile @@ -22,7 +22,7 @@ NO_BUILD= YES PHPLOT_DIR= ${STAGEDIR}${PREFIX}/include/php/phplot -LIBS= phplot.php rgb.inc.php +LIBRARIES= phplot.php rgb.inc.php OPTIONS_DEFINE= DOCS FONTS OPTIONS_DEFAULT= FONTS @@ -31,7 +31,7 @@ FONTS_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 do-install: @${MKDIR} ${PHPLOT_DIR} - ${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PHPLOT_DIR} + ${INSTALL_DATA} ${LIBRARIES:S,^,${WRKSRC}/,} ${PHPLOT_DIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/phplotdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile index bd6e98d..7482430 100644 --- a/graphics/pngnq/Makefile +++ b/graphics/pngnq/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LIBS=-lpng -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lpng USES= pkgconfig diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 45a9f79..6f48d7d 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -30,10 +30,10 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE} DATADIR= ${PREFIX}/share/${PORTNAME}-${VERSION_BASE} ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE} -INCLUDES= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lboost_system +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lboost_system -CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} --prefix=${PREFIX} \ +CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} \ --program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \ --disable-optimiz @@ -42,7 +42,6 @@ CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} --prefix=${PREFIX} \ .if ${PORT_OPTIONS:MX11} USE_XORG= xpm sm ice x11 USE_SDL= sdl -CONFIGURE_ARGS+= --x-include=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs .else CONFIGURE_ARGS+= --without-x .endif @@ -60,7 +59,6 @@ CONFIGURE_ARGS+=--disable-io-restrictions BUILD_DEPENDS+= png>=1.4:${PORTSDIR}/graphics/png .else LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png -LIBS+= -lpng .endif .else CONFIGURE_ARGS+=--without-libpng @@ -71,7 +69,6 @@ CONFIGURE_ARGS+=--without-libpng BUILD_DEPENDS+= jpeg>=6b:${PORTSDIR}/graphics/jpeg .else LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg -LIBS+= -ljpeg .endif .else CONFIGURE_ARGS+=--without-libjpeg @@ -82,7 +79,6 @@ CONFIGURE_ARGS+=--without-libjpeg BUILD_DEPENDS+= tiff>=4:${PORTSDIR}/graphics/tiff .else LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff -LIBS+= -ltiff .endif .else CONFIGURE_ARGS+=--without-libtiff @@ -93,8 +89,7 @@ CONFIGURE_ARGS+=--without-libtiff BUILD_DEPENDS+= OpenEXR>=1.6:${PORTSDIR}/graphics/OpenEXR .else LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR -LIBS+= -lIlmImf -INCLUDES+= -I${LOCALBASE}/include/OpenEXR +CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR .endif .else CONFIGURE_ARGS+=--without-openexr @@ -108,8 +103,6 @@ CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes BROKEN= Does not compile on sparc64: thread-local storage not supported .endif -CONFIGURE_ARGS+=CXXFLAGS="${CXXFLAGS} ${INCLUDES}" - MAN1= ${PORTNAME}${PKGNAMESUFFIX}.1 DOC_FILES= AUTHORS ChangeLog NEWS diff --git a/graphics/radius-engine/Makefile b/graphics/radius-engine/Makefile index a35a1a3..7987a49 100644 --- a/graphics/radius-engine/Makefile +++ b/graphics/radius-engine/Makefile @@ -20,8 +20,8 @@ USES= pathfix pkgconfig USE_SDL= sdl sound USE_GL= glu GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= include/radius.h \ lib/libradius-engine.a \ diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile index d868850..92a78f1 100644 --- a/graphics/stamp/Makefile +++ b/graphics/stamp/Makefile @@ -13,8 +13,8 @@ COMMENT= Adds a graphical, configurable timestamp to a grayscale image LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .if !defined(WITHOUT_X11) USE_GNOME= gtk12 .endif diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index d306637..cc590ff 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -24,9 +24,8 @@ WRKSRC= ${WRKDIR}/tesseract-ocr GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" \ - LIBS="${PTHREAD_LIBS}" -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" +LIBS+= -L${LOCALBASE}/lib DATADIR= ${PREFIX}/share/tessdata PORTDATA= * diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile index 526e1a7..cce1d7c 100644 --- a/graphics/visionworkbench/Makefile +++ b/graphics/visionworkbench/Makefile @@ -34,21 +34,10 @@ LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR LIB_DEPENDS+= libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800025 -CFLAGS+= -Dsqrtl=sqrt -. if ${OSVERSION} < 800022 -CFLAGS+= -Dtgammaf=tgamma -. endif -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} - -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" +NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s,-DBOOST_FILESYSTEM_VERSION=2,,g" ${WRKSRC}/configure @@ -69,4 +58,4 @@ pre-configure: regression-test: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 0e532eb..85367ef 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ USES= gmake GNU_CONFIGURE= yes -OPTIONS_DEFINE= PTHREAD NLS +OPTIONS_DEFINE= THREADS NLS OPTIONS_MULTI= DRIVER OPTIONS_MULTI_DRIVER= AALIB GTK2 X11 DRIVER_DESC= User Interface @@ -37,12 +37,12 @@ X11_CONFIGURE_WITH= x11-driver x NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls -PTHREAD_DESC= Enable SMP support (experimental) -PTHREAD_CONFIGURE_WITH= pthread -PTHREAD_CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +THREADS_DESC= Enable SMP support (experimental) +THREADS_CONFIGURE_WITH= pthread +THREADS_LIBS= ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INFO= xaos diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 4a94411..b86a1ed 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -39,13 +39,10 @@ GIMP_RUN_DEPENDS= ${LOCALBASE}/bin/gimp:${PORTSDIR}/graphics/gimp-app GIMP_CONFIGURE_ENABLE= gimp2 gimp NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +NLS_LIBS= -L${LOCALBASE}/lib -lintl .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl" -.endif - .if ${PORT_OPTIONS:MGIMP} SUB_FILES+= pkg-message .endif diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile index aa762b1..d4102aa 100644 --- a/graphics/zphoto/Makefile +++ b/graphics/zphoto/Makefile @@ -23,9 +23,8 @@ ZIP_CONFIGURE_OFF= --disable-zip GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-avifile -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_EFL= imlib2 PLIST_FILES+= bin/wxzphoto USES= perl5 gmake diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index d79aea0..f15db11 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +LIBS+= -L${LOCALBASE}/lib PLIST_SUB+= DISTVERSION=${DISTVERSION} DOCSDIR= ${PREFIX}/share/bx/help diff --git a/irc/miau/Makefile b/irc/miau/Makefile index 33ff14a..998d816 100644 --- a/irc/miau/Makefile +++ b/irc/miau/Makefile @@ -27,7 +27,6 @@ CONFIGURE_ARGS= --enable-dccbounce \ --enable-empty-awaymsg \ --enable-dumpstatus \ --disable-dependency-tracking -CONFIGURE_ENV= LIBS="${LIBS}" CPPFLAGS+= -I${LOCALBASE}/include .if defined(WITH_IPV6) diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 1fbb9c8..8e08890 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -20,8 +20,8 @@ CONFLICTS= xchat-1* xchat-systray-plugin-[0-9]* USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_GNOME= gtk20 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ipv6 INSTALL_TARGET= install-strip @@ -89,10 +89,8 @@ CONFIGURE_ARGS+=--enable-socks .if ${PORT_OPTIONS:MTCL} USES+= tcl CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR} -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \ - -L${TCL_LIBDIR}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ - -I${TCL_INCLUDEDIR} +CPPFLAGS+= -I${TCL_INCLUDEDIR} +LIBS+= -L${TCL_LIBDIR} PLIST_SUB+= TCL="" .else CONFIGURE_ARGS+=--enable-tcl=no @@ -100,8 +98,6 @@ PLIST_SUB+= TCL="@comment " .endif post-patch: - @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/src/common/*.[ch] diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index ca2e05f..ab8f001 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -23,9 +23,9 @@ GNU_CONFIGURE= yes USES= iconv:wchar_t gmake CONFIGURE_ARGS= --enable-multibyte -CONFIGURE_ENV= INSTALL_MAN="${INSTALL_MAN}" \ - LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" +CONFIGURE_ENV= INSTALL_MAN="${INSTALL_MAN}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install install_doc PLIST_SUB= GROFF_VERSION=${PORTVERSION} diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index a9d8f46..d29f5cc 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -46,17 +46,14 @@ PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \ termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j CPPFLAGS+= -DBSD_UNIX -DUSE_LOCALE -LIBS= -ltermlib -L${PREFIX}/lib +LIBS+= -ltermlib -L${LOCALBASE}/lib X11_USE= XORG=x11 -X11_CPPFLAGS+= -DUSE_X11 -I${LOCALBASE}/include +X11_CPPFLAGS= -DUSE_X11 -I${LOCALBASE}/include +X11_LIBS= -lX11 -L${LOCALBASE}/lib .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MX11} -LIBS+= -lX11 -L${LOCALBASE}/lib -.endif - .if ${PORT_OPTIONS:MDIRECT_CANNA} || \ ${PORT_OPTIONS:MFREEWNN_CANNA} || \ ${PORT_OPTIONS:MWNN6} || \ diff --git a/japanese/php5-mecab/Makefile b/japanese/php5-mecab/Makefile index b9348cd..3a035f8 100644 --- a/japanese/php5-mecab/Makefile +++ b/japanese/php5-mecab/Makefile @@ -15,8 +15,6 @@ LIB_DEPENDS= mecab:${PORTSDIR}/japanese/mecab USE_PHP= yes USE_PHPEXT= yes CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config -CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}" -CFLAGS+= ${PTHREAD_CFLAGS} .include <bsd.port.pre.mk> diff --git a/java/jikes/Makefile b/java/jikes/Makefile index 2d9e5c9..2c020c4 100644 --- a/java/jikes/Makefile +++ b/java/jikes/Makefile @@ -15,6 +15,7 @@ GNU_CONFIGURE= yes USES= iconv gmake USE_BZIP2= yes -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile index 7d38f13..5f99516 100644 --- a/korean/eterm/Makefile +++ b/korean/eterm/Makefile @@ -21,7 +21,7 @@ USE_GNOME= imlib USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" LOCALBASE="${LOCALBASE}" +LIBS+= -L${LOCALBASE}/lib MAN1= Eterm.1 MAKE_JOBS_UNSAFE= yes diff --git a/korean/eterm/files/patch-ac b/korean/eterm/files/patch-ac index 2263fa5..c115815 100644 --- a/korean/eterm/files/patch-ac +++ b/korean/eterm/files/patch-ac @@ -1,14 +1,3 @@ ---- doc/Makefile.in.orig Sat Jan 30 00:19:23 1999 -+++ doc/Makefile.in Sat Jan 30 00:20:04 1999 -@@ -76,7 +76,7 @@ - EGCS = @EGCS@ - FEATURE_CMD = @FEATURE_CMD@ - GDB = @GDB@ --GRLIBS = @GRLIBS@ -+GRLIBS = -L${LOCALBASE}/lib @GRLIBS@ - IMLIB_CONFIG = @IMLIB_CONFIG@ - LD = @LD@ - LDFLAGS = @LDFLAGS@ --- utils/Makefile.in.orig Mon May 3 12:39:18 1999 +++ utils/Makefile.in Mon May 3 12:39:36 1999 @@ -225,7 +225,7 @@ diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index c39e532..78f3f0b 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -43,11 +43,8 @@ PLIST_SUB+= X11="@comment " MAN1= hugs.1 -.if ${MACHINE_ARCH:tl} == "amd64" -CFLAGS+= "-fPIC" -.endif - post-patch: + @${REINPLACE_CMD} 's/LIBS/LIBRARIES/' ${WRKSRC}/libraries/Makefile.in @${REINPLACE_CMD} -e '/^install :: install_notes/d ; \ /^install :: install_guide/d' \ ${WRKSRC}/src/MkInstal.in diff --git a/lang/lush/Makefile b/lang/lush/Makefile index f53cb54..d16ec7b 100644 --- a/lang/lush/Makefile +++ b/lang/lush/Makefile @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/lush -CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -lfontconfig -L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl -lfontconfig CONFIGURE_ARGS= --without-bfd diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 1a6248b..1db2c15 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -143,7 +143,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" +LIBS+= ${PTHREAD_LIBS} .endif .if ${PORT_OPTIONS:MZTS} diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 73a4cfe..ec85972 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -139,7 +139,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" +LIBS+= ${PTHREAD_LIBS} .endif .if ${PORT_OPTIONS:MDEBUG} diff --git a/lang/php55/Makefile b/lang/php55/Makefile index c01ac13..59d655c 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -143,7 +143,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" +LIBS+= ${PTHREAD_LIBS} .endif .if ${PORT_OPTIONS:MDEBUG} diff --git a/lang/python27/Makefile b/lang/python27/Makefile index beee2a3..f057d2e 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -65,12 +65,8 @@ NLS_DESC= Enable Gettext support for the locale module .if ${PORT_OPTIONS:MNLS} USES+= gettext -LDFLAGS+= -L${LOCALBASE}/lib -# We use CPPFLAGS over CFLAGS here due to -I ordering causing things like -# elementtree and pyexpat to break with python27, or to silence preprocessor -# complaints with python33 CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LIBS="-lintl" +LIBS+= -L${LOCALBASE}/lib -lintl .else CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no .endif diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile index 17db851..f0f505e 100644 --- a/lang/ruby19/Makefile +++ b/lang/ruby19/Makefile @@ -65,8 +65,9 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load -LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread. +CPPFLAGS+= -I${LOCALBASE}/include +# Keep this, else ruby will fail to load libraries dependent op libpthread. +LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} # # Disable doc generation if requested or docs disabled at all @@ -77,9 +78,7 @@ CONFIGURE_ARGS+= --enable-install-doc CONFIGURE_ARGS+= --disable-install-doc .endif -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" \ - debugflags= +CONFIGURE_ENV= debugflags= .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} MLINKS= ${RUBY_NAME}.1 ruby.1 diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile index 44d8924..8b1f4d0 100644 --- a/lang/ruby20/Makefile +++ b/lang/ruby20/Makefile @@ -70,8 +70,9 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load -LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread. +CPPFLAGS+= -I${LOCALBASE}/include +# Keep this, else ruby will fail to load libraries dependent op libpthread. +LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} # # Disable doc generation if requested or docs disabled at all @@ -86,9 +87,7 @@ CONFIGURE_ARGS+= --disable-install-doc CONFIGURE_ARGS+= --disable-dtrace .endif -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" \ - debugflags= +CONFIGURE_ENV= debugflags= .if ${PORT_OPTIONS:MLIBEDIT} BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile index 6ca089a..cb2fd88 100644 --- a/lang/ruby21/Makefile +++ b/lang/ruby21/Makefile @@ -70,8 +70,9 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load -LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread. +CPPFLAGS+= -I${LOCALBASE}/include +# Keep this, else ruby will fail to load libraries dependent op libpthread. +LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} # # Disable doc generation if requested or docs disabled at all @@ -86,9 +87,7 @@ CONFIGURE_ARGS+= --disable-install-doc CONFIGURE_ARGS+= --disable-dtrace .endif -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" \ - debugflags= +CONFIGURE_ENV= debugflags= .if ${PORT_OPTIONS:MLIBEDIT} BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 6425eb4..592294f 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -46,9 +46,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc BF_LIBS+= ${ICONV_LIB} .endif CPPFLAGS+= ${BF_CPPFLAGS} -CONFIGURE_ENV+= LIBS="${BF_LIBS}" \ - PERL="${PERL}" -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib ${BF_LIBS} +CONFIGURE_ENV+= PERL="${PERL}" INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man post-patch: diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile index 2337850..c26265f 100644 --- a/mail/crm114/Makefile +++ b/mail/crm114/Makefile @@ -30,11 +30,10 @@ OPTIONS_DEFINE= NORMALIZEMIME NORMALIZEMIME_DESC= Normalize MIME encoding MAKE_ARGS= CC="${CC}" prefix="${STAGEDIR}${PREFIX}" \ - LIBS="${LIBS}" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lintl @@ -51,13 +50,10 @@ CRM_FILES= mailfilter.crm mailfilter.cf mailreaver.crm mailtrainer.crm \ .include <bsd.port.options.mk> -MAKE_ARGS+= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" - post-patch: - @${REINPLACE_CMD} -Ee \ - 's,^((LD|C)FLAGS),#\1,;;s,^(prefix=),#\1,;;s,^(.*-install),#\1,' \ - ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E \ + -e 's,^((LD|C)FLAGS),#\1,;;s,^(prefix=),#\1,;;s,^(.*-install),#\1,' \ + -e 's,crmregex_tre.c,crmregex_tre.o,' ${WRKSRC}/Makefile # Peter Jeremy recommended the use of b64decode and md5 20040302 post-install: diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 7d4146a..61518bf 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -35,8 +35,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED \ diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 10d6022..cb5bcb2 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -35,8 +35,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \ diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 95acf8c..4f4918d 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -93,11 +93,6 @@ USE_AUTOTOOLS+= autoconf:env automake .endif USE_LDCONFIG= yes GNU_CONFIGURE= yes -#CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -#CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ -# CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ -# LDFLAGS="-L${LOCALBASE}/lib" \ -# LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .ifdef(GDBS) CFLAGS+= -g -DDEBUG diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 64e9e0e..6d2ee1b 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -76,10 +76,8 @@ MAKE_JOBS_UNSAFE= yes USES= perl5 libtool shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= ${PTHREAD_CFLAGS} SHEBANG_FILES= src/tools/dspam_logrotate \ src/tools/dspam_notify.pl \ diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile index 3949e56..66a26778 100644 --- a/mail/gbuffy/Makefile +++ b/mail/gbuffy/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libPropList.so:${PORTSDIR}/devel/libPropList \ PLIST_FILES= bin/gbuffy USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|bindir)|DESTDIR)$$(&|' \ diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile index b3cdc44..a7a9173 100644 --- a/mail/gmime2/Makefile +++ b/mail/gmime2/Makefile @@ -27,8 +27,8 @@ CONFIGURE_ARGS?= ${ICONV_CONFIGURE_BASE} \ --with-html-dir=${PREFIX}/share/doc \ --enable-mono=no \ --program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile index 2f23ba7..7738b4e 100644 --- a/mail/gmime24/Makefile +++ b/mail/gmime24/Makefile @@ -28,8 +28,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --enable-mono=no \ --program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS diff --git a/mail/lmtp2nntp/files/patch-configure b/mail/lmtp2nntp/files/patch-configure index 94dc2ec..0fd480d 100644 --- a/mail/lmtp2nntp/files/patch-configure +++ b/mail/lmtp2nntp/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig Thu Feb 13 11:01:47 2003 +++ configure Tue Apr 13 20:58:41 2004 -@@ -5845,9 +5845,9 @@ +@@ -6204,9 +6204,9 @@ SUBDIR_POPT="" else SUBDIR_POPT="lib_popt" @@ -13,3 +13,15 @@ LIBS_EXTRA="$LIBS_EXTRA -lpopt" fi echo "$as_me:$LINENO: result: $with_popt" >&5 +@@ -6904,8 +6904,9 @@ + echo "$as_me:$LINENO: result: $with_dmalloc" >&5 + echo "${ECHO_T}$with_dmalloc" >&6 + +- +-LIBS="$LIBS_EXTRA $LIBS" ++LIBS_EXTRA="$LIBS_EXTRA $LIBS" ++unset LIBS ++LIBS="$LIBS_EXTRA" + + enable_shared=no + export enable_shared diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile index 61e0822..e28657e 100644 --- a/mail/mboxgrep/Makefile +++ b/mail/mboxgrep/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre USES= uidfix GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_OPENSSL= yes INFO= mboxgrep diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile index 339443d..d24ea0e 100644 --- a/mail/milter-greylist-devel/Makefile +++ b/mail/milter-greylist-devel/Makefile @@ -73,7 +73,6 @@ LIBS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \ --enable-dnsrbl --with-thread-safe-resolver -CONFIGURE_ENV+= LIBS="${LIBS} " ALL_TARGET= milter-greylist SUB_FILES+= pkg-message diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 32e2fd2..e644777 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -77,7 +77,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \ --enable-dnsrbl --with-thread-safe-resolver \ --with-dumpfile=/var/milter-greylist/greylist.db -CONFIGURE_ENV+= LIBS="${LIBS}" ALL_TARGET= milter-greylist SUB_FILES+= pkg-message diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile index 5f3a975..522b6a8 100644 --- a/mail/mmr/Makefile +++ b/mail/mmr/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= iconv -MAKE_ARGS= LIBS='${LDFLAGS}' CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' +MAKE_ARGS= LIBS='${LIBS}' CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' ALL_TARGET= ${PORTNAME} PORTDOCS= BUGS CHANGES Features README TODO @@ -25,7 +25,7 @@ CXXFLAGS+= -DTHREADMAIL \ -DMAILPATH=\"/var/mail\" \ -DMAILER=\"/usr/sbin/sendmail\ -t\" \ -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lcurses -lmd +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lcurses -lmd OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/mail/popper/Makefile b/mail/popper/Makefile index 89f671a..7a15c56 100644 --- a/mail/popper/Makefile +++ b/mail/popper/Makefile @@ -26,7 +26,7 @@ O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \ -DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"' .if !defined(WITH_POPPER_APOP_ONLY) -P_LIBS= -lopie +LIBS+= -lopie O_DEFS+= -DOPIE .else O_DEFS+= -DAPOP_ONLY @@ -36,7 +36,7 @@ O_DEFS+= -DAPOP_ONLY O_DEFS+= -DYOUBIN -DCALLED_FROM_POPD .endif -P_LIBS+= -lmd -lutil +LIBS+= -lmd -lutil GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-apop=${PREFIX}/etc/popper/pop.auth \ @@ -44,7 +44,7 @@ CONFIGURE_ARGS= --enable-apop=${PREFIX}/etc/popper/pop.auth \ .if defined(WITH_POPPER_DEBUG) CONFIGURE_ARGS+= --enable-debugging .endif -CONFIGURE_ENV= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}" +CONFIGURE_ENV= O_DEFS="${O_DEFS}" MAN8= popauth.8 popper.8 PLIST_FILES= bin/popauth libexec/popper diff --git a/mail/popular/Makefile b/mail/popular/Makefile index ef075b4..f573173 100644 --- a/mail/popular/Makefile +++ b/mail/popular/Makefile @@ -20,8 +20,8 @@ USE_OPENSSL= yes PDM_MODULES= any master CONFIGURE_ARGS= --without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \ --enable-ssl --with-pdm="${PDM_MODULES}" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_RC_SUBR= pcheckd pproxy pserv 0ringd diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile index b055e93..741fc69 100644 --- a/mail/qmailadmin/Makefile +++ b/mail/qmailadmin/Makefile @@ -93,8 +93,7 @@ EXTRA_PATCHES+= ${FILESDIR}/cracklib.patch BUILD_DEPENDS+= ${LOCALBASE}/include/crack.h:${PORTSDIR}/security/cracklib CONFIGURE_ARGS+= --enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LIBS="-lcrack" +LIBS+= -L${LOCALBASE}/lib -lcrack .endif # vpopmail installation directory diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index bb310a3..bfd0554 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -14,11 +14,11 @@ COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) USE_GCC= any # -freg-struct-return only in GCC and clang-head USE_AUTOTOOLS= autoconf -CONFIGURE_ENV= LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \ - OS_DEFS="-DSETPROCTITLE ${OS_DEFS}" +CONFIGURE_ENV= OS_DEFS="-DSETPROCTITLE ${OS_DEFS}" CONFIGURE_ARGS= --enable-nonauth-file=${POPUSERS_FILE} \ --without-gdbm \ --enable-keep-temp-drop +LIBS+= -L${LOCALBASE}/lib -lcrypt -lmd -lutil PLIST_SUB= EPOPPASSD=${EPOPPASSD} \ USERS=${USERS} \ diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile index 4d92fbd..1d11c23 100644 --- a/mail/smtpmail/Makefile +++ b/mail/smtpmail/Makefile @@ -11,8 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool to send e-mail via a remote smtp server GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/smtpmail diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index a720c4e..f931d83 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -21,10 +21,8 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_LDCONFIG= yes -# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it) -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/math/geg/Makefile b/math/geg/Makefile index f7bebf6..f7e8fb3 100644 --- a/math/geg/Makefile +++ b/math/geg/Makefile @@ -15,8 +15,8 @@ COMMENT= Visualise multiple 2D-functions of one variable USE_GNOME= gtk12 USE_AUTOTOOLS= automake autoconf AUTOMAKE_ARGS= -a -i -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/geg \ man/man1/geg.1.gz diff --git a/math/goblin/Makefile b/math/goblin/Makefile index 518e5e1..1294474 100644 --- a/math/goblin/Makefile +++ b/math/goblin/Makefile @@ -19,7 +19,7 @@ USES= gmake tk USE_LDCONFIG= yes MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - LD="${CXX}" LIBS="-lm ${LDFLAGS}" \ + LD="${CXX}" LIBS="${LIBS}" \ libtcl=${TCL_SHLIB_VER} libtk=${TK_SHLIB_VER} \ prefix=${PREFIX} ALL_TARGET= all shared @@ -28,8 +28,8 @@ PORTDOCS= * PORTEXAMPLES= * CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \ - -I${LOCALBASE}/include/tk${TK_VER} ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} -ltk${TK_SHLIB_VER} ${PTHREAD_LIBS} + -I${LOCALBASE}/include/tk${TK_VER} +LIBS+= -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} -ltk${TK_SHLIB_VER} -lm .include <bsd.port.options.mk> diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile index ece7108..64a2dd1 100644 --- a/math/numdiff/Makefile +++ b/math/numdiff/Makefile @@ -17,8 +17,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --mandir=${PREFIX}/man \ --exec-prefix=${PREFIX} \ --infodir=${PREFIX}/${INFO_PATH} \ - LIBS=-lm \ --disable-nls +LIBS+= -lm USES= gmake INFO= numdiff diff --git a/math/oleo/Makefile b/math/oleo/Makefile index 90832dc..a94ed5f 100644 --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -16,9 +16,9 @@ LICENSE= GPLv2 USE_PERL5= build USES= bison perl5 USE_AUTOTOOLS= autoconf213 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" MAKE_ENV+= DESTDIR=${STAGEDIR} CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot INFO= oleo diff --git a/math/tablix/Makefile b/math/tablix/Makefile index 093995b..a1a77f3 100644 --- a/math/tablix/Makefile +++ b/math/tablix/Makefile @@ -14,16 +14,15 @@ COMMENT= Free software for solving timetabling problems BUILD_DEPENDS= pvm:${PORTSDIR}/net/pvm RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm -PVM_ROOT= ${PREFIX}/lib/pvm +PVM_ROOT= ${LOCALBASE}/lib/pvm USE_GNOME= libxml2 GNU_CONFIGURE= yes USES= gettext gmake -CONFIGURE_ENV= LIBS=-L${PREFIX}/lib \ - PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib -CPPFLAGS+= -I${PREFIX}/include -LDFLAGS+= -L${PREFIX}/lib +CONFIGURE_ENV= PVM_ROOT=${PVM_ROOT} PVM_LIB=${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAN1= tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \ tablix2_plot.1 tablix2_test.1 diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile index d7da6a2..112d80f 100644 --- a/misc/gnome-mime-data/Makefile +++ b/misc/gnome-mime-data/Makefile @@ -16,7 +16,7 @@ COMMENT= MIME and Application database for GNOME USES= gettext gmake pathfix tar:bzip2 USE_GNOME= gnomeprefix intlhack GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl .include <bsd.port.mk> diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile index e4b62fe..bd55df3 100644 --- a/misc/gnuls/Makefile +++ b/misc/gnuls/Makefile @@ -16,8 +16,9 @@ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" FORCE_UNSAFE_CONFIGURE=1 +CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1 CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake perl5 USE_LDCONFIG= yes diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile index 12f5116..e4ce83d 100644 --- a/misc/lingoteach/Makefile +++ b/misc/lingoteach/Makefile @@ -18,8 +18,8 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes USES= gmake pkgconfig libtool -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gmodule-2.0`" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs gmodule-2.0` # sound version SOUNDV= 0.3.9 diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile index 1402663..4a89332 100644 --- a/misc/pdmenu/Makefile +++ b/misc/pdmenu/Makefile @@ -21,9 +21,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= gettext gmake GNU_CONFIGURE= yes CONFIGURE_ENV= SLANG_H_LOC="${LOCALBASE}/include/slang.h" \ - SLANG_LIB_LOC="${LOCALBASE}/lib" \ - LIBS="-lcurses -lintl" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib + SLANG_LIB_LOC="${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${CPPFLAGS} +LIBS+= -L${LOCALBASE}/lib -lcurses -lintl PLIST_FILES= bin/pdmenu \ etc/pdmenurc \ diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index 91a2910..a6fd899 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -17,9 +17,7 @@ USE_CSTD= gnu89 USE_XORG= x11 xext xt sm ice USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \ - LOCALBASE='${LOCALBASE}' \ - GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' +CONFIGURE_ENV= GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' CONFIGURE_ARGS= --disable-beep_media_player_plugin --disable-new-plugin PATCH_STRIP= -p1 INSTALL_TARGET= install-strip diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 14b2dd5..f863fd1 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -15,8 +15,8 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_GNOME= gnomeprefix libgnomeui USES= pathfix gmake pkgconfig diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile index 8bf9628..534fa0a 100644 --- a/multimedia/gnome-mplayer/Makefile +++ b/multimedia/gnome-mplayer/Makefile @@ -27,8 +27,7 @@ USE_GNOME= glib20 USE_XORG= x11 xscrnsaver INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS='-lintl' +LIBS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS= --disable-nautilus PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile index 38b7646..ce44227 100644 --- a/multimedia/libmovtar/Makefile +++ b/multimedia/libmovtar/Makefile @@ -10,16 +10,13 @@ MASTER_SITES= SF/mjpeg/OldFiles MAINTAINER= ports@FreeBSD.org COMMENT= Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg + USE_SDL= sdl USE_GNOME= glib12 USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} - -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg .include <bsd.port.pre.mk> diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index e047aed..2ac4a38 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USES= gmake MAKE_ARGS= CC="${CC}" USE_CSS=0 OBJDIR="obj" \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" + CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LIBS}" PORTDOCS= index.html PLIST_FILES= ${BIN_FILES:S|^|bin/|} ${INC_FILES:S|^|include/|} \ @@ -30,8 +30,8 @@ BIN_FILES= mpeg3cat mpeg3dump mpeg3peek mpeg3toc INC_FILES= libmpeg3.h mpeg3private.h mpeg3protos.h LIB_FILES= libmpeg3.a -CPPFLAGS+= -I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS} -LDFLAGS+= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS} +CPPFLAGS+= -I. -I${LOCALBASE}/include/a52dec +LIBS+= -lm -L${LOCALBASE}/lib -la52 -pthread NASM?= ${LOCALBASE}/bin/nasm diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index 48f58da..08001a1 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -21,9 +21,9 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" LIBUSB_LIBS="-lusb" LIBS="-lusb" +CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" MTPZ_CONFIGURE_ENABLE= mtpz MTPZ_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index cfe0161..e7d2493 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -17,9 +17,8 @@ GNU_CONFIGURE= yes USES= libtool:keepla USE_BZIP2= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="${PTHEAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-sdltest \ --enable-shared \ --disable-examples diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 9305520..1a6cd90 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -30,8 +30,8 @@ USE_SDL= sdl USES= gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ --disable-static diff --git a/multimedia/opencinematools/Makefile b/multimedia/opencinematools/Makefile index 69d60fa..66c0d25 100644 --- a/multimedia/opencinematools/Makefile +++ b/multimedia/opencinematools/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.1.2 PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTVERSIONSUFFIX= -src MAINTAINER= olgeni@FreeBSD.org COMMENT= Tools for creating multi-reel DCPs from MXF source material @@ -16,18 +16,16 @@ LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ USES= dos2unix zip -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +BUILD_WRKSRC= ${WRKSRC}/build/unix CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= CC="${CXX}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/mkcpl bin/mkpkl bin/mkmap -do-build: - @cd ${WRKSRC}/build/unix && ${MAKE} ${MAKE_ENV} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/mkcpl ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/mkpkl ${STAGEDIR}${PREFIX}/bin diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 621a870..4d8b341 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -35,9 +35,8 @@ USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="-lXrandr" \ - BROWSER_PLUGIN_DIR="${WEBPLUGIN_DIR}" +LIBS+= -L${LOCALBASE}/lib -lXrandr +CONFIGURE_ENV= BROWSER_PLUGIN_DIR="${WEBPLUGIN_DIR}" CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 223f5be..9c36bc2 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -23,8 +23,8 @@ USES= gmake iconv motif perl5 USE_BZIP2= yes GNU_CONFIGURE= yes USE_XORG= x11 xaw -CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" -CFLAGS+= -I${WRKSRC}/common +CPPFLAGS+= -I${WRKSRC}/common +LIBS+= -L${LOCALBASE}/lib MAKE_ENV= verbose=yes USE_LDCONFIG= yes ONLY_FOR_ARCHS= alpha amd64 i386 diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 92975df..b083067 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -20,8 +20,8 @@ CONFIGURE_ARGS?=--disable-gtkui \ --with-dynamic-prpls=${PRPL_MODULES:S/,$//} \ --enable-static \ --disable-nm -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .if !defined(PIDGIN_SLAVE) diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile index e09a040..0c6c757 100644 --- a/net-im/mu-conference/Makefile +++ b/net-im/mu-conference/Makefile @@ -46,7 +46,6 @@ MAKE_JOBS_UNSAFE= yes USE_MYSQL= yes CFLAGS+= -DHAVE_MYSQL LIBS+= `${LOCALBASE}/bin/mysql_config --libs` -MAKE_ENV+= LIBS="${LIBS}" DOCFILES+= README.sql mu-conference.sql .endif diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile index 823d45d..2a348e4 100644 --- a/net-mgmt/ap-utils/Makefile +++ b/net-mgmt/ap-utils/Makefile @@ -12,9 +12,8 @@ COMMENT= Set of utilities to configure and monitor wireless access points GNU_CONFIGURE= yes USES= iconv tar:bzip2 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lintl -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile index 25400a6..68373a7 100644 --- a/net-mgmt/bwm-ng/Makefile +++ b/net-mgmt/bwm-ng/Makefile @@ -14,10 +14,11 @@ LIB_DEPENDS= libstatgrab.so:${PORTSDIR}/devel/libstatgrab GNU_CONFIGURE= yes USES= pkgconfig +USE_CSTD= gnu89 PLIST_FILES= bin/bwm-ng man/man1/bwm-ng.1.gz -CONFIGURE_ENV= CPPFLAGS="-std=gnu89 `pkg-config --cflags libstatgrab`" \ - LIBS="`pkg-config --libs libstatgrab`" CONFIGURE_ARGS= --with-libstatgrab +CPPFLAGS+= `pkg-config --cflags libstatgrab` +LIBS+= `pkg-config --libs libstatgrab` .include <bsd.port.mk> diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile index a261d11..ba1704c 100644 --- a/net-mgmt/collectd/Makefile +++ b/net-mgmt/collectd/Makefile @@ -61,7 +61,7 @@ USE_LDCONFIG= yes CONFLICTS= collectd-5.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> @@ -249,7 +249,7 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-interface LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab PLIST_SUB+= INTERFACE="" -CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" +LIBS+= `pkg-config --libs libstatgrab` .else CONFIGURE_ARGS+=--disable-interface PLIST_SUB+= INTERFACE="@comment " diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 29ab37e..4a8d2ce 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -65,7 +65,7 @@ USE_LDCONFIG= yes CONFLICTS= collectd-4.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib PLIST_SUB+= RESETPREFIX=${PREFIX} @@ -212,7 +212,7 @@ PLIST_SUB+= DBI="@comment " .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE} -LDFLAGS+= -lgcrypt +LIBS+= -lgcrypt .else CONFIGURE_ARGS+=--without-libgcrypt .endif @@ -384,7 +384,7 @@ PLIST_SUB+= RRDTOOL="@comment " .if ${PORT_OPTIONS:MSTATGRAB} USES+= pkgconfig LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab -CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" +LIBS+= `pkg-config --libs libstatgrab` CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \ --enable-disk \ --enable-interface diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile index 665ab46..68f5804 100644 --- a/net-mgmt/disco/Makefile +++ b/net-mgmt/disco/Makefile @@ -11,8 +11,8 @@ MAINTAINER= jadawin@FreeBSD.org COMMENT= IP discovery and fingerprinting utility GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile index efc847a..8657bce 100644 --- a/net-mgmt/flow-extract/Makefile +++ b/net-mgmt/flow-extract/Makefile @@ -16,12 +16,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/ftlib.h:${PORTSDIR}/net-mgmt/flow-tools WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" PLIST_FILES= bin/flow-extract man/man1/${PORTNAME}.1.gz CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= ${LOCALBASE}/lib/libft.a -lz +LIBS+= ${LOCALBASE}/lib/libft.a -lz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/flow-extract ${STAGEDIR}${PREFIX}/bin diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile index a0aad83..706eb4e 100644 --- a/net-mgmt/icinga/Makefile +++ b/net-mgmt/icinga/Makefile @@ -31,8 +31,8 @@ ICINGAWWWDIR?= www/icinga ICINGAHTMURL?= /icinga ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin -CPPFLAGS+= -I${LOCALBASE}/include -fPIC -CFLAGS+= ${CPPFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \ --with-command-group=${WWWGRP} \ @@ -53,8 +53,7 @@ CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \ --enable-event-broker \ --enable-nanosleep -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - PERL=${PERL} \ +CONFIGURE_ENV= PERL=${PERL} \ HOME=${WRKDIR} # prevent creation of .rnd file INSTALL_TARGET= install install-config install-eventhandlers install-webconf diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 47b658e..5770d40 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -41,11 +41,11 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-httpd-conf=${PREFIX}/etc \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ --disable-statuswrl -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - PERL=${PERL} +CONFIGURE_ENV= PERL=${PERL} -CPPFLAGS+= -I${LOCALBASE}/include -fPIC +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile index bb19a87..433267f 100644 --- a/net-mgmt/nagios4/Makefile +++ b/net-mgmt/nagios4/Makefile @@ -39,11 +39,11 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ --disable-statuswrl \ --enable-event-broker -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - PERL=${PERL} +CONFIGURE_ENV= PERL=${PERL} -CPPFLAGS+= -I${LOCALBASE}/include -fPIC +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install install-commandmode install-config PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile index ebb6a5e..19d1690 100644 --- a/net-mgmt/nbtscan/Makefile +++ b/net-mgmt/nbtscan/Makefile @@ -14,8 +14,8 @@ COMMENT= NetBIOS name network scanner GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}a ALL_TARGET= nbtscan diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile index 036dcca..cb160a2 100644 --- a/net-mgmt/nefu/Makefile +++ b/net-mgmt/nefu/Makefile @@ -14,11 +14,11 @@ COMMENT= A network monitoring daemon USE_RC_SUBR= nefu GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - YACC=${YACC} \ +CONFIGURE_ENV= YACC=${YACC} \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} \ --without-sasl \ --without-zlib \ diff --git a/net-mgmt/rate/Makefile b/net-mgmt/rate/Makefile index 4c06318..2314b37 100644 --- a/net-mgmt/rate/Makefile +++ b/net-mgmt/rate/Makefile @@ -7,9 +7,9 @@ CATEGORIES= net-mgmt MASTER_SITES= http://s-tech.elsat.net.pl/bmtools/ MAINTAINER= mich@FreeBSD.org -COMMENT= A traffic analysis command-line utility +COMMENT= Traffic analysis command-line utility -MAKE_ARGS= ${MAKE_ENV} +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LDFLAGS+= -lcompat CFLAGS+= -DOPEN_BSD=1 -DHAVE_REGEX -DSTREAM_ANALYZER -DIOCTL_GETWINSIZE -DAUTOSENSE_DLH diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile index 2cc3343..45c781c 100644 --- a/net-mgmt/sing/Makefile +++ b/net-mgmt/sing/Makefile @@ -18,9 +18,9 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libpcap-prefix=/usr -CONFIGURE_ENV= LIBS="`${LIBNET_CONFIG} --libs`" CPPFLAGS+= `${LIBNET_CONFIG} --defines` \ `${LIBNET_CONFIG} --cflags` +LIBS+= `${LIBNET_CONFIG} --libs` PLIST_FILES= sbin/sing \ man/man8/sing.8.gz diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile index cb340e3..23b0bb6 100644 --- a/net-mgmt/snmp4nagios/Makefile +++ b/net-mgmt/snmp4nagios/Makefile @@ -33,8 +33,8 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --with-pngdir=${NAGIOSDIR}/snmp4nagios/png \ --prefix=${PREFIX} -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index 2b1a9ca..c2f3ccb 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -31,10 +31,10 @@ GUI_LIB_DEPENDS= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \ libcurl.so:${PORTSDIR}/ftp/curl GUI_USES= pkgconfig -BDB_CONFIGURE_ENV= LIBS=-L${BDB_LIB_DIR} BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} BDB_CONFIGURE_OFF= --without-libdb BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} +BDB_LIBS= -L${BDB_LIB_DIR} BDB_USE= BDB=${WITH_BDB_VER} NLS_CONFIGURE_ENABLE= nls diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile index 7c84dfd..7d1765c 100644 --- a/net-p2p/teknap/Makefile +++ b/net-p2p/teknap/Makefile @@ -28,8 +28,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/TekNap PORTDOCS= * -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib NO_STAGE= yes .include <bsd.port.pre.mk> diff --git a/net/arping/Makefile b/net/arping/Makefile index c8df0da..94fdd5a 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -14,10 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= net:${PORTSDIR}/net/libnet GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`${LIBNET_CONFIG} --libs` -lpcap" -CFLAGS+= `${LIBNET_CONFIG} --defines` -CPPFLAGS+= -I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags` -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include \ + `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` +LIBS+= -L${LOCALBASE}/lib `${LIBNET_CONFIG} --libs` -lpcap LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config diff --git a/net/c3270/Makefile b/net/c3270/Makefile index 639a6e1..76c7ab8 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -18,9 +18,8 @@ CONFLICTS= x3270-* GNU_CONFIGURE= yes USES= iconv readline gmake USE_OPENSSL= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib MAN1= c3270.1 \ x3270if.1 \ diff --git a/net/dante/Makefile b/net/dante/Makefile index 3786f39..29249b7 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -17,8 +17,8 @@ CONFLICTS= socks5-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 201fb93..294cabf 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -30,8 +30,9 @@ USES= gmake tar:bzip2 shebangfix SHEBANG_FILES= scripts/radsqlrelay src/modules/rlm_counter/rad_counter USE_AUTOTOOLS= libltdl libtool autoconf USE_OPENSSL= yes -MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${CPPFLAGS} +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes PLIST_SUB= PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g} @@ -345,9 +346,6 @@ post-patch: ${WRKSRC}/scripts/Makefile pre-configure: -# Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files - @${FIND} -E ${WRKSRC} -regex '.*/configure(\.in)?$$' -exec \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \; # Force the rebuild of some configures from configure.in, as we're patching # the configure.in # NOTE: ${WRKSRC}/configure is rebuilt automatically once autoconf is diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index e7d9a35..0e6b56f 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -33,10 +33,11 @@ USES= gmake tar:bzip2 shebangfix SHEBANG_FILES= src/modules/rlm_counter/rad_counter scripts/sql/radsqlrelay GNU_CONFIGURE= yes USE_OPENSSL= yes -MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" # Prevent /root/.rnd leftover MAKE_ARGS+= HOME=/dev/null -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${CPPFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes PLIST_SUB= PORTVERSION=${DISTVERSION} LIBVER=0${PORTVERSION:C/\./0/g} @@ -370,11 +371,6 @@ post-patch: @${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/ .endif -pre-configure: -# Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files - @${FIND} -E ${WRKSRC} -regex '.*/configure(\.in)?$$' -exec \ - ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \; - post-build: @${FIND} ${WRKSRC}/build/lib -type f -name '*.so' -exec ${STRIP_CMD} {} \; @${FIND} ${WRKSRC}/build/bin -type f -exec ${STRIP_CMD} {} \; diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile index 8cd464a..bd25da8 100644 --- a/net/freeswitch-core-devel/Makefile +++ b/net/freeswitch-core-devel/Makefile @@ -49,8 +49,8 @@ SUB_FILES= pkg-install USE_RC_SUBR= freeswitch HAS_CONFIGURE= yes USE_LDCONFIG= yes +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --datadir=${VARBASE}/db/${PORTNAME} \ @@ -71,11 +71,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-ogg-includes=${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include - FREESWITCH_USER?= freeswitch FREESWITCH_GROUP?= ${FREESWITCH_USER} FREESWITCH_UID?= 610 diff --git a/net/freeswitch-core-devel/files/patch-build-modmake.rules.in b/net/freeswitch-core-devel/files/patch-build-modmake.rules.in new file mode 100644 index 0000000..9157b96 --- /dev/null +++ b/net/freeswitch-core-devel/files/patch-build-modmake.rules.in @@ -0,0 +1,10 @@ +--- build/modmake.rules.in.orig ++++ build/modmake.rules.in +@@ -42,6 +42,7 @@ + OPENSSL_LIBS=@openssl_LIBS@ + OPENSSL_CFLAGS=@openssl_CFLAGS@ + ++unexport LIBS + LIBS=$(switch_builddir)/libfreeswitch.la + DEFS=@DEFS@ + diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile index ae4702e..8fd8c08 100644 --- a/net/gutenfetch/Makefile +++ b/net/gutenfetch/Makefile @@ -12,8 +12,8 @@ COMMENT= Fetch listings and books from Project Gutenberg LIB_DEPENDS= gutenfetch:${PORTSDIR}/devel/libgutenfetch GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake tar:bzip2 MAN1= gutenfetch.1 diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 3e7a6a6..c6690f3 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -100,9 +100,9 @@ USES+= perl5 USE_PERL5= run USE_OPENLDAP= yes USE_AUTOTOOLS= aclocal libtoolize autoconf autoheader automake -LIBTOOLIZE_ARG= --copy --force AUTOMAKE_ARGS= --foreign --add-missing --copy -CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-ldap .else PLIST_SUB+= LDAP="@comment " @@ -112,7 +112,7 @@ PLIST_SUB+= LDAP="@comment " .if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP} USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ldapcrypto -CONFIGURE_ENV+= LIBS="-lssl" +LIBS+= -lssl # hack to get bsd.openssl.mk included at this late state .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile index 3fc4911..239da38 100644 --- a/net/isc-dhcp42-server/Makefile +++ b/net/isc-dhcp42-server/Makefile @@ -102,7 +102,8 @@ USE_OPENLDAP= yes LDAP_SCRIPT= ${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap LDAP_SCHEMA= ${WRKSRC}/contrib/ldap/dhcp.schema LDAP_README= ${WRKSRC}/contrib/ldap/README.ldap -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS+= README.ldap PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP="" USES+= shebangfix @@ -114,7 +115,7 @@ PLIST_SUB+= LDAP="@comment " .if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ldapcrypto -CONFIGURE_ENV+= LIBS="-lssl" +LIBS+= -lssl .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile index bf1c558..40ea27a 100644 --- a/net/isc-dhcp43-server/Makefile +++ b/net/isc-dhcp43-server/Makefile @@ -102,7 +102,8 @@ USE_OPENLDAP= yes LDAP_SCRIPT= ${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap LDAP_SCHEMA= ${WRKSRC}/contrib/ldap/dhcp.schema LDAP_README= ${WRKSRC}/contrib/ldap/README.ldap -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS+= README.ldap PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP="" USES+= shebangfix @@ -114,7 +115,7 @@ PLIST_SUB+= LDAP="@comment " .if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ldapcrypto -CONFIGURE_ENV+= LIBS="-lssl" +LIBS+= -lssl .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile index e3935a0..24dfca4 100644 --- a/net/ldap2dns/Makefile +++ b/net/ldap2dns/Makefile @@ -24,7 +24,7 @@ USES= gmake perl5 shebangfix SHEBANG_FILES= scripts/*.pl USE_PERL5= run USE_OPENLDAP= yes - +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LD="${CC}" LDFLAGS="${LDFLAGS}" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -41,9 +41,7 @@ PLIST_DIRS= %%DATADIR%% OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e \ - 's|^CC=|CC?=| ; \ - s|^LD=.*|LD=$$(CC)|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's|?=|=|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e \ 's|"/etc|"${PREFIX}/etc|' ${WRKSRC}/ldap2dns.c @${REINPLACE_CMD} -e \ diff --git a/net/nast/Makefile b/net/nast/Makefile index a100d07..8dd40b8 100644 --- a/net/nast/Makefile +++ b/net/nast/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= net:${PORTSDIR}/net/libnet USES= gmake GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" PLIST_FILES= bin/nast man/man8/nast.8.gz @@ -27,8 +26,7 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config post-patch: @${REINPLACE_CMD} -e \ - 's|CFLAGS="-Wall -O2 -pthread"||g; \ - s|libnet-config|${LIBNET_CONFIG}|; \ + 's|libnet-config|${LIBNET_CONFIG}|; \ s|-lnet|`${LIBNET_CONFIG} --libs`|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/net/nast/files/patch-configure b/net/nast/files/patch-configure index a2fd431..b8605f3 100644 --- a/net/nast/files/patch-configure +++ b/net/nast/files/patch-configure @@ -50,8 +50,17 @@ -fi - -fi -+CPPFLAGS="`libnet-config --cflags`" -+LDFLAGS="`libnet-config --libs`" ++CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`" ++LDFLAGS="${LDFLAGS} `libnet-config --libs`" if test "$filechk" = "no"; then { { echo "$as_me:$LINENO: error: +@@ -3046,7 +3002,7 @@ + CFLAGS="-Wall -O2" + ;; + *bsd*) +- CFLAGS="-Wall -O2 -pthread" ++ CFLAGS="${CFLAGS} -Wall -pthread" + ;; + esac + diff --git a/net/netdude/Makefile b/net/netdude/Makefile index 9e4b0ea..87d9022 100644 --- a/net/netdude/Makefile +++ b/net/netdude/Makefile @@ -16,7 +16,7 @@ USES= gettext iconv libtool gmake USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR} -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lltdl" +LIBS+= -L${LOCALBASE}/lib -lltdl USE_GNOME= glib12 gtk12 INSTALL_TARGET= install-strip diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index d1c432f..28483bb 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -70,6 +70,7 @@ post-patch: @${REINPLACE_CMD} -e "s#%%INSTALL_SCRIPT%%#${INSTALL_SCRIPT}#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s#%%INSTALL_DATA%%#${INSTALL_DATA}#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s#%%G++%%#${CXX}#" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s#LIBS#LIBRARIES#" ${WRKSRC}/Makefile.in pre-build: cd ${WRKSRC}/third-party/json-c && ${MAKE} clean && ./configure && ${MAKE} diff --git a/net/ntopng/files/patch-configure b/net/ntopng/files/patch-configure index 3841dc5..73c7b49 100644 --- a/net/ntopng/files/patch-configure +++ b/net/ntopng/files/patch-configure @@ -8,12 +8,9 @@ SVN_DATE GMAKE SQLITE_LIB -@@ -2953,15 +2952,15 @@ - NTOPNG_VERS=`cat ./configure.in | head -1 | grep '_INIT' | cut -d " " -f 2|cut -d ')' -f 1` - CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include" +@@ -2955,13 +2954,13 @@ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include" --LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" -+LDFLAGS="${LDFLAGS}-L/usr/local/lib -L/opt/local/lib" + LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" -SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2` +SVN_RELEASE="6939" diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 779246a..5568d3f 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -486,12 +486,8 @@ CONFIGURE_ARGS+= --enable-wrappers CPPFLAGS+= -DLDAP_CONNECTIONLESS .endif -CPPFLAGS+= ${PTHREAD_CFLAGS} \ - -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -#LIBS+= ${PTHREAD_LIBS} - -CONFIGURE_ENV+= LIBS="${LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .if defined(CLIENT_ONLY) .else diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile index bf3d02d..e76f9d3 100644 --- a/net/rtpproxy/Makefile +++ b/net/rtpproxy/Makefile @@ -13,9 +13,8 @@ COMMENT= High-performance RTP proxy server for the SIP Express Router (SER) LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS=-L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -#CONFIGURE_ARGS= --mandir=${LOCALBASE}/man +LIBS+= -L${LOCALBASE}/lib MAN8= rtpproxy.8 USERS= ${PORTNAME} diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index 39e527f..160564c 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -3,7 +3,7 @@ PORTNAME= siproxd PORTVERSION= 0.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF @@ -14,9 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libosip2.so:${PORTSDIR}/net/libosip +USES= libtool:keepla USE_RC_SUBR= siproxd GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-doc --with-libosip-prefix=${PREFIX} +CONFIGURE_ARGS= --disable-doc --disable-static --with-libosip-prefix=${PREFIX} PORTDOCS1= AUTHORS ChangeLog README RELNOTES PORTDOCS2= FAQ KNOWN_BUGS RFC3261_compliance.txt \ diff --git a/net/siproxd/files/patch-aclocal.m4 b/net/siproxd/files/patch-aclocal.m4 deleted file mode 100644 index e430e1f..0000000 --- a/net/siproxd/files/patch-aclocal.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4.orig 2008-03-09 14:35:51.000000000 +0100 -+++ aclocal.m4 2008-09-23 11:23:56.000000000 +0200 -@@ -1276,7 +1276,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/net/siproxd/files/patch-configure b/net/siproxd/files/patch-configure index 5da8af5..9e0453f 100644 --- a/net/siproxd/files/patch-configure +++ b/net/siproxd/files/patch-configure @@ -1,38 +1,13 @@ --- configure.orig 2008-03-09 14:35:57.000000000 +0100 +++ configure 2008-09-23 11:25:19.000000000 +0200 -@@ -8063,7 +8063,7 @@ - ;; +@@ -23988,7 +23988,9 @@ - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -11733,7 +11733,7 @@ - ;; - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -14867,7 +14867,7 @@ - ;; - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -17197,7 +17197,7 @@ - ;; +-LIBS="$LIBS $FWLIBS" ++tmp_LIBS="${LIBS}" ++unset LIBS ++LIBS="${tmp_LIBS} $FWLIBS" + + - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/net/siproxd/files/patch-libltdl_aclocal.m4 b/net/siproxd/files/patch-libltdl_aclocal.m4 deleted file mode 100644 index bb98636..0000000 --- a/net/siproxd/files/patch-libltdl_aclocal.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- libltdl/aclocal.m4.orig 2008-02-02 18:16:08.000000000 +0100 -+++ libltdl/aclocal.m4 2008-09-23 11:26:47.000000000 +0200 -@@ -1276,7 +1276,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/net/siproxd/files/patch-libltdl_configure b/net/siproxd/files/patch-libltdl_configure deleted file mode 100644 index d11e537..0000000 --- a/net/siproxd/files/patch-libltdl_configure +++ /dev/null @@ -1,38 +0,0 @@ ---- libltdl/configure.orig 2008-02-02 18:16:08.000000000 +0100 -+++ libltdl/configure 2008-09-23 11:28:19.000000000 +0200 -@@ -7954,7 +7954,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -11518,7 +11518,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -14519,7 +14519,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -16804,7 +16804,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=elf - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/net/siproxd/pkg-plist b/net/siproxd/pkg-plist index 009185d..3d85b08 100644 --- a/net/siproxd/pkg-plist +++ b/net/siproxd/pkg-plist @@ -1,18 +1,13 @@ etc/siproxd.conf.example etc/siproxd_passwd.cfg -lib/siproxd/plugin_defaulttarget.a lib/siproxd/plugin_defaulttarget.la lib/siproxd/plugin_defaulttarget.so -lib/siproxd/plugin_demo.a lib/siproxd/plugin_demo.la lib/siproxd/plugin_demo.so -lib/siproxd/plugin_fix_bogus_via.a lib/siproxd/plugin_fix_bogus_via.la lib/siproxd/plugin_fix_bogus_via.so -lib/siproxd/plugin_logcall.a lib/siproxd/plugin_logcall.la lib/siproxd/plugin_logcall.so -lib/siproxd/plugin_shortdial.a lib/siproxd/plugin_shortdial.la lib/siproxd/plugin_shortdial.so sbin/siproxd diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile index 137d80d..dc5dfc0 100644 --- a/net/tac_plus4/Makefile +++ b/net/tac_plus4/Makefile @@ -36,8 +36,8 @@ CONFIGURE_ARGS+= --without-skey .endif .if exists(/usr/include/opie.h) && !defined(WITHOUT_OPIE) -CFLAGS+= -DOPIE -CONFIGURE_ENV+= LIBS="-lopie -lmd" +CPPFLAGS+= -DOPIE +LIBS+= -lopie -lmd .endif post-patch: diff --git a/net/traff/Makefile b/net/traff/Makefile index 87964d4..8257270 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -15,9 +15,7 @@ USE_RC_SUBR= traff USES= gmake GNU_CONFIGURE= yes -CFLAGS+= ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib -LFLAGS= ${PTHREAD_LIBS} -CONFIGURE_ENV+= "LIBS=-largp" +LIBS+= -L${LOCALBASE}/lib -largp OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL @@ -27,20 +25,18 @@ NO_STAGE= yes .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes -CFLAGS+= -DwithMYSQL -I${LOCALBASE}/include -L${LOCALBASE}/lib/mysql -LFLAGS+= -L${LOCALBASE}/lib/mysql -lmysqlclient_r +CPPFLAGS+= -DwithMYSQL -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient_r CONFIGURE_ARGS+=--enable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes -CFLAGS+= -DwithPGSQL -I${LOCALBASE}/include -LFLAGS+= -L${LOCALBASE}/lib -lpq +CPPFLAGS+= -DwithPGSQL -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lpq CONFIGURE_ARGS+=--enable-postgresql .endif -MAKE_ARGS+= EXTRA_LIBS="${LFLAGS}" - post-configure: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/Makefile ${WRKSRC}/traff.c diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile index e7768e9..ec81a40 100644 --- a/net/trafshow3/Makefile +++ b/net/trafshow3/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ALL_TARGET= trafshow post-patch: diff --git a/net/trickle/Makefile b/net/trickle/Makefile index 0f642e3..282470a 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -22,8 +22,8 @@ MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \ --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= * post-install: diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 3c06d16..59385cc 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -15,10 +15,9 @@ RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop USE_GNOME= gtk20 USES= gettext gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" CONFIGURE_ARGS= --disable-gnome CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0` PORTDOCS= COPYING NEWS README diff --git a/net/uplog/Makefile b/net/uplog/Makefile index a24c70e..26f886cc 100644 --- a/net/uplog/Makefile +++ b/net/uplog/Makefile @@ -10,8 +10,8 @@ MAINTAINER= jadawin@FreeBSD.org COMMENT= UDP-based ping program GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= README PLIST_FILES= bin/uplog diff --git a/net/wire/Makefile b/net/wire/Makefile index 2713ed2..2517456 100644 --- a/net/wire/Makefile +++ b/net/wire/Makefile @@ -14,8 +14,8 @@ COMMENT= Wire is a screen-oriented command line Wired client GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include" +LIBS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --libdir="${PREFIX}/lib" --includedir="${PREFIX}/include" USE_OPENSSL= yes USES= iconv gmake diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 2373e4e..1cf5259 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -24,20 +24,17 @@ USE_PYTHON_BUILD=yes USES= iconv gettext pkgconfig gmake perl5 tar:bzip2 WANT_GNOME= yes USE_OPENSSL= yes -CONFIGURE_ENV= LIBS="${WIRESHARK_LIBS}" CONFIGURE_ARGS+= --program-transform-name="" \ --with-ssl=${OPENSSLBASE} USE_LDCONFIG= yes DATADIR= ${PREFIX}/share/${DATADIR_NAME} -LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -funit-at-a-time +LIBS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES= "Wireshark" "Network Protocol Analyzer" \ "${DATADIR}/hi48-app-wireshark.png" \ "wireshark" "System;Monitor;GTK;" true -WIRESHARK_LIBS= - .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap .if defined(LITE) @@ -70,7 +67,6 @@ USE_XORG= x11 .if ${PORT_OPTIONS:MX11} PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" USE_GNOME+= gtk20 -WIRESHARK_LIBS+=${PTHREAD_LIBS} .else PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ WIRESHARK_MAN="@comment wireshark not built " @@ -114,7 +110,6 @@ PLIST_SUB+= LUA="@comment " .if ${PORT_OPTIONS:MRTP} && !defined(LITE) LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE} -WIRESHARK_LIBS+=${PTHREAD_LIBS} .else CONFIGURE_ARGS+=--without-portaudio .endif diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile index db2fa37..16b53d8 100644 --- a/news/newsstar/Makefile +++ b/news/newsstar/Makefile @@ -23,14 +23,13 @@ SHEBANG_FILES= newsstar.in OPTIONS_DEFINE= SSL OPTIONS_DEFAULT= SSL -CONFIGURE_ARGS+=--prefix=${PREFIX} \ - --disable-chown \ +CONFIGURE_ARGS+=--disable-chown \ --with-conf-dir=${PREFIX}/etc/newsstar \ --with-rc-dir=/var/spool/newsstar/lib \ --with-incoming-dir=/var/spool/newsstar/incoming -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} .include <bsd.port.options.mk> diff --git a/news/noffle/Makefile b/news/noffle/Makefile index 82df632..275e33d 100644 --- a/news/noffle/Makefile +++ b/news/noffle/Makefile @@ -16,8 +16,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \ --with-usersfile=${LOCALBASE}/etc/noffle.users -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SPOOL_DIR= /var/spool/noffle PLIST_SUB+= SPOOL_DIR=${SPOOL_DIR} diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 9998942..c5d71ca7 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -30,7 +30,7 @@ STRIP= CONFIGURE_ARGS= --with-medium=libpaper --sharedstatedir=${PREFIX}/share \ --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \ --localstatedir=${PREFIX}/share -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +LIBS+= -L${LOCALBASE}/lib PAPERSIZE?= .if ${PAPERSIZE:tl} == a4 diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index d7b3aa0..737cf4b 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -22,10 +22,9 @@ UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} USES+= gmake pkgconfig tar:bzip2 DESTDIRNAME= DSTROOT GNU_CONFIGURE= yes -CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DSOFLAGS= -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib ${LDFLAGS} +DSOFLAGS= -Wl,-rpath,${PREFIX}/lib ${LDFLAGS} ${LIBS} CONFIGURE_ENV= DSOFLAGS="${DSOFLAGS}" CONFIGURE_ARGS+= --localstatedir=/var \ --disable-gssapi \ @@ -80,7 +79,7 @@ COMMENT2= Library cups INSTALL_WRKSRC= ${WRKSRC}/cups PLIST= ${MASTERDIR}/pkg-plist.client USES+= iconv -LDFLAGS+= ${ICONV_LIB} +LIBS+= ${ICONV_LIB} USE_LDCONFIG= yes PKGMESSAGE= ${NONEXISTENT} DESCR= ${MASTERDIR}/pkg-descr.client @@ -189,8 +188,6 @@ RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils .endif .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB} -CPPFLAGS+= -I/usr/include -LDFLAGS+= -L/usr/lib CONFIGURE_ARGS+= --enable-libusb .else CONFIGURE_ARGS+= --disable-libusb @@ -204,7 +201,9 @@ PLIST_SUB+= WITH_ICONS="" PLIST_SUB+= WITH_ICONS="@comment " .endif -CONFIGURE_ARGS+= LIBS="-lssp_nonshared" +.if ${OSVERSION} < 1000036 && ${ARCH} == i386 +LIBS+= -lssp_nonshared +.endif .if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE) SUB_FILES+= ulpt-cupsd.conf ulpt-cupsd.sh diff --git a/print/gv/Makefile b/print/gv/Makefile index 2e0e447..abad585 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -17,8 +17,7 @@ USES= iconv gmake perl5 shebangfix USE_PERL5= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV += LDFLAGS="${LDFLAGS}" LIBS="${ICONV_LIB}" +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/X11 \ --enable-setenv-code \ --enable-SIGCHLD-fallback diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile index 7fb0090..0ec9731 100644 --- a/print/openprinting/Makefile +++ b/print/openprinting/Makefile @@ -28,6 +28,9 @@ USE_AUTOTOOLS= aclocal autoconf autoheader automake libtool ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS+= -a -c +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl + # Really disable building static libraries; the package does not use # its own libtool, and we have to tell it to stop. # Static libraries are not very useful in this package. @@ -45,12 +48,6 @@ MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static" .include <bsd.port.options.mk> -# NOTE: hard dependency on gettext() in distfiles. -CONFIGURE_ARGS+=\ - LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-lintl" - # NOTE: This has only been tested with www/apache20, with integrated APR. .if defined(WITH_MOD_IPP) IGNORE= no supported apache versions available diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile index 6a2759e..c41af94 100644 --- a/print/ttf2pt1/Makefile +++ b/print/ttf2pt1/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= t1asm:${PORTSDIR}/print/t1utils USES= pkgconfig shebangfix perl5 uidfix -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \ +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LIBS}" \ INSTDIR="${STAGEDIR}${PREFIX}" LIBXDIR="${STAGEDIR}${PREFIX}/bin" \ OWNER=${BINOWN} GROUP=${BINGRP} SHEBANG_FILES= app/TeX/sfd2map \ @@ -33,7 +33,7 @@ SHEBANG_FILES= app/TeX/sfd2map \ CPPFLAGS+= `pkg-config --cflags freetype2` \ -I${LOCALBASE}/include -DUSE_FREETYPE -LDFLAGS+= `pkg-config --libs freetype2` \ +LIBS+= `pkg-config --libs freetype2` \ -L${LOCALBASE}/lib -lm post-install: diff --git a/security/bsmtrace/Makefile b/security/bsmtrace/Makefile index c844a16..adfa8e2 100644 --- a/security/bsmtrace/Makefile +++ b/security/bsmtrace/Makefile @@ -21,8 +21,9 @@ OPTIONS_DEFINE= PCRE EXAMPLES .if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -MAKE_ENV+= PCRE=1 LIBS="-lpcre -L${LOCALBASE}/lib" +MAKE_ENV+= PCRE=1 CFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lpcre .endif pre-build: diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile index 997c975..55e4abd 100644 --- a/security/libgnomesu/Makefile +++ b/security/libgnomesu/Makefile @@ -15,8 +15,8 @@ USES= pathfix gmake pkgconfig libtool GNU_CONFIGURE= yes USE_GNOME= gnomeprefix libgnomeui CONFIGURE_ARGS+=--disable-install-pam -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile index d0ffbf9..5427b91 100644 --- a/security/libgringotts/Makefile +++ b/security/libgringotts/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libmcrypt.so:${PORTSDIR}/security/libmcrypt \ USES= tar:bzip2 libtool GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile index 022de16..ee7f936 100644 --- a/security/libpwquality/Makefile +++ b/security/libpwquality/Makefile @@ -18,9 +18,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+=--disable-pam CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -# configure needs to be fixed -CONFIGURE_ENV+= LIBS="-lintl" +LIBS+= -L${LOCALBASE}/lib -lintl OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON diff --git a/security/openscep/Makefile b/security/openscep/Makefile index ff07d21..32dc078d 100644 --- a/security/openscep/Makefile +++ b/security/openscep/Makefile @@ -25,7 +25,7 @@ NO_STAGE= yes PLIST_DIRSTRY= www/cgi-bin CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \ --with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \ --with-openscep-dir="${PREFIX}/etc/openscep" \ diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile index 71e1056..c855cec 100644 --- a/security/p11-kit/Makefile +++ b/security/p11-kit/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libtasn1.so:${PORTSDIR}/security/libtasn1 \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --enable-debug=no \ - --with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" + --with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt \ + ac_cv_func_pthread_mutexattr_init=no MAKE_ENV= exampledir=${STAGEDIR}${EXAMPLESDIR} USES= gmake libtool:keepla pathfix pkgconfig diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 10003f3..3ae49f0 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -23,13 +23,12 @@ USES= pkgconfig gettext iconv gmake USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes USE_LDCONFIG= yes - USE_RC_SUBR= prelude-manager -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --localstatedir=/var -CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --localstatedir=/var +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USERS?= prelude GROUPS?= prelude diff --git a/security/sectok/Makefile b/security/sectok/Makefile index 2354d31..2d464d1 100644 --- a/security/sectok/Makefile +++ b/security/sectok/Makefile @@ -15,17 +15,18 @@ LIB_DEPENDS= libsectok.so:${PORTSDIR}/security/libsectok USE_OPENSSL= yes USE_LDCONFIG= yes +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz post-patch: - @${REINPLACE_CMD} -e \ - '/^INCLUDES=/s|$$| $${CPPFLAGS}| ; \ - /^LIBS=/s|$$| $${LDFLAGS}| ; \ - s|^CC=|CC?=| ; \ - s|^CFLAGS=|CFLAGS?=|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} \ + -e '/^INCLUDES=/s|$$| ${CPPFLAGS}|' \ + -e '/^LIBS=/s|=|=${LDFLAGS} |' \ + -e '/^LIBS=/s|$$| ${LIBS}|' \ + ${WRKSRC}/Makefile do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ diff --git a/security/steghide/Makefile b/security/steghide/Makefile index 437f4b9..a04e680 100644 --- a/security/steghide/Makefile +++ b/security/steghide/Makefile @@ -20,8 +20,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gettext perl5 gmake libtool USE_AUTOTOOLS= libtoolize GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt" -CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fpermissive +CPPFLAGS+= -I${LOCALBASE}/include -fpermissive +LIBS+= -L${LOCALBASE}/lib -lintl -lmcrypt post-patch: ${REINPLACE_CMD} -e 's,SHELL) libtool,SHELL) ${LIBTOOL} --tag=CXX,' \ diff --git a/security/vlog/Makefile b/security/vlog/Makefile index e71f085..bc08dd7 100644 --- a/security/vlog/Makefile +++ b/security/vlog/Makefile @@ -17,15 +17,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= perl5 USE_PERL5= build -MAKE_ENV= LIBS="-lcurses -pthread" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS} -lcurses -pthread" ALL_TARGET= it PLIST_FILES= bin/vlog man/man1/vlog.1.gz post-patch: - @${REINPLACE_CMD} -e \ - '/^CC/s|\([[:space:]]\)=|\1?=| ; \ - /strip/s|^|#|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} '/strip/d' ${WRKSRC}/Makefile do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} vlog \ diff --git a/security/xca/Makefile b/security/xca/Makefile index 035b828..a960fce 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -27,8 +27,8 @@ LD_CXX_LIB= -lc++ post-patch: @echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak @echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak - @echo "LDFLAGS= ${LDFLAGS} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak - @echo "LIBS=-lQtCore -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak + @echo "LDFLAGS= ${LDFLAGS}" >> ${WRKSRC}/Local.mak + @echo "LIBS= ${LIBS} -L${QT_LIBDIR} -L${LOCALBASE}/lib -lQtCore -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak @echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak @echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak @echo "RCC=${LOCALBASE}/bin/rcc" >> ${WRKSRC}/Local.mak diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 8b42fdf..5a26df8 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -30,10 +30,8 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --with-serial-dev=/dev/usv CONFIGURE_ENV+= LD="${CXX}" -#CONFIGURE_ENV+= LIBS="-lstdc++" -CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAN5= apcupsd.conf.5 MAN8= apcaccess.8 apccontrol.8 apctest.8 apcupsd.8 diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index 07b6ae0..fa3bfb9 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -23,8 +23,9 @@ GNU_CONFIGURE= yes # bugs.freebsd.org/160060 CONFIGURE_ARGS= --program-prefix=g \ --program-transform-name=s/stat/nustat/ -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" FORCE_UNSAFE_CONFIGURE=1 -CPPFLAGS+= "-I${LOCALBASE}/include" +CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1 +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake iconv perl5 charsetfix USE_PERL5= build # build - required for tests and man page generation diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index ef9633e..1ecedb8 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -16,7 +16,6 @@ USES= pathfix shebangfix libtool SHEBANG_FILES= doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh USE_GCC= any GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lelf" CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \ --disable-upx --disable-libgcrypt-linking \ --disable-ea-support --disable-nodump-flag \ @@ -25,7 +24,7 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS LZO NLS OPTIONS_SUB= yes diff --git a/sysutils/dar/files/patch-configure b/sysutils/dar/files/patch-configure new file mode 100644 index 0000000..6e6f7a4 --- /dev/null +++ b/sysutils/dar/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig ++++ configure +@@ -6453,7 +6453,7 @@ + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, +- (char **) &inptr, &inbytesleft, ++ &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; +@@ -6472,7 +6472,7 @@ + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, +- (char **) &inptr, &inbytesleft, ++ &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; diff --git a/sysutils/dar/files/patch-src-dar-Makefile.in b/sysutils/dar/files/patch-src-dar-Makefile.in index 9688c36..983b530 100644 --- a/sysutils/dar/files/patch-src-dar-Makefile.in +++ b/sysutils/dar/files/patch-src-dar-Makefile.in @@ -1,6 +1,6 @@ --- src/dar_suite/Makefile.in.orig 2007-08-06 15:55:23.000000000 +0200 +++ src/dar_suite/Makefile.in 2007-08-06 15:55:32.000000000 +0200 -@@ -282,7 +282,7 @@ +@@ -330,7 +330,7 @@ @USE_UPX_TRUE@UPX = @UPX_PROG@ @BUILD_DAR_STATIC_FALSE@@USE_UPX_TRUE@ALSO_BUILD_INST = @BUILD_DAR_STATIC_TRUE@@USE_UPX_TRUE@ALSO_BUILD_INST = $(ALSO_BUILD)$(EXEEXT) @@ -8,4 +8,22 @@ +LDADD=../libdar/lib$(MYLIB).la @DEBUG_STATIC_FALSE@AM_LDFLAGS = @LTLIBINTL@ $(LD_PROF) @DEBUG_STATIC_TRUE@AM_LDFLAGS = -all-static @LTLIBINTL@ $(LD_PROF) - dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h + dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp crit_action_cmd_line.hpp +@@ -349,7 +349,7 @@ + # + dar_static_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp + dar_static_DEPENDENCIES = ../libdar/lib$(MYLIB).la +-dar_static_LDFLAGS = -all-static @LTLIBINTL@ ++dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@ + all: all-am + + .SUFFIXES: +@@ -456,7 +456,7 @@ + $(CXXLINK) $(dar_slave_OBJECTS) $(dar_slave_LDADD) $(LIBS) + dar_static$(EXEEXT): $(dar_static_OBJECTS) $(dar_static_DEPENDENCIES) $(EXTRA_dar_static_DEPENDENCIES) + @rm -f dar_static$(EXEEXT) +- $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS) ++ $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS) -lelf + dar_xform$(EXEEXT): $(dar_xform_OBJECTS) $(dar_xform_DEPENDENCIES) $(EXTRA_dar_xform_DEPENDENCIES) + @rm -f dar_xform$(EXEEXT) + $(CXXLINK) $(dar_xform_OBJECTS) $(dar_xform_LDADD) $(LIBS) diff --git a/sysutils/dc3dd/Makefile b/sysutils/dc3dd/Makefile index 5c689d3c..ac3b93b 100644 --- a/sysutils/dc3dd/Makefile +++ b/sysutils/dc3dd/Makefile @@ -12,8 +12,8 @@ COMMENT= A dd program useful for computer forensics USE_BZIP2= yes USES= gettext iconv gmake GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/sysutils/fileschanged/Makefile b/sysutils/fileschanged/Makefile index 98b8444..432a8d0 100644 --- a/sysutils/fileschanged/Makefile +++ b/sysutils/fileschanged/Makefile @@ -15,9 +15,8 @@ BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man GNU_CONFIGURE= yes USES= fam gmake -CONFIGURE_ENV+= LIBS="-largp" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -largp CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc --disable-nls INFO= fileschanged diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile index edb6bd5..75233b0 100644 --- a/sysutils/gcombust/Makefile +++ b/sysutils/gcombust/Makefile @@ -21,8 +21,8 @@ USE_PERL5= build USE_GNOME= gtk12 gnomehier GNU_CONFIGURE= yes CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib NO_STAGE= yes diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile index c53c1e3..1e0c5ff 100644 --- a/sysutils/graveman/Makefile +++ b/sysutils/graveman/Makefile @@ -19,8 +19,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USES= pathfix pkgconfig gettext gmake USE_GNOME= libglade2 intlhack gnomeprefix -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= MP3 OGG DVD DVD_DESC= DVD+RW support diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile index 3a3f2a1..b71c512 100644 --- a/sysutils/htop/Makefile +++ b/sysutils/htop/Makefile @@ -18,10 +18,8 @@ OPTIONS_DEFAULT=LSOF NOT_FOR_ARCHS= ia64 powerpc sparc64 GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="-lexecinfo" +LIBS+= -L${LOCALBASE}/lib -lexecinfo CONFIGURE_ARGS= --with-proc=/compat/linux/proc --enable-unicode USES= ncurses libtool diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile index f294ad9..f8efe63 100644 --- a/sysutils/mate-system-monitor/Makefile +++ b/sysutils/mate-system-monitor/Makefile @@ -22,9 +22,8 @@ USE_GNOME= glib20 gnomehier gtk20 librsvg2 intlhack libxml2 gtkmm24 INSTALLS_OMF= yes USE_AUTOTOOLS= aclocal:env autoconf:env automake:env libtoolize:env GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lutil" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lutil GLIB_SCHEMAS= org.mate.system-monitor.enums.xml \ org.mate.system-monitor.gschema.xml diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile index 5f50fb2..c8207f3 100644 --- a/sysutils/uniutils/Makefile +++ b/sysutils/uniutils/Makefile @@ -15,9 +15,8 @@ LICENSE= GPLv3 RUN_DEPENDS= ascii2binary:${PORTSDIR}/converters/ascii2binary GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lintl" -CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl USES= gettext TESTFILES= Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u \ diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index 69d9db7..488e214 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -15,9 +15,8 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-unittest=no -CONFIGURE_ENV= LIBS="${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} USES= pathfix iconv libtool:keepla USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index 50865ea..8bb1432 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -42,9 +42,8 @@ THREADS_CONFIGURE_ENABLE= threads #.if defined(WITH_MYSQL) #USE_MYSQL= yes #CONFIGURE_ARGS+=--with-mysql=yes -#CONFIGURE_ENV+= LIBS="${LIBS}" -#CFLAGS+= -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -#LDFLAGS+= -L${LOCALBASE}/lib/mysql +#CPPFLAGS+= -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H +#LIBS+= -L${LOCALBASE}/lib/mysql #PLIST_SUB+= MYSQL="" #.else CONFIGURE_ARGS+=--with-mysql=no diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 4e38099..fdeabe7 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -31,9 +31,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share \ --with-omfdirs=${PREFIX}/share/omf \ --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" \ - LOCALBASE="${LOCALBASE}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl PLIST_SUB= LOCALBASE=${LOCALBASE} post-patch: diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile index 42d73be..0b9b12b 100644 --- a/textproc/spellutils/Makefile +++ b/textproc/spellutils/Makefile @@ -14,9 +14,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes USES= gettext tar:bzip2 -CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib' CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lintl +LIBS+= -L${LOCALBASE}/lib -lintl DOCS= NEWS README EXAMPLES= aspell.sl diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile index b25591f..e9c1fed 100644 --- a/textproc/stardict3/Makefile +++ b/textproc/stardict3/Makefile @@ -16,11 +16,11 @@ LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-festival \ --disable-gucharmap \ --disable-espeak \ --disable-updateinfo +LIBS= -L${LOCALBASE}/lib USES= tar:bzip2 gettext gmake pathfix pkgconfig CONFIGURE_WRKSRC= ${WRKSRC}/dict BUILD_WRKSRC= ${CONFIGURE_WRKSRC} diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index f0b7700..6ea50ef 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -30,9 +30,9 @@ BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} -CONFIGURE_ENV= EMACS="${EMACS_CMD}" \ - LIBS="${LIBS} -L${LOCALBASE}/lib" +CONFIGURE_ENV= EMACS="${EMACS_CMD}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim-el PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index ccdf6de..4082d51 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -40,7 +40,7 @@ EXTRACT_DESC= Enable libextractor support CONFIGURE_ENV+= PORTNAME="${PORTNAME}" THREADS_CONFIGURE_ENABLE= pthreads -THREADS_CONFIGURE_ENV= LIBS="-pthread" +THREADS_LIBS= -pthread ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell #ASPELL_CONFIGURE_WITH= aspell diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index a32f6b3..ca5f378 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -35,8 +35,8 @@ INSTALLS_OMF= yes CONFIGURE_ARGS+=--enable-introspection \ --enable-compile-warnings=no \ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread ${EXTRA_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${EXTRA_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index bd79bea..727696c 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --includedir=${APACHEINCLUDEDIR} \ --with-apxs=${APXS} -CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib' \ - PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" +CONFIGURE_ENV= PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" CPPFLAGS+= -I${APACHEINCLUDEDIR} -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib EXTRA_PATCHES= ${PATCHDIR}/apache22_patch diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile index 393bbcd..efc7f58 100644 --- a/www/mod_log_sql2-dtc/Makefile +++ b/www/mod_log_sql2-dtc/Makefile @@ -20,16 +20,13 @@ DBI_CONFIGURE_ON= --with-dbi=${LOCALBASE} DBI_CONFIGURE_OFF= --without-dbi DBI_LIB_DEPENDS= libdbi.so:${PORTSDIR}/databases/libdbi -LATEST_LINK= mod_log_sql2-dtc GNU_CONFIGURE= yes USES= gmake tar:bzip2 USE_APACHE= 22 USE_MYSQL= yes -.include <bsd.port.pre.mk> - CONFIGURE_ARGS+= --with-apxs=${APXS} -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" +LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql post-patch: ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ @@ -38,4 +35,4 @@ post-patch: pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile index ed9315e..b9dc5f3 100644 --- a/www/mod_log_sql2/Makefile +++ b/www/mod_log_sql2/Makefile @@ -21,7 +21,7 @@ PLIST_SUB+= SSL=${SSL_PLIST} APACHE2X=${APACHE2X} USE_MYSQL= yes USE_APACHE= 22 -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" +LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql .include <bsd.port.pre.mk> diff --git a/www/shttpd/Makefile b/www/shttpd/Makefile index b578000..fe95af8 100644 --- a/www/shttpd/Makefile +++ b/www/shttpd/Makefile @@ -10,7 +10,7 @@ MAINTAINER= valenok@gmail.com COMMENT= Small, fast, embeddable web server with CGI, SSL, Authorization ALL_TARGET= unix -MAKE_ENV= LIBS=-lpthread +LIBS+= -lpthread BUILD_WRKSRC= ${WRKSRC}/src PLIST_FILES= bin/shttpd man/man1/shttpd.1.gz diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index a2893233..f7a5ee6 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -15,9 +15,8 @@ COMMENT= Maintains remote websites, uses FTP or WebDAV to sync up w/ local copy LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 GNU_CONFIGURE= yes -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" \ - LIBS="${LIBS}" -LIBS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-neon --with-libxml2 USE_GNOME= libxml2 USES= gmake diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 82faa7e..0f1a459 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -129,8 +129,8 @@ USES+= iconv # see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ EXTRA_PATCHES+= ${FILESDIR}/webalizer-a-urasim_2.patch CONFIGURE_ARGS+= --enable-mininls -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} .endif .if ${PORT_OPTIONS:MFULL_CGI_REFS} diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index bc61fe1..0bc3f5d 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -25,7 +25,7 @@ WWWOFFLE_SPOOL?= /var/spool/wwwoffle PLIST_SUB+= WWWOFFLE_SPOOL=${WWWOFFLE_SPOOL} HAS_CONFIGURE= yes -CONFIGURE_ENV= LIBS=-lmd +LIBS+= -lmd CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc --with-ipv6 \ --with-gnutls=${LOCALBASE} \ --with-spooldir=${WWWOFFLE_SPOOL} \ diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index d01f0a1..0947f50 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -26,9 +26,9 @@ USE_GNOME= gnomeprefix intlhack gnomedesktop \ INSTALL_TARGET= install-strip USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB}" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz" +CONFIGURE_ENV= LIBPNG="-L${LOCALBASE}/lib -lpng -lz" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS= --enable-static --disable-packagekit --disable-update-mimedb MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 51e1d38..f6cfb0f 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -22,9 +22,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \ --with-xinput=xfree -CONFIGURE_ENV= X_CFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INFO= gdk gtk .include <bsd.port.options.mk> diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index 462bc48..81513b2 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -21,8 +21,8 @@ USE_LDCONFIG= yes USE_GNOME= gnomeprefix libgnome libgnomeprintui intlhack referencehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-compile-warnings=no -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lgnuregex" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lgnuregex INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index f0e0ea6..515194c 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -23,8 +23,8 @@ USE_LDCONFIG= yes USE_GNOME= gnomeprefix gtk20 gconf2 libxml2 intlhack referencehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 5535889..3434ff8 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -16,8 +16,8 @@ USE_XORG= x11 USE_LDCONFIG= yes USE_GNOME= gnomeprefix gtk20 libartlgpl2 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 598e88a..195fc20 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -27,9 +27,9 @@ USE_PYTHON= 2 USE_LDCONFIG= yes USE_GNOME= libgnomeui pygtk2 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip EG_SRC_DIR= ${WRKSRC}/examples diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 396bd4d..f680f05 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -34,11 +34,10 @@ CONFIGURE_ARGS= --with-libpng=sys\ --enable-mediactrl\ --disable-backtrace\ --enable-graphics_ctx -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ - WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\ - PTHREAD_LIBS="${PTHREAD_LIBS}"\ +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"\ X11BASE="${LOCALBASE}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile index c449da9..e281e57 100644 --- a/x11-toolkits/wxgtk30/Makefile +++ b/x11-toolkits/wxgtk30/Makefile @@ -36,10 +36,10 @@ CONFIGURE_ARGS= --with-libpng=sys\ --enable-graphics_ctx \ --enable-compat26 \ --enable-compat28 -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ - X11BASE="${LOCALBASE}" \ +CONFIGURE_ENV= X11BASE="${LOCALBASE}" \ ac_cv_header_sys_inotify_h=no CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= GSTREAMER MSPACK NLS OPTIONS_DEFAULT=GSTREAMER MSPACK diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile index f228751..6c0fbdf 100644 --- a/x11-wm/fbcmd/Makefile +++ b/x11-wm/fbcmd/Makefile @@ -14,13 +14,16 @@ RUN_DEPENDS= fluxbox:${PORTSDIR}/x11-wm/fluxbox USES= gmake tar:bzip2 ALL_TARGET= first -CFLAGS+= "-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +MAKE_ARGS= CXX="${CXX}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" USE_XORG= x11 xmu PLIST_FILES= bin/fbcmd -post-extract: - @${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile +post-patch: + @${REINPLACE_CMD} 's|?=|=|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fbcmd ${STAGEDIR}${PREFIX}/bin diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 2acd52e..e387ddf 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -76,13 +76,13 @@ CONFIGURE_ARGS+= --enable-xinerama .if ${PORT_OPTIONS:MNLS} USES+= iconv -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 336db2c..1847ed8 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -42,10 +42,9 @@ GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ --with-at-spi-registryd-directory=${LOCALBASE}/libexec -CONFIGURE_ENV= LIBS="-lm" \ - GTKDOC="false" +CONFIGURE_ENV= GTKDOC="false" CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm SUB_FILES+= gdm.pam diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile index 3432a78..c48f33c 100644 --- a/x11/gnome-swallow/Makefile +++ b/x11/gnome-swallow/Makefile @@ -14,9 +14,8 @@ USE_XORG= x11 USES= gmake pathfix pkgconfig USE_GNOME= gnomeprefix gnomepanel libgnomeui GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0` post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index ce6c01d..f36f0fb 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -30,10 +30,9 @@ USE_PYTHON_BUILD=2 CONFIGURE_ARGS+=${f}="${${f}}" .endfor CONFIGURE_ARGS+=--enable-xkb -CONFIGURE_ENV= LIBS="`pkg-config --libs pthread-stubs`" NEEDED_CFLAGS= -I${LOCALBASE}/include -NEEDED_LIBS= -L${LOCALBASE}/lib -lXau ${PTHREAD_STUBS_LIBS} +NEEDED_LIBS= -L${LOCALBASE}/lib -lXau `pkg-config --libs pthread-stubs` XDMCP_CFLAGS= -I${LOCALBASE}/include XDMCP_LIBS= -L${LOCALBASE}/lib -lXdmcp diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 4f5a337..c5750d4 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -34,8 +34,8 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --enable-xft .endif -CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .if !defined(NOPORTDOCS) PORTDOCS= TIPS \ diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index b4378eb..9f33333 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -13,6 +13,7 @@ COMMENT= Low memory usage xterm replacement that supports color USE_AUTOTOOLS= libtool USES= perl5 +USE_LDCONFIG= yes USE_PERL5= build patch USE_XORG= xpm GNU_CONFIGURE= yes @@ -39,7 +40,7 @@ XTERM_DESC= Build with Xterm scrollbar CONFIGURE_ARGS= --enable-utmp --enable-lastlog \ --with-xpm --enable-xpm-background --enable-shared \ --enable-mousewheel --disable-languages -USE_LDCONFIG= yes +LIBS+= -lutil .include <bsd.port.pre.mk> @@ -131,8 +132,6 @@ CONFIGURE_ARGS+= --enable-xim CONFIGURE_ARGS+= --enable-xterm-scroll .endif -CONFIGURE_ENV+= LIBS="-lutil" - post-patch: @${PERL} -pi -e 's|(PTYCHAR2\s+"[^"]+)"|\1ghijklmnopqrstuv"|' \ ${WRKSRC}/src/ptytty.c diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 2a6ee74..cadac20 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -21,7 +21,8 @@ USES= pkgconfig shebangfix tar:bzip2 USE_XORG= xpm xft xrender GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-lstdc++ -lutil" TIC=${LOCALBASE}/bin/tic +LIBS+= -lutil +CONFIGURE_ENV= TIC=${LOCALBASE}/bin/tic CONFIGURE_ARGS= --enable-everything --with-term=rxvt \ --with-terminfo=${LOCALBASE}/share/misc/terminfo.db diff --git a/x11/rxvt-unicode/files/patch-configure b/x11/rxvt-unicode/files/patch-configure new file mode 100644 index 0000000..eb5b744 --- /dev/null +++ b/x11/rxvt-unicode/files/patch-configure @@ -0,0 +1,45 @@ +--- configure.orig ++++ configure +@@ -4436,42 +4436,6 @@ + + + LINKER="$CXX" +-if test x$GCC = xyes && test x$GXX = xyes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5 +-$as_echo_n "checking for working libsupc++... " >&6; } +- save_CXX="$CXX" +- save_LIBS="$LIBS" +- CXX="$CC" +- LIBS="$LIBS -lsupc++" +- +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-struct test { }; void f() try { throw new test; } catch (...) { throw; } +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +-$as_echo "ok" >&6; } +- LINKER="$CC" +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5 +-$as_echo "no, making everything bigger and slower" >&6; } +- LIBS="$save_LIBS" +- +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- CXX="$save_CXX" +-fi +-LINKER=$LINKER + + + if test -z "$orig_CXXFLAGS"; then diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile index 59e74806..45c669f 100644 --- a/x11/wbar/Makefile +++ b/x11/wbar/Makefile @@ -27,7 +27,7 @@ OPTIONS_SUB= yes WBARCONFIG_DESC= Build the GTK+ configuration interface NLS_CONFIGURE_ENABLE= nls -NLS_CONFIGURE_ENV= LIBS=-lintl +NLS_LIBS= -lintl WBARCONFIG_CONFIGURE_ENABLE= wbar-config WBARCONFIG_USE= GNOME=libglade2 diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 9b0c242..33d0634 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -27,8 +27,7 @@ USES= pathfix pkgconfig gmake USE_GNOME= gnomeprefix intlhack gconf2 intltool USE_GSTREAMER= good GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0` CONFIGURE_ARGS= --enable-gconf --disable-pulse .include <bsd.port.options.mk> diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index a587069..7f1cbcf 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -21,9 +21,8 @@ USES= iconv imake:env USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs -CONFIGURE_ENV= LIBS="-L${PREFIX}/lib" -CPPFLAGS+= -I${PREFIX}/include -LDFLAGS+= -L${PREFIX}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .if defined(WITHOUT_OPENSSL) CONFIGURE_ARGS+= --disable-ssl .else diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 026c194..0417090 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -29,9 +29,8 @@ CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ --with-configdir=${PREFIX}/share/xscreensaver/config \ --with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \ --with-xf86gamma-ext --with-randr-ext --enable-locking -CONFIGURE_ENV= LIBS="-lintl" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl OPTIONS_DEFINE= PAM KEYRING ALL_FORTUNES SETUID_HACKS OPTIONS_DEFAULT= PAM KEYRING diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 92fffdd..64e5dcc 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -18,10 +18,10 @@ CONFLICTS= x11iraf-[0-9]* USE_XORG= xaw xft GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-utempter --enable-narrowproto CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ICONVERSION= 1 diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile index 570122c..8bcb07a 100644 --- a/x11/xtermcontrol/Makefile +++ b/x11/xtermcontrol/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm USES= gettext GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/xtermcontrol man/man1/${PORTNAME}.1.gz diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index f293042..47b1e67 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -20,10 +20,8 @@ USE_GNOME= gnomeprefix gtk20 gnomedocutils intlhack USE_BZIP2= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -lintl -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lintl CONFLICTS= gtkada-1.2.* |
