Attachment 143582 Details for Bug 190592 – patch2

[patch] patch2

libs.patch (text/plain), 186.95 KB, created by Tijl Coosemans on 2014-06-09 21:32:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-06-09 21:32:52 UTC

Size: 186.95 KB

patch

obsolete

>Index: Mk/bsd.gecko.mk
>===================================================================
>--- Mk/bsd.gecko.mk	(revision 357106)
>+++ Mk/bsd.gecko.mk	(working copy)
>@@ -128,7 +128,7 @@ MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmoze
> 			${MOZILLA}-xpcom ${MOZILLA}-plugin
> 
> MOZ_EXPORT+=	${CONFIGURE_ENV} \
>-				LIBS="${LIBS}" PERL="${PERL}"
>+				PERL="${PERL}"
> MOZ_OPTIONS+=	--prefix="${FAKEDIR}"
> 
> CPPFLAGS+=		-isystem${LOCALBASE}/include
>Index: Mk/bsd.options.mk
>===================================================================
>--- Mk/bsd.options.mk	(revision 357106)
>+++ Mk/bsd.options.mk	(working copy)
>@@ -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_N
> 
> _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
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 357106)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -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}" \
>Index: archivers/rpm/Makefile
>===================================================================
>--- archivers/rpm/Makefile	(revision 357106)
>+++ archivers/rpm/Makefile	(working copy)
>@@ -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:
>Index: astro/cfitsio/Makefile
>===================================================================
>--- astro/cfitsio/Makefile	(revision 357106)
>+++ astro/cfitsio/Makefile	(working copy)
>@@ -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
>Index: astro/openuniverse/Makefile
>===================================================================
>--- astro/openuniverse/Makefile	(revision 357106)
>+++ astro/openuniverse/Makefile	(working copy)
>@@ -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>
>Index: astro/roadmap/Makefile
>===================================================================
>--- astro/roadmap/Makefile	(revision 357106)
>+++ astro/roadmap/Makefile	(working copy)
>@@ -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}
>Index: astro/xplanet/Makefile
>===================================================================
>--- astro/xplanet/Makefile	(revision 357106)
>+++ astro/xplanet/Makefile	(working copy)
>@@ -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
>Index: audio/deadbeef/Makefile
>===================================================================
>--- audio/deadbeef/Makefile	(revision 357106)
>+++ audio/deadbeef/Makefile	(working copy)
>@@ -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"
>Index: audio/fdk-aac/Makefile
>===================================================================
>--- audio/fdk-aac/Makefile	(revision 357106)
>+++ audio/fdk-aac/Makefile	(working copy)
>@@ -17,7 +17,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror au
> 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
>Index: audio/festival/Makefile
>===================================================================
>--- audio/festival/Makefile	(revision 357106)
>+++ audio/festival/Makefile	(working copy)
>@@ -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:
>Index: audio/firefly/Makefile
>===================================================================
>--- audio/firefly/Makefile	(revision 357106)
>+++ audio/firefly/Makefile	(working copy)
>@@ -24,10 +24,8 @@ LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio
> 
> 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
>Index: audio/jack/Makefile
>===================================================================
>--- audio/jack/Makefile	(revision 357106)
>+++ audio/jack/Makefile	(working copy)
>@@ -20,11 +20,10 @@ GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USES=		gmake pathfix pkgconfig
> 
>-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
> 
>Index: audio/mp3plot/Makefile
>===================================================================
>--- audio/mp3plot/Makefile	(revision 357106)
>+++ audio/mp3plot/Makefile	(working copy)
>@@ -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>
> 
>Index: audio/playgsf/Makefile
>===================================================================
>--- audio/playgsf/Makefile	(revision 357106)
>+++ audio/playgsf/Makefile	(working copy)
>@@ -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-VB
> 
> 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>
>Index: audio/pulseaudio/Makefile
>===================================================================
>--- audio/pulseaudio/Makefile	(revision 357106)
>+++ audio/pulseaudio/Makefile	(working copy)
>@@ -35,10 +35,9 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD
> 		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
>Index: audio/rhythmbox/Makefile
>===================================================================
>--- audio/rhythmbox/Makefile	(revision 357106)
>+++ audio/rhythmbox/Makefile	(working copy)
>@@ -36,10 +36,9 @@ CONFIGURE_ARGS=	--disable-vala --with-li
> 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
> 
>Index: audio/rplay/Makefile
>===================================================================
>--- audio/rplay/Makefile	(revision 357106)
>+++ audio/rplay/Makefile	(working copy)
>@@ -14,8 +14,8 @@ LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio
> 
> 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
> 
>Index: audio/spiralsynthmodular/Makefile
>===================================================================
>--- audio/spiralsynthmodular/Makefile	(revision 357106)
>+++ audio/spiralsynthmodular/Makefile	(working copy)
>@@ -19,9 +19,9 @@ LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-
> 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
> 
>Index: benchmarks/dbench/Makefile
>===================================================================
>--- benchmarks/dbench/Makefile	(revision 357106)
>+++ benchmarks/dbench/Makefile	(working copy)
>@@ -16,9 +16,9 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/deve
> 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:
>Index: benchmarks/netio/Makefile
>===================================================================
>--- benchmarks/netio/Makefile	(revision 357106)
>+++ benchmarks/netio/Makefile	(working copy)
>@@ -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
> 
>Index: chinese/oto/Makefile
>===================================================================
>--- chinese/oto/Makefile	(revision 357106)
>+++ chinese/oto/Makefile	(working copy)
>@@ -12,7 +12,7 @@ COMMENT=	Show you font info and add new 
> 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 | \
>Index: chinese/reciteword/Makefile
>===================================================================
>--- chinese/reciteword/Makefile	(revision 357106)
>+++ chinese/reciteword/Makefile	(working copy)
>@@ -17,10 +17,10 @@ COMMENT=	Education software to help peop
> 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
> 
>Index: comms/gmfsk/Makefile
>===================================================================
>--- comms/gmfsk/Makefile	(revision 357106)
>+++ comms/gmfsk/Makefile	(working copy)
>@@ -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
>Index: comms/gnokii/Makefile
>===================================================================
>--- comms/gnokii/Makefile	(revision 357106)
>+++ comms/gnokii/Makefile	(working copy)
>@@ -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=	*
>Index: comms/gnokii/files/patch-common-Makefile.in
>===================================================================
>--- comms/gnokii/files/patch-common-Makefile.in	(revision 357106)
>+++ comms/gnokii/files/patch-common-Makefile.in	(working copy)
>@@ -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 = \
>Index: comms/gnokii/files/patch-xgnokii-Makefile.in
>===================================================================
>--- comms/gnokii/files/patch-xgnokii-Makefile.in	(revision 357106)
>+++ comms/gnokii/files/patch-xgnokii-Makefile.in	(working copy)
>@@ -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)
>Index: comms/hamlib/Makefile
>===================================================================
>--- comms/hamlib/Makefile	(revision 357106)
>+++ comms/hamlib/Makefile	(working copy)
>@@ -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
>Index: comms/minicom/Makefile
>===================================================================
>--- comms/minicom/Makefile	(revision 357106)
>+++ comms/minicom/Makefile	(working copy)
>@@ -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>
> 
>Index: comms/nokryptia/Makefile
>===================================================================
>--- comms/nokryptia/Makefile	(revision 357106)
>+++ comms/nokryptia/Makefile	(working copy)
>@@ -14,8 +14,8 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio
> 
> 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
> 
>Index: comms/predict/Makefile
>===================================================================
>--- comms/predict/Makefile	(revision 357106)
>+++ comms/predict/Makefile	(working copy)
>@@ -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
>Index: comms/predict/files/Makefile
>===================================================================
>--- comms/predict/files/Makefile	(revision 357106)
>+++ comms/predict/files/Makefile	(working copy)
>@@ -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}
> 
>Index: converters/fix-mime-charset/Makefile
>===================================================================
>--- converters/fix-mime-charset/Makefile	(revision 357106)
>+++ converters/fix-mime-charset/Makefile	(working copy)
>@@ -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
>Index: converters/pdf2djvu/Makefile
>===================================================================
>--- converters/pdf2djvu/Makefile	(revision 357106)
>+++ converters/pdf2djvu/Makefile	(working copy)
>@@ -18,8 +18,6 @@ LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/g
> 		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
>Index: converters/rcctools/Makefile
>===================================================================
>--- converters/rcctools/Makefile	(revision 357106)
>+++ converters/rcctools/Makefile	(working copy)
>@@ -15,8 +15,8 @@ LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel
> 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
> 
>Index: databases/dbtool/Makefile
>===================================================================
>--- databases/dbtool/Makefile	(revision 357106)
>+++ databases/dbtool/Makefile	(working copy)
>@@ -24,8 +24,8 @@ EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/s
> 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 ""
>Index: databases/hk_classes/Makefile
>===================================================================
>--- databases/hk_classes/Makefile	(revision 357106)
>+++ databases/hk_classes/Makefile	(working copy)
>@@ -16,8 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:${PORTSDIR
> 
> 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} \
>Index: databases/libodbc++/Makefile
>===================================================================
>--- databases/libodbc++/Makefile	(revision 357106)
>+++ databases/libodbc++/Makefile	(working copy)
>@@ -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
>Index: databases/oracle_odbc_driver/Makefile
>===================================================================
>--- databases/oracle_odbc_driver/Makefile	(revision 357106)
>+++ databases/oracle_odbc_driver/Makefile	(working copy)
>@@ -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
> 
>Index: databases/pgadmin3/Makefile
>===================================================================
>--- databases/pgadmin3/Makefile	(revision 357106)
>+++ databases/pgadmin3/Makefile	(working copy)
>@@ -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
>Index: deskutils/gnome-main-menu/Makefile
>===================================================================
>--- deskutils/gnome-main-menu/Makefile	(revision 357106)
>+++ deskutils/gnome-main-menu/Makefile	(working copy)
>@@ -18,9 +18,8 @@ USE_GNOME=	gnomehack gnomeprefix gnomepa
> 		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
> 
>Index: deskutils/logjam/Makefile
>===================================================================
>--- deskutils/logjam/Makefile	(revision 357106)
>+++ deskutils/logjam/Makefile	(working copy)
>@@ -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
>Index: deskutils/multisync/Makefile
>===================================================================
>--- deskutils/multisync/Makefile	(revision 357106)
>+++ deskutils/multisync/Makefile	(working copy)
>@@ -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:
>Index: devel/apr1/Makefile
>===================================================================
>--- devel/apr1/Makefile	(revision 357106)
>+++ devel/apr1/Makefile	(working copy)
>@@ -113,9 +113,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
>Index: devel/apr2/Makefile
>===================================================================
>--- devel/apr2/Makefile	(revision 357106)
>+++ devel/apr2/Makefile	(working copy)
>@@ -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
>Index: devel/asmutils/Makefile
>===================================================================
>--- devel/asmutils/Makefile	(revision 357106)
>+++ devel/asmutils/Makefile	(working copy)
>@@ -34,10 +34,10 @@ BINS=		bonus/asmutils basename cal cat c
> 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 && \
>Index: devel/ccrtp/Makefile
>===================================================================
>--- devel/ccrtp/Makefile	(revision 357106)
>+++ devel/ccrtp/Makefile	(working copy)
>@@ -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:
>Index: devel/google-perftools/Makefile
>===================================================================
>--- devel/google-perftools/Makefile	(revision 357106)
>+++ devel/google-perftools/Makefile	(working copy)
>@@ -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>
> 
>Index: devel/ifd-test/Makefile
>===================================================================
>--- devel/ifd-test/Makefile	(revision 357106)
>+++ devel/ifd-test/Makefile	(working copy)
>@@ -15,7 +15,7 @@ LIB_DEPENDS=    pcsclite.1:${PORTSDIR}/d
> 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; \
>Index: devel/libgutenfetch/Makefile
>===================================================================
>--- devel/libgutenfetch/Makefile	(revision 357106)
>+++ devel/libgutenfetch/Makefile	(working copy)
>@@ -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
> 
>Index: devel/libunicode/Makefile
>===================================================================
>--- devel/libunicode/Makefile	(revision 357106)
>+++ devel/libunicode/Makefile	(working copy)
>@@ -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>
>Index: devel/libzvbi/Makefile
>===================================================================
>--- devel/libzvbi/Makefile	(revision 357106)
>+++ devel/libzvbi/Makefile	(working copy)
>@@ -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' \
>Index: devel/nspr/Makefile
>===================================================================
>--- devel/nspr/Makefile	(revision 357106)
>+++ devel/nspr/Makefile	(working copy)
>@@ -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
>Index: devel/pypersrc/Makefile
>===================================================================
>--- devel/pypersrc/Makefile	(revision 357106)
>+++ devel/pypersrc/Makefile	(working copy)
>@@ -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
>Index: devel/srecord/Makefile
>===================================================================
>--- devel/srecord/Makefile	(revision 357106)
>+++ devel/srecord/Makefile	(working copy)
>@@ -14,8 +14,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boos
> 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
>Index: dns/libidn/Makefile
>===================================================================
>--- dns/libidn/Makefile	(revision 357106)
>+++ dns/libidn/Makefile	(working copy)
>@@ -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
> 
>Index: editors/joe/Makefile
>===================================================================
>--- editors/joe/Makefile	(revision 357106)
>+++ editors/joe/Makefile	(working copy)
>@@ -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}
> 
>Index: editors/joe2/Makefile
>===================================================================
>--- editors/joe2/Makefile	(revision 357106)
>+++ editors/joe2/Makefile	(working copy)
>@@ -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}
> 
>Index: editors/mlview/Makefile
>===================================================================
>--- editors/mlview/Makefile	(revision 357106)
>+++ editors/mlview/Makefile	(working copy)
>@@ -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
> 
>Index: editors/xcoral/Makefile
>===================================================================
>--- editors/xcoral/Makefile	(revision 357106)
>+++ editors/xcoral/Makefile	(working copy)
>@@ -11,8 +11,8 @@ COMMENT=	A multiwindow mouse-based text 
> 
> 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}"
>Index: emulators/fuse/Makefile
>===================================================================
>--- emulators/fuse/Makefile	(revision 357106)
>+++ emulators/fuse/Makefile	(working copy)
>@@ -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
>Index: emulators/vba/Makefile
>===================================================================
>--- emulators/vba/Makefile	(revision 357106)
>+++ emulators/vba/Makefile	(working copy)
>@@ -19,10 +19,9 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/
> 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
>Index: emulators/x48/Makefile
>===================================================================
>--- emulators/x48/Makefile	(revision 357106)
>+++ emulators/x48/Makefile	(working copy)
>@@ -23,7 +23,7 @@ USE_AUTOTOOLS=	aclocal autoheader automa
> 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
>Index: ftp/lftp/Makefile
>===================================================================
>--- ftp/lftp/Makefile	(revision 357106)
>+++ ftp/lftp/Makefile	(working copy)
>@@ -23,11 +23,11 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
> 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 \
>Index: ftp/proftpd/Makefile
>===================================================================
>--- ftp/proftpd/Makefile	(revision 357106)
>+++ ftp/proftpd/Makefile	(working copy)
>@@ -100,8 +100,8 @@ PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATED
> .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)
>Index: ftp/wput/Makefile
>===================================================================
>--- ftp/wput/Makefile	(revision 357106)
>+++ ftp/wput/Makefile	(working copy)
>@@ -16,8 +16,6 @@ PORTEXAMPLES=	USAGE.examples USAGE.resum
> 		passwordfile wputrc
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	LIBS="${LDFLAGS}"
>-CFLAGS+=	-I${LOCALBASE}/include
> MAKE_JOBS_UNSAFE=yes
> 
> OPTIONS_DEFINE=	TLS NLS DOCS EXAMPLES
>Index: games/alienarena/Makefile
>===================================================================
>--- games/alienarena/Makefile	(revision 357106)
>+++ games/alienarena/Makefile	(working copy)
>@@ -24,8 +24,8 @@ RUN_DEPENDS=	${DATADIR}/data1/default.cf
> 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
> 
>Index: games/battalion/Makefile
>===================================================================
>--- games/battalion/Makefile	(revision 357106)
>+++ games/battalion/Makefile	(working copy)
>@@ -14,11 +14,11 @@ COMMENT=	Monsters, explosions, destructi
> 
> 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
> 
>Index: games/chroma/Makefile
>===================================================================
>--- games/chroma/Makefile	(revision 357106)
>+++ games/chroma/Makefile	(working copy)
>@@ -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=	*
>Index: games/frobtads/Makefile
>===================================================================
>--- games/frobtads/Makefile	(revision 357106)
>+++ games/frobtads/Makefile	(working copy)
>@@ -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)
>Index: games/glest/Makefile
>===================================================================
>--- games/glest/Makefile	(revision 357106)
>+++ games/glest/Makefile	(working copy)
>@@ -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
>Index: games/gnomeattacks/Makefile
>===================================================================
>--- games/gnomeattacks/Makefile	(revision 357106)
>+++ games/gnomeattacks/Makefile	(working copy)
>@@ -13,8 +13,7 @@ COMMENT=	GNOME 2 game featuring a bizarr
> 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>
>Index: games/gnuchess/Makefile
>===================================================================
>--- games/gnuchess/Makefile	(revision 357106)
>+++ games/gnuchess/Makefile	(working copy)
>@@ -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}
>Index: games/gracer/Makefile
>===================================================================
>--- games/gracer/Makefile	(revision 357106)
>+++ games/gracer/Makefile	(working copy)
>@@ -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
> 
>Index: games/gturing/Makefile
>===================================================================
>--- games/gturing/Makefile	(revision 357106)
>+++ games/gturing/Makefile	(working copy)
>@@ -13,8 +13,8 @@ COMMENT=	Simple Turing machine simulator
> 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
>Index: games/highmoon/Makefile
>===================================================================
>--- games/highmoon/Makefile	(revision 357106)
>+++ games/highmoon/Makefile	(working copy)
>@@ -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
>Index: games/lbreakout/Makefile
>===================================================================
>--- games/lbreakout/Makefile	(revision 357106)
>+++ games/lbreakout/Makefile	(working copy)
>@@ -13,7 +13,7 @@ COMMENT=	Nice clone of classical Breakou
> 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
>Index: games/pioneers/Makefile
>===================================================================
>--- games/pioneers/Makefile	(revision 357106)
>+++ games/pioneers/Makefile	(working copy)
>@@ -19,7 +19,7 @@ USE_GNOME=	gnomehack gnomeprefix gtk20 l
> 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>
>Index: games/sdb/Makefile
>===================================================================
>--- games/sdb/Makefile	(revision 357106)
>+++ games/sdb/Makefile	(working copy)
>@@ -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=	*
>Index: games/spacejunk/Makefile
>===================================================================
>--- games/spacejunk/Makefile	(revision 357106)
>+++ games/spacejunk/Makefile	(working copy)
>@@ -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
> 
>Index: games/super_methane_brothers/Makefile
>===================================================================
>--- games/super_methane_brothers/Makefile	(revision 357106)
>+++ games/super_methane_brothers/Makefile	(working copy)
>@@ -20,11 +20,11 @@ LIB_DEPENDS=	libclan23Core.so:${PORTSDIR
> 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
>Index: games/torcs/Makefile
>===================================================================
>--- games/torcs/Makefile	(revision 357106)
>+++ games/torcs/Makefile	(working copy)
>@@ -27,8 +27,6 @@ USE_XORG=	xrender xmu ice xext x11 xxf86
> 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
> 
>Index: games/trophy/Makefile
>===================================================================
>--- games/trophy/Makefile	(revision 357106)
>+++ games/trophy/Makefile	(working copy)
>@@ -17,9 +17,8 @@ LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/
> 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
> 
>Index: games/tsito/Makefile
>===================================================================
>--- games/tsito/Makefile	(revision 357106)
>+++ games/tsito/Makefile	(working copy)
>@@ -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>
>Index: games/tuxkart/Makefile
>===================================================================
>--- games/tuxkart/Makefile	(revision 357106)
>+++ games/tuxkart/Makefile	(working copy)
>@@ -21,9 +21,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libplibs
> 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=	*
> 
>Index: games/warzone2100/Makefile
>===================================================================
>--- games/warzone2100/Makefile	(revision 357106)
>+++ games/warzone2100/Makefile	(working copy)
>@@ -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=	*
>Index: games/xqf/Makefile
>===================================================================
>--- games/xqf/Makefile	(revision 357106)
>+++ games/xqf/Makefile	(working copy)
>@@ -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=	*
>Index: graphics/EZWGL/Makefile
>===================================================================
>--- graphics/EZWGL/Makefile	(revision 357106)
>+++ graphics/EZWGL/Makefile	(working copy)
>@@ -17,8 +17,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics
> 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
>Index: graphics/bugle/Makefile
>===================================================================
>--- graphics/bugle/Makefile	(revision 357106)
>+++ graphics/bugle/Makefile	(working copy)
>@@ -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
>Index: graphics/colord/Makefile
>===================================================================
>--- graphics/colord/Makefile	(revision 357106)
>+++ graphics/colord/Makefile	(working copy)
>@@ -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
>Index: graphics/danpei/Makefile
>===================================================================
>--- graphics/danpei/Makefile	(revision 357106)
>+++ graphics/danpei/Makefile	(working copy)
>@@ -22,8 +22,8 @@ IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTS
> 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 \
>Index: graphics/enblend/Makefile
>===================================================================
>--- graphics/enblend/Makefile	(revision 357106)
>+++ graphics/enblend/Makefile	(working copy)
>@@ -30,10 +30,9 @@ CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/b
> 
> 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>
> 
>Index: graphics/epeg/Makefile
>===================================================================
>--- graphics/epeg/Makefile	(revision 357106)
>+++ graphics/epeg/Makefile	(working copy)
>@@ -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>
>Index: graphics/flam3/Makefile
>===================================================================
>--- graphics/flam3/Makefile	(revision 357106)
>+++ graphics/flam3/Makefile	(working copy)
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/
> 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>
>Index: graphics/gcolor/Makefile
>===================================================================
>--- graphics/gcolor/Makefile	(revision 357106)
>+++ graphics/gcolor/Makefile	(working copy)
>@@ -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 ; \
>Index: graphics/gimageview/Makefile
>===================================================================
>--- graphics/gimageview/Makefile	(revision 357106)
>+++ graphics/gimageview/Makefile	(working copy)
>@@ -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 vi
> 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>
>Index: graphics/gimageview/files/patch-ltmain.sh
>===================================================================
>--- graphics/gimageview/files/patch-ltmain.sh	(revision 357106)
>+++ graphics/gimageview/files/patch-ltmain.sh	(working copy)
>@@ -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"
>Index: graphics/gimageview/pkg-plist
>===================================================================
>--- graphics/gimageview/pkg-plist	(revision 357106)
>+++ graphics/gimageview/pkg-plist	(working copy)
>@@ -32,7 +32,7 @@ lib/gimageview/thumbnail/libgimv_nautilu
> 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
>Index: graphics/gimp-app/Makefile
>===================================================================
>--- graphics/gimp-app/Makefile	(revision 357106)
>+++ graphics/gimp-app/Makefile	(working copy)
>@@ -51,10 +51,9 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX
> 		--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)
> 
>Index: graphics/gimp-resynthesizer/Makefile
>===================================================================
>--- graphics/gimp-resynthesizer/Makefile	(revision 357106)
>+++ graphics/gimp-resynthesizer/Makefile	(working copy)
>@@ -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
>Index: graphics/gle/Makefile
>===================================================================
>--- graphics/gle/Makefile	(revision 357106)
>+++ graphics/gle/Makefile	(working copy)
>@@ -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
>Index: graphics/gltt/Makefile
>===================================================================
>--- graphics/gltt/Makefile	(revision 357106)
>+++ graphics/gltt/Makefile	(working copy)
>@@ -15,8 +15,8 @@ LIB_DEPENDS=	libttf.so:${PORTSDIR}/print
> 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 \
>Index: graphics/gphoto2/Makefile
>===================================================================
>--- graphics/gphoto2/Makefile	(revision 357106)
>+++ graphics/gphoto2/Makefile	(working copy)
>@@ -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
> 
>Index: graphics/gtkgraph/Makefile
>===================================================================
>--- graphics/gtkgraph/Makefile	(revision 357106)
>+++ graphics/gtkgraph/Makefile	(working copy)
>@@ -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 \
>Index: graphics/jpeginfo/Makefile
>===================================================================
>--- graphics/jpeginfo/Makefile	(revision 357106)
>+++ graphics/jpeginfo/Makefile	(working copy)
>@@ -13,8 +13,8 @@ COMMENT=	Generate listing and MD5, check
> 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
>Index: graphics/kudu/Makefile
>===================================================================
>--- graphics/kudu/Makefile	(revision 357106)
>+++ graphics/kudu/Makefile	(working copy)
>@@ -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=	*
>Index: graphics/libvisual/Makefile
>===================================================================
>--- graphics/libvisual/Makefile	(revision 357106)
>+++ graphics/libvisual/Makefile	(working copy)
>@@ -16,8 +16,8 @@ COMMENT=	Abstraction library that sits b
> 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>
> 
>Index: graphics/libvisual04-plugins/Makefile
>===================================================================
>--- graphics/libvisual04-plugins/Makefile	(revision 357106)
>+++ graphics/libvisual04-plugins/Makefile	(working copy)
>@@ -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]+$//}
> 
>Index: graphics/php-facedetect/Makefile
>===================================================================
>--- graphics/php-facedetect/Makefile	(revision 357106)
>+++ graphics/php-facedetect/Makefile	(working copy)
>@@ -18,16 +18,14 @@ LIB_DEPENDS=	libopencv_objdetect.so:${PO
> 
> 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>
>Index: graphics/phplot/Makefile
>===================================================================
>--- graphics/phplot/Makefile	(revision 357106)
>+++ graphics/phplot/Makefile	(working copy)
>@@ -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:${PORT
> 
> 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})
> 
>Index: graphics/pngnq/Makefile
>===================================================================
>--- graphics/pngnq/Makefile	(revision 357106)
>+++ graphics/pngnq/Makefile	(working copy)
>@@ -17,8 +17,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/gra
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-CONFIGURE_ENV+=	LIBS=-lpng
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lpng
> 
> USES=		pkgconfig
> 
>Index: graphics/povray37/Makefile
>===================================================================
>--- graphics/povray37/Makefile	(revision 357106)
>+++ graphics/povray37/Makefile	(working copy)
>@@ -30,10 +30,10 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${
> 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
> .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-restriction
> 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_BUIL
> 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
>Index: graphics/radius-engine/Makefile
>===================================================================
>--- graphics/radius-engine/Makefile	(revision 357106)
>+++ graphics/radius-engine/Makefile	(working copy)
>@@ -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 \
>Index: graphics/stamp/Makefile
>===================================================================
>--- graphics/stamp/Makefile	(revision 357106)
>+++ graphics/stamp/Makefile	(working copy)
>@@ -13,8 +13,8 @@ COMMENT=	Adds a graphical, configurable 
> 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
>Index: graphics/tesseract/Makefile
>===================================================================
>--- graphics/tesseract/Makefile	(revision 357106)
>+++ graphics/tesseract/Makefile	(working copy)
>@@ -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=	*
>Index: graphics/visionworkbench/Makefile
>===================================================================
>--- graphics/visionworkbench/Makefile	(revision 357106)
>+++ graphics/visionworkbench/Makefile	(working copy)
>@@ -34,21 +34,10 @@ LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/m
> 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
>-
>-CFLAGS+=	${PTHREAD_CFLAGS}
>-LDFLAGS+=	${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
>-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>
>Index: graphics/xaos/Makefile
>===================================================================
>--- graphics/xaos/Makefile	(revision 357106)
>+++ graphics/xaos/Makefile	(working copy)
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/gra
> 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
> 
>Index: graphics/xsane/Makefile
>===================================================================
>--- graphics/xsane/Makefile	(revision 357106)
>+++ graphics/xsane/Makefile	(working copy)
>@@ -39,13 +39,10 @@ GIMP_RUN_DEPENDS=	${LOCALBASE}/bin/gimp:
> 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
>Index: graphics/zphoto/Makefile
>===================================================================
>--- graphics/zphoto/Makefile	(revision 357106)
>+++ graphics/zphoto/Makefile	(working copy)
>@@ -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
>Index: irc/bitchx/Makefile
>===================================================================
>--- irc/bitchx/Makefile	(revision 357106)
>+++ irc/bitchx/Makefile	(working copy)
>@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}
> 		--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
>Index: irc/miau/Makefile
>===================================================================
>--- irc/miau/Makefile	(revision 357106)
>+++ irc/miau/Makefile	(working copy)
>@@ -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)
>Index: irc/xchat/Makefile
>===================================================================
>--- irc/xchat/Makefile	(revision 357106)
>+++ irc/xchat/Makefile	(working copy)
>@@ -20,8 +20,8 @@ CONFLICTS=	xchat-1* xchat-systray-plugin
> 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]
> 
>Index: japanese/groff/Makefile
>===================================================================
>--- japanese/groff/Makefile	(revision 357106)
>+++ japanese/groff/Makefile	(working copy)
>@@ -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}
>Index: japanese/jvim3/Makefile
>===================================================================
>--- japanese/jvim3/Makefile	(revision 357106)
>+++ japanese/jvim3/Makefile	(working copy)
>@@ -46,17 +46,14 @@ PORTDOCS=	cygwin.txt differen.doc fepctr
> 		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} || \
>Index: japanese/php5-mecab/Makefile
>===================================================================
>--- japanese/php5-mecab/Makefile	(revision 357106)
>+++ japanese/php5-mecab/Makefile	(working copy)
>@@ -15,8 +15,6 @@ LIB_DEPENDS=	mecab:${PORTSDIR}/japanese/
> 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>
> 
>Index: java/jikes/Makefile
>===================================================================
>--- java/jikes/Makefile	(revision 357106)
>+++ java/jikes/Makefile	(working copy)
>@@ -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>
>Index: korean/eterm/Makefile
>===================================================================
>--- korean/eterm/Makefile	(revision 357106)
>+++ korean/eterm/Makefile	(working copy)
>@@ -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
> 
>Index: korean/eterm/files/patch-ac
>===================================================================
>--- korean/eterm/files/patch-ac	(revision 357106)
>+++ korean/eterm/files/patch-ac	(working copy)
>@@ -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 @@
>Index: lang/hugs/Makefile
>===================================================================
>--- lang/hugs/Makefile	(revision 357106)
>+++ lang/hugs/Makefile	(working copy)
>@@ -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
>Index: lang/lush/Makefile
>===================================================================
>--- lang/lush/Makefile	(revision 357106)
>+++ lang/lush/Makefile	(working copy)
>@@ -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
> 
>Index: lang/php5/Makefile
>===================================================================
>--- lang/php5/Makefile	(revision 357106)
>+++ lang/php5/Makefile	(working copy)
>@@ -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}
>Index: lang/php53/Makefile
>===================================================================
>--- lang/php53/Makefile	(revision 357106)
>+++ lang/php53/Makefile	(working copy)
>@@ -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}
>Index: lang/php55/Makefile
>===================================================================
>--- lang/php55/Makefile	(revision 357106)
>+++ lang/php55/Makefile	(working copy)
>@@ -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}
>Index: lang/python27/Makefile
>===================================================================
>--- lang/python27/Makefile	(revision 357106)
>+++ lang/python27/Makefile	(working copy)
>@@ -65,12 +65,8 @@ NLS_DESC=	Enable Gettext support for the
> 
> .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
>Index: lang/ruby19/Makefile
>===================================================================
>--- lang/ruby19/Makefile	(revision 357106)
>+++ lang/ruby19/Makefile	(working copy)
>@@ -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
>Index: lang/ruby20/Makefile
>===================================================================
>--- lang/ruby20/Makefile	(revision 357106)
>+++ lang/ruby20/Makefile	(working copy)
>@@ -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
>Index: lang/ruby21/Makefile
>===================================================================
>--- lang/ruby21/Makefile	(revision 357106)
>+++ lang/ruby21/Makefile	(working copy)
>@@ -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
>Index: mail/bogofilter/Makefile
>===================================================================
>--- mail/bogofilter/Makefile	(revision 357106)
>+++ mail/bogofilter/Makefile	(working copy)
>@@ -46,9 +46,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/
> 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:
>Index: mail/crm114/Makefile
>===================================================================
>--- mail/crm114/Makefile	(revision 357106)
>+++ mail/crm114/Makefile	(working copy)
>@@ -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 
> 
> .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:
>Index: mail/cyrus-imapd23/Makefile
>===================================================================
>--- mail/cyrus-imapd23/Makefile	(revision 357106)
>+++ mail/cyrus-imapd23/Makefile	(working copy)
>@@ -35,8 +35,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
> 		--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 \
>Index: mail/cyrus-imapd24/Makefile
>===================================================================
>--- mail/cyrus-imapd24/Makefile	(revision 357106)
>+++ mail/cyrus-imapd24/Makefile	(working copy)
>@@ -35,8 +35,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
> 		--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 \
>Index: mail/dspam/Makefile
>===================================================================
>--- mail/dspam/Makefile	(revision 357106)
>+++ mail/dspam/Makefile	(working copy)
>@@ -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 \
>Index: mail/dspam-devel/Makefile
>===================================================================
>--- mail/dspam-devel/Makefile	(revision 357106)
>+++ mail/dspam-devel/Makefile	(working copy)
>@@ -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
>Index: mail/gbuffy/Makefile
>===================================================================
>--- mail/gbuffy/Makefile	(revision 357106)
>+++ mail/gbuffy/Makefile	(working copy)
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libPropList.so:${PORTSDIR}/
> 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)$$(&|' \
>Index: mail/gmime2/Makefile
>===================================================================
>--- mail/gmime2/Makefile	(revision 357106)
>+++ mail/gmime2/Makefile	(working copy)
>@@ -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
> 
>Index: mail/gmime24/Makefile
>===================================================================
>--- mail/gmime24/Makefile	(revision 357106)
>+++ mail/gmime24/Makefile	(working copy)
>@@ -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
> 
>Index: mail/lmtp2nntp/files/patch-configure
>===================================================================
>--- mail/lmtp2nntp/files/patch-configure	(revision 357106)
>+++ mail/lmtp2nntp/files/patch-configure	(working copy)
>@@ -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
>Index: mail/mboxgrep/Makefile
>===================================================================
>--- mail/mboxgrep/Makefile	(revision 357106)
>+++ mail/mboxgrep/Makefile	(working copy)
>@@ -16,8 +16,8 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pc
> 
> 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
>Index: mail/milter-greylist/Makefile
>===================================================================
>--- mail/milter-greylist/Makefile	(revision 357106)
>+++ mail/milter-greylist/Makefile	(working copy)
>@@ -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
>Index: mail/milter-greylist-devel/Makefile
>===================================================================
>--- mail/milter-greylist-devel/Makefile	(revision 357106)
>+++ mail/milter-greylist-devel/Makefile	(working copy)
>@@ -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
>Index: mail/mmr/Makefile
>===================================================================
>--- mail/mmr/Makefile	(revision 357106)
>+++ mail/mmr/Makefile	(working copy)
>@@ -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
> 
>Index: mail/popper/Makefile
>===================================================================
>--- mail/popper/Makefile	(revision 357106)
>+++ mail/popper/Makefile	(working copy)
>@@ -26,7 +26,7 @@ O_DEFS=		-DSETPROCTITLE -DKEEP_TEMP_DROP
> 		-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}/
> .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
>Index: mail/popular/Makefile
>===================================================================
>--- mail/popular/Makefile	(revision 357106)
>+++ mail/popular/Makefile	(working copy)
>@@ -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
> 
>Index: mail/qmailadmin/Makefile
>===================================================================
>--- mail/qmailadmin/Makefile	(revision 357106)
>+++ mail/qmailadmin/Makefile	(working copy)
>@@ -93,8 +93,7 @@ EXTRA_PATCHES+=		${FILESDIR}/cracklib.pa
> 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
>Index: mail/qpopper/Makefile
>===================================================================
>--- mail/qpopper/Makefile	(revision 357106)
>+++ mail/qpopper/Makefile	(working copy)
>@@ -14,11 +14,11 @@ COMMENT=	Berkeley POP 3 server (now main
> 
> 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} \
>Index: mail/smtpmail/Makefile
>===================================================================
>--- mail/smtpmail/Makefile	(revision 357106)
>+++ mail/smtpmail/Makefile	(working copy)
>@@ -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
> 
>Index: mail/sylpheed/Makefile
>===================================================================
>--- mail/sylpheed/Makefile	(revision 357106)
>+++ mail/sylpheed/Makefile	(working copy)
>@@ -20,10 +20,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} \
>Index: math/geg/Makefile
>===================================================================
>--- math/geg/Makefile	(revision 357106)
>+++ math/geg/Makefile	(working copy)
>@@ -15,8 +15,8 @@ COMMENT=	Visualise multiple 2D-functions
> 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
>Index: math/goblin/Makefile
>===================================================================
>--- math/goblin/Makefile	(revision 357106)
>+++ math/goblin/Makefile	(working copy)
>@@ -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>
> 
>Index: math/numdiff/Makefile
>===================================================================
>--- math/numdiff/Makefile	(revision 357106)
>+++ math/numdiff/Makefile	(working copy)
>@@ -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
>Index: math/oleo/Makefile
>===================================================================
>--- math/oleo/Makefile	(revision 357106)
>+++ math/oleo/Makefile	(working copy)
>@@ -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
>Index: math/tablix/Makefile
>===================================================================
>--- math/tablix/Makefile	(revision 357106)
>+++ math/tablix/Makefile	(working copy)
>@@ -14,16 +14,15 @@ COMMENT=	Free software for solving timet
> 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
>Index: misc/gnome-mime-data/Makefile
>===================================================================
>--- misc/gnome-mime-data/Makefile	(revision 357106)
>+++ misc/gnome-mime-data/Makefile	(working copy)
>@@ -16,7 +16,7 @@ COMMENT=	MIME and Application database f
> 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>
>Index: misc/gnuls/Makefile
>===================================================================
>--- misc/gnuls/Makefile	(revision 357106)
>+++ misc/gnuls/Makefile	(working copy)
>@@ -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
>Index: misc/lingoteach/Makefile
>===================================================================
>--- misc/lingoteach/Makefile	(revision 357106)
>+++ misc/lingoteach/Makefile	(working copy)
>@@ -21,8 +21,8 @@ USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> USES=		gmake pkgconfig
> 
>-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
> CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> # sound version
> SOUNDV=			0.3.9
>Index: misc/pdmenu/Makefile
>===================================================================
>--- misc/pdmenu/Makefile	(revision 357106)
>+++ misc/pdmenu/Makefile	(working copy)
>@@ -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 \
>Index: misc/xosd/Makefile
>===================================================================
>--- misc/xosd/Makefile	(revision 357106)
>+++ misc/xosd/Makefile	(working copy)
>@@ -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
>Index: multimedia/gmencoder/Makefile
>===================================================================
>--- multimedia/gmencoder/Makefile	(revision 357106)
>+++ multimedia/gmencoder/Makefile	(working copy)
>@@ -15,8 +15,8 @@ BUILD_DEPENDS=	mencoder:${PORTSDIR}/mult
> 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
> 
>Index: multimedia/gnome-mplayer/Makefile
>===================================================================
>--- multimedia/gnome-mplayer/Makefile	(revision 357106)
>+++ multimedia/gnome-mplayer/Makefile	(working copy)
>@@ -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 \
>Index: multimedia/libmovtar/Makefile
>===================================================================
>--- multimedia/libmovtar/Makefile	(revision 357106)
>+++ multimedia/libmovtar/Makefile	(working copy)
>@@ -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>
> 
>Index: multimedia/libmpeg3/Makefile
>===================================================================
>--- multimedia/libmpeg3/Makefile	(revision 357106)
>+++ multimedia/libmpeg3/Makefile	(working copy)
>@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
> 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 
> 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
> 
>Index: multimedia/libmtp/Makefile
>===================================================================
>--- multimedia/libmtp/Makefile	(revision 357106)
>+++ multimedia/libmtp/Makefile	(working copy)
>@@ -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
>Index: multimedia/libtheora/Makefile
>===================================================================
>--- multimedia/libtheora/Makefile	(revision 357106)
>+++ multimedia/libtheora/Makefile	(working copy)
>@@ -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
>Index: multimedia/mpeg4ip/Makefile
>===================================================================
>--- multimedia/mpeg4ip/Makefile	(revision 357106)
>+++ multimedia/mpeg4ip/Makefile	(working copy)
>@@ -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
>Index: multimedia/opencinematools/Makefile
>===================================================================
>--- multimedia/opencinematools/Makefile	(revision 357106)
>+++ multimedia/opencinematools/Makefile	(working copy)
>@@ -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}/
> 
> 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
>Index: multimedia/totem/Makefile
>===================================================================
>--- multimedia/totem/Makefile	(revision 357106)
>+++ multimedia/totem/Makefile	(working copy)
>@@ -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 \
>Index: multimedia/xawtv/Makefile
>===================================================================
>--- multimedia/xawtv/Makefile	(revision 357106)
>+++ multimedia/xawtv/Makefile	(working copy)
>@@ -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
>Index: net/arping/Makefile
>===================================================================
>--- net/arping/Makefile	(revision 357106)
>+++ net/arping/Makefile	(working copy)
>@@ -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
> 
>Index: net/c3270/Makefile
>===================================================================
>--- net/c3270/Makefile	(revision 357106)
>+++ net/c3270/Makefile	(working copy)
>@@ -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 \
>Index: net/dante/Makefile
>===================================================================
>--- net/dante/Makefile	(revision 357106)
>+++ net/dante/Makefile	(working copy)
>@@ -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
> 
>Index: net/freeradius2/Makefile
>===================================================================
>--- net/freeradius2/Makefile	(revision 357106)
>+++ net/freeradius2/Makefile	(working copy)
>@@ -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
>Index: net/freeradius3/Makefile
>===================================================================
>--- net/freeradius3/Makefile	(revision 357106)
>+++ net/freeradius3/Makefile	(working copy)
>@@ -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} {} \;
>Index: net/freeswitch-core-devel/Makefile
>===================================================================
>--- net/freeswitch-core-devel/Makefile	(revision 357106)
>+++ net/freeswitch-core-devel/Makefile	(working copy)
>@@ -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
>Index: net/freeswitch-core-devel/files/patch-build-modmake.rules.in
>===================================================================
>--- net/freeswitch-core-devel/files/patch-build-modmake.rules.in	(revision 0)
>+++ net/freeswitch-core-devel/files/patch-build-modmake.rules.in	(working copy)
>@@ -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@
>+ 
>
>Property changes on: net/freeswitch-core-devel/files/patch-build-modmake.rules.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net/gutenfetch/Makefile
>===================================================================
>--- net/gutenfetch/Makefile	(revision 357106)
>+++ net/gutenfetch/Makefile	(working copy)
>@@ -12,8 +12,8 @@ COMMENT=	Fetch listings and books from P
> 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
>Index: net/isc-dhcp41-server/Makefile
>===================================================================
>--- net/isc-dhcp41-server/Makefile	(revision 357106)
>+++ net/isc-dhcp41-server/Makefile	(working copy)
>@@ -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
>Index: net/isc-dhcp42-server/Makefile
>===================================================================
>--- net/isc-dhcp42-server/Makefile	(revision 357106)
>+++ net/isc-dhcp42-server/Makefile	(working copy)
>@@ -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
> 
>Index: net/isc-dhcp43-server/Makefile
>===================================================================
>--- net/isc-dhcp43-server/Makefile	(revision 357106)
>+++ net/isc-dhcp43-server/Makefile	(working copy)
>@@ -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
> 
>Index: net/ldap2dns/Makefile
>===================================================================
>--- net/ldap2dns/Makefile	(revision 357106)
>+++ net/ldap2dns/Makefile	(working copy)
>@@ -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 \
>Index: net/nast/Makefile
>===================================================================
>--- net/nast/Makefile	(revision 357106)
>+++ net/nast/Makefile	(working copy)
>@@ -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/libnet1
> 
> 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}
> 
>Index: net/nast/files/patch-configure
>===================================================================
>--- net/nast/files/patch-configure	(revision 357106)
>+++ net/nast/files/patch-configure	(working copy)
>@@ -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
>+ 
>Index: net/netdude/Makefile
>===================================================================
>--- net/netdude/Makefile	(revision 357106)
>+++ net/netdude/Makefile	(working copy)
>@@ -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
> 
>Index: net/ntopng/Makefile
>===================================================================
>--- net/ntopng/Makefile	(revision 357106)
>+++ net/ntopng/Makefile	(working copy)
>@@ -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}
>Index: net/ntopng/files/patch-configure
>===================================================================
>--- net/ntopng/files/patch-configure	(revision 357106)
>+++ net/ntopng/files/patch-configure	(working copy)
>@@ -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"
>Index: net/openldap24-server/Makefile
>===================================================================
>--- net/openldap24-server/Makefile	(revision 357106)
>+++ net/openldap24-server/Makefile	(working copy)
>@@ -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
>Index: net/rtpproxy/Makefile
>===================================================================
>--- net/rtpproxy/Makefile	(revision 357106)
>+++ net/rtpproxy/Makefile	(working copy)
>@@ -13,9 +13,8 @@ COMMENT=	High-performance RTP proxy serv
> 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}
>Index: net/siproxd/Makefile
>===================================================================
>--- net/siproxd/Makefile	(revision 357106)
>+++ net/siproxd/Makefile	(working copy)
>@@ -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 \
>Index: net/siproxd/files/patch-aclocal.m4
>===================================================================
>--- net/siproxd/files/patch-aclocal.m4	(revision 357106)
>+++ net/siproxd/files/patch-aclocal.m4	(working copy)
>@@ -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*)
>Index: net/siproxd/files/patch-configure
>===================================================================
>--- net/siproxd/files/patch-configure	(revision 357106)
>+++ net/siproxd/files/patch-configure	(working copy)
>@@ -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*)
>Index: net/siproxd/files/patch-libltdl_aclocal.m4
>===================================================================
>--- net/siproxd/files/patch-libltdl_aclocal.m4	(revision 357106)
>+++ net/siproxd/files/patch-libltdl_aclocal.m4	(working copy)
>@@ -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*)
>Index: net/siproxd/files/patch-libltdl_configure
>===================================================================
>--- net/siproxd/files/patch-libltdl_configure	(revision 357106)
>+++ net/siproxd/files/patch-libltdl_configure	(working copy)
>@@ -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*)
>Index: net/siproxd/pkg-plist
>===================================================================
>--- net/siproxd/pkg-plist	(revision 357106)
>+++ net/siproxd/pkg-plist	(working copy)
>@@ -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
>Index: net/tac_plus4/Makefile
>===================================================================
>--- net/tac_plus4/Makefile	(revision 357106)
>+++ net/tac_plus4/Makefile	(working copy)
>@@ -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:
>Index: net/traff/Makefile
>===================================================================
>--- net/traff/Makefile	(revision 357106)
>+++ net/traff/Makefile	(working copy)
>@@ -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
>Index: net/trafshow3/Makefile
>===================================================================
>--- net/trafshow3/Makefile	(revision 357106)
>+++ net/trafshow3/Makefile	(working copy)
>@@ -22,8 +22,8 @@ LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/l
> .endif
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
> CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> ALL_TARGET=	trafshow
> 
> post-patch:
>Index: net/trickle/Makefile
>===================================================================
>--- net/trickle/Makefile	(revision 357106)
>+++ net/trickle/Makefile	(working copy)
>@@ -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:
>Index: net/tsclient/Makefile
>===================================================================
>--- net/tsclient/Makefile	(revision 357106)
>+++ net/tsclient/Makefile	(working copy)
>@@ -15,10 +15,9 @@ RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rd
> 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
> 
>Index: net/uplog/Makefile
>===================================================================
>--- net/uplog/Makefile	(revision 357106)
>+++ net/uplog/Makefile	(working copy)
>@@ -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
>Index: net/wire/Makefile
>===================================================================
>--- net/wire/Makefile	(revision 357106)
>+++ net/wire/Makefile	(working copy)
>@@ -14,8 +14,8 @@ COMMENT=	Wire is a screen-oriented comma
> 
> 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
>Index: net/wireshark/Makefile
>===================================================================
>--- net/wireshark/Makefile	(revision 357106)
>+++ net/wireshark/Makefile	(working copy)
>@@ -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
>Index: net-im/libpurple/Makefile
>===================================================================
>--- net-im/libpurple/Makefile	(revision 357106)
>+++ net-im/libpurple/Makefile	(working copy)
>@@ -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)
>Index: net-im/mu-conference/Makefile
>===================================================================
>--- net-im/mu-conference/Makefile	(revision 357106)
>+++ net-im/mu-conference/Makefile	(working copy)
>@@ -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
> 
>Index: net-mgmt/ap-utils/Makefile
>===================================================================
>--- net-mgmt/ap-utils/Makefile	(revision 357106)
>+++ net-mgmt/ap-utils/Makefile	(working copy)
>@@ -12,9 +12,8 @@ COMMENT=	Set of utilities to configure a
> 
> 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
>Index: net-mgmt/bwm-ng/Makefile
>===================================================================
>--- net-mgmt/bwm-ng/Makefile	(revision 357106)
>+++ net-mgmt/bwm-ng/Makefile	(working copy)
>@@ -14,10 +14,11 @@ LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/
> 
> 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>
>Index: net-mgmt/collectd/Makefile
>===================================================================
>--- net-mgmt/collectd/Makefile	(revision 357106)
>+++ net-mgmt/collectd/Makefile	(working copy)
>@@ -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 "
>Index: net-mgmt/collectd5/Makefile
>===================================================================
>--- net-mgmt/collectd5/Makefile	(revision 357106)
>+++ net-mgmt/collectd5/Makefile	(working copy)
>@@ -61,7 +61,7 @@ USE_LDCONFIG=	yes
> CONFLICTS=	collectd-4.[0-9]*
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> .include <bsd.port.options.mk>
> 
>@@ -208,7 +208,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
>@@ -371,7 +371,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
>Index: net-mgmt/disco/Makefile
>===================================================================
>--- net-mgmt/disco/Makefile	(revision 357106)
>+++ net-mgmt/disco/Makefile	(working copy)
>@@ -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}
> 
>Index: net-mgmt/flow-extract/Makefile
>===================================================================
>--- net-mgmt/flow-extract/Makefile	(revision 357106)
>+++ net-mgmt/flow-extract/Makefile	(working copy)
>@@ -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
>Index: net-mgmt/icinga/Makefile
>===================================================================
>--- net-mgmt/icinga/Makefile	(revision 357106)
>+++ net-mgmt/icinga/Makefile	(working copy)
>@@ -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=${IC
> 		--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
>Index: net-mgmt/nagios/Makefile
>===================================================================
>--- net-mgmt/nagios/Makefile	(revision 357106)
>+++ net-mgmt/nagios/Makefile	(working copy)
>@@ -41,11 +41,11 @@ CONFIGURE_ARGS=	--with-command-user=${NA
> 		--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
> 
>Index: net-mgmt/nagios4/Makefile
>===================================================================
>--- net-mgmt/nagios4/Makefile	(revision 357106)
>+++ net-mgmt/nagios4/Makefile	(working copy)
>@@ -39,11 +39,11 @@ CONFIGURE_ARGS=	--with-command-user=${NA
> 		--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} \
>Index: net-mgmt/nbtscan/Makefile
>===================================================================
>--- net-mgmt/nbtscan/Makefile	(revision 357106)
>+++ net-mgmt/nbtscan/Makefile	(working copy)
>@@ -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
>Index: net-mgmt/nefu/Makefile
>===================================================================
>--- net-mgmt/nefu/Makefile	(revision 357106)
>+++ net-mgmt/nefu/Makefile	(working copy)
>@@ -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 \
>Index: net-mgmt/rate/Makefile
>===================================================================
>--- net-mgmt/rate/Makefile	(revision 357106)
>+++ net-mgmt/rate/Makefile	(working copy)
>@@ -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
> 
>Index: net-mgmt/sing/Makefile
>===================================================================
>--- net-mgmt/sing/Makefile	(revision 357106)
>+++ net-mgmt/sing/Makefile	(working copy)
>@@ -18,9 +18,9 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSD
> 
> 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
> 
>Index: net-mgmt/snmp4nagios/Makefile
>===================================================================
>--- net-mgmt/snmp4nagios/Makefile	(revision 357106)
>+++ net-mgmt/snmp4nagios/Makefile	(working copy)
>@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/${NA
> 		--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>
> 
>Index: net-p2p/jigdo/Makefile
>===================================================================
>--- net-p2p/jigdo/Makefile	(revision 357106)
>+++ net-p2p/jigdo/Makefile	(working copy)
>@@ -31,10 +31,10 @@ GUI_LIB_DEPENDS=	libgtk-x11-2.0.so:${POR
> 			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
>Index: net-p2p/teknap/Makefile
>===================================================================
>--- net-p2p/teknap/Makefile	(revision 357106)
>+++ net-p2p/teknap/Makefile	(working copy)
>@@ -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>
>Index: news/newsstar/Makefile
>===================================================================
>--- news/newsstar/Makefile	(revision 357106)
>+++ news/newsstar/Makefile	(working copy)
>@@ -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>
> 
>Index: news/noffle/Makefile
>===================================================================
>--- news/noffle/Makefile	(revision 357106)
>+++ news/noffle/Makefile	(working copy)
>@@ -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}
>Index: print/a2ps/Makefile
>===================================================================
>--- print/a2ps/Makefile	(revision 357106)
>+++ print/a2ps/Makefile	(working copy)
>@@ -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
>Index: print/cups-base/Makefile
>===================================================================
>--- print/cups-base/Makefile	(revision 357106)
>+++ print/cups-base/Makefile	(working copy)
>@@ -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}/deve
> .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
>Index: print/gv/Makefile
>===================================================================
>--- print/gv/Makefile	(revision 357106)
>+++ print/gv/Makefile	(working copy)
>@@ -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
>Index: print/openprinting/Makefile
>===================================================================
>--- print/openprinting/Makefile	(revision 357106)
>+++ print/openprinting/Makefile	(working copy)
>@@ -28,6 +28,9 @@ USE_AUTOTOOLS=	aclocal autoconf autohead
> 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=dis
> 
> .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
>Index: print/ttf2pt1/Makefile
>===================================================================
>--- print/ttf2pt1/Makefile	(revision 357106)
>+++ print/ttf2pt1/Makefile	(working copy)
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
> 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:
>Index: security/bsmtrace/Makefile
>===================================================================
>--- security/bsmtrace/Makefile	(revision 357106)
>+++ security/bsmtrace/Makefile	(working copy)
>@@ -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:
>Index: security/libgnomesu/Makefile
>===================================================================
>--- security/libgnomesu/Makefile	(revision 357106)
>+++ security/libgnomesu/Makefile	(working copy)
>@@ -15,8 +15,8 @@ USE_AUTOTOOLS=	libtool
> USES=		pathfix gmake pkgconfig
> USE_GNOME=	gnomeprefix libgnomeui
> CONFIGURE_ARGS+=--disable-install-pam
>-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
> CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> NO_STAGE=	yes
> post-patch:
>Index: security/libgringotts/Makefile
>===================================================================
>--- security/libgringotts/Makefile	(revision 357106)
>+++ security/libgringotts/Makefile	(working copy)
>@@ -15,8 +15,8 @@ LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/se
> 
> 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
>Index: security/libpwquality/Makefile
>===================================================================
>--- security/libpwquality/Makefile	(revision 357106)
>+++ security/libpwquality/Makefile	(working copy)
>@@ -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
>Index: security/openscep/Makefile
>===================================================================
>--- security/openscep/Makefile	(revision 357106)
>+++ security/openscep/Makefile	(working copy)
>@@ -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" \
>Index: security/p11-kit/Makefile
>===================================================================
>--- security/p11-kit/Makefile	(revision 357106)
>+++ security/p11-kit/Makefile	(working copy)
>@@ -17,8 +17,8 @@ LIB_DEPENDS=	libtasn1.so:${PORTSDIR}/sec
> 
> 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
>Index: security/prelude-manager/Makefile
>===================================================================
>--- security/prelude-manager/Makefile	(revision 357106)
>+++ security/prelude-manager/Makefile	(working copy)
>@@ -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
>Index: security/sectok/Makefile
>===================================================================
>--- security/sectok/Makefile	(revision 357106)
>+++ security/sectok/Makefile	(working copy)
>@@ -15,17 +15,18 @@ LIB_DEPENDS=	libsectok.so:${PORTSDIR}/se
> 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} \
>Index: security/steghide/Makefile
>===================================================================
>--- security/steghide/Makefile	(revision 357106)
>+++ security/steghide/Makefile	(working copy)
>@@ -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,' \
>Index: security/vlog/Makefile
>===================================================================
>--- security/vlog/Makefile	(revision 357106)
>+++ security/vlog/Makefile	(working copy)
>@@ -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 \
>Index: security/xca/Makefile
>===================================================================
>--- security/xca/Makefile	(revision 357106)
>+++ security/xca/Makefile	(working copy)
>@@ -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
>Index: sysutils/apcupsd/Makefile
>===================================================================
>--- sysutils/apcupsd/Makefile	(revision 357106)
>+++ sysutils/apcupsd/Makefile	(working copy)
>@@ -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
>Index: sysutils/coreutils/Makefile
>===================================================================
>--- sysutils/coreutils/Makefile	(revision 357106)
>+++ sysutils/coreutils/Makefile	(working copy)
>@@ -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
>Index: sysutils/dar/Makefile
>===================================================================
>--- sysutils/dar/Makefile	(revision 357106)
>+++ sysutils/dar/Makefile	(working copy)
>@@ -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
>Index: sysutils/dar/files/patch-configure
>===================================================================
>--- sysutils/dar/files/patch-configure	(revision 0)
>+++ sysutils/dar/files/patch-configure	(working copy)
>@@ -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;
>
>Property changes on: sysutils/dar/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/dar/files/patch-src-dar-Makefile.in
>===================================================================
>--- sysutils/dar/files/patch-src-dar-Makefile.in	(revision 357106)
>+++ sysutils/dar/files/patch-src-dar-Makefile.in	(working copy)
>@@ -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)
>Index: sysutils/dc3dd/Makefile
>===================================================================
>--- sysutils/dc3dd/Makefile	(revision 357106)
>+++ sysutils/dc3dd/Makefile	(working copy)
>@@ -12,8 +12,8 @@ COMMENT=	A dd program useful for compute
> 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
>Index: sysutils/fileschanged/Makefile
>===================================================================
>--- sysutils/fileschanged/Makefile	(revision 357106)
>+++ sysutils/fileschanged/Makefile	(working copy)
>@@ -15,9 +15,8 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc
> 
> 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
>Index: sysutils/gcombust/Makefile
>===================================================================
>--- sysutils/gcombust/Makefile	(revision 357106)
>+++ sysutils/gcombust/Makefile	(working copy)
>@@ -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
> 
>Index: sysutils/graveman/Makefile
>===================================================================
>--- sysutils/graveman/Makefile	(revision 357106)
>+++ sysutils/graveman/Makefile	(working copy)
>@@ -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
>Index: sysutils/htop/Makefile
>===================================================================
>--- sysutils/htop/Makefile	(revision 357106)
>+++ sysutils/htop/Makefile	(working copy)
>@@ -17,10 +17,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
>Index: sysutils/mate-system-monitor/Makefile
>===================================================================
>--- sysutils/mate-system-monitor/Makefile	(revision 357106)
>+++ sysutils/mate-system-monitor/Makefile	(working copy)
>@@ -22,9 +22,8 @@ USE_GNOME=	glib20 gnomehier gtk20 librsv
> 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
>Index: sysutils/uniutils/Makefile
>===================================================================
>--- sysutils/uniutils/Makefile	(revision 357106)
>+++ sysutils/uniutils/Makefile	(working copy)
>@@ -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	\
>Index: textproc/exempi/Makefile
>===================================================================
>--- textproc/exempi/Makefile	(revision 357106)
>+++ textproc/exempi/Makefile	(working copy)
>@@ -15,9 +15,8 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
> 
> 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
>Index: textproc/redland/Makefile
>===================================================================
>--- textproc/redland/Makefile	(revision 357106)
>+++ textproc/redland/Makefile	(working copy)
>@@ -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
>Index: textproc/scrollkeeper/Makefile
>===================================================================
>--- textproc/scrollkeeper/Makefile	(revision 357106)
>+++ textproc/scrollkeeper/Makefile	(working copy)
>@@ -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:
>Index: textproc/spellutils/Makefile
>===================================================================
>--- textproc/spellutils/Makefile	(revision 357106)
>+++ textproc/spellutils/Makefile	(working copy)
>@@ -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
>Index: textproc/stardict3/Makefile
>===================================================================
>--- textproc/stardict3/Makefile	(revision 357106)
>+++ textproc/stardict3/Makefile	(working copy)
>@@ -16,11 +16,11 @@ LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/
> 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}
>Index: textproc/uim-el/Makefile
>===================================================================
>--- textproc/uim-el/Makefile	(revision 357106)
>+++ textproc/uim-el/Makefile	(working copy)
>@@ -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}/,,}"
>Index: www/dpsearch/Makefile
>===================================================================
>--- www/dpsearch/Makefile	(revision 357106)
>+++ www/dpsearch/Makefile	(working copy)
>@@ -40,7 +40,7 @@ EXTRACT_DESC=	Enable libextractor suppor
> 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
>Index: www/epiphany/Makefile
>===================================================================
>--- www/epiphany/Makefile	(revision 357106)
>+++ www/epiphany/Makefile	(working copy)
>@@ -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
> 
>Index: www/mod_encoding/Makefile
>===================================================================
>--- www/mod_encoding/Makefile	(revision 357106)
>+++ www/mod_encoding/Makefile	(working copy)
>@@ -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
> 
>Index: www/mod_log_sql2/Makefile
>===================================================================
>--- www/mod_log_sql2/Makefile	(revision 357106)
>+++ www/mod_log_sql2/Makefile	(working copy)
>@@ -21,7 +21,7 @@ PLIST_SUB+=	SSL=${SSL_PLIST} 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>
> 
>Index: www/mod_log_sql2-dtc/Makefile
>===================================================================
>--- www/mod_log_sql2-dtc/Makefile	(revision 357106)
>+++ www/mod_log_sql2-dtc/Makefile	(working copy)
>@@ -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>
>Index: www/shttpd/Makefile
>===================================================================
>--- www/shttpd/Makefile	(revision 357106)
>+++ www/shttpd/Makefile	(working copy)
>@@ -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
>Index: www/sitecopy/Makefile
>===================================================================
>--- www/sitecopy/Makefile	(revision 357106)
>+++ www/sitecopy/Makefile	(working copy)
>@@ -15,9 +15,8 @@ COMMENT=	Maintains remote websites, uses
> 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
>Index: www/webalizer/Makefile
>===================================================================
>--- www/webalizer/Makefile	(revision 357106)
>+++ www/webalizer/Makefile	(working copy)
>@@ -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}
>Index: www/wwwoffle/Makefile
>===================================================================
>--- www/wwwoffle/Makefile	(revision 357106)
>+++ www/wwwoffle/Makefile	(working copy)
>@@ -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} \
>Index: x11/gdm/Makefile
>===================================================================
>--- x11/gdm/Makefile	(revision 357106)
>+++ x11/gdm/Makefile	(working copy)
>@@ -42,10 +42,9 @@ GCONF_SCHEMAS=	gdm-simple-greeter.schema
> 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
> 
>Index: x11/gnome-swallow/Makefile
>===================================================================
>--- x11/gnome-swallow/Makefile	(revision 357106)
>+++ x11/gnome-swallow/Makefile	(working copy)
>@@ -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 ; \
>Index: x11/libxcb/Makefile
>===================================================================
>--- x11/libxcb/Makefile	(revision 357106)
>+++ x11/libxcb/Makefile	(working copy)
>@@ -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
>Index: x11/mrxvt/Makefile
>===================================================================
>--- x11/mrxvt/Makefile	(revision 357106)
>+++ x11/mrxvt/Makefile	(working copy)
>@@ -34,8 +34,8 @@ LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-font
> 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 \
>Index: x11/rxvt-devel/Makefile
>===================================================================
>--- x11/rxvt-devel/Makefile	(revision 357106)
>+++ x11/rxvt-devel/Makefile	(working copy)
>@@ -13,6 +13,7 @@ COMMENT=	Low memory usage xterm replacem
> 
> 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
>Index: x11/rxvt-unicode/Makefile
>===================================================================
>--- x11/rxvt-unicode/Makefile	(revision 357106)
>+++ x11/rxvt-unicode/Makefile	(working copy)
>@@ -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
> 
>Index: x11/rxvt-unicode/files/patch-configure
>===================================================================
>--- x11/rxvt-unicode/files/patch-configure	(revision 0)
>+++ x11/rxvt-unicode/files/patch-configure	(working copy)
>@@ -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
>
>Property changes on: x11/rxvt-unicode/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/wbar/Makefile
>===================================================================
>--- x11/wbar/Makefile	(revision 357106)
>+++ x11/wbar/Makefile	(working copy)
>@@ -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
>Index: x11/workrave/Makefile
>===================================================================
>--- x11/workrave/Makefile	(revision 357106)
>+++ x11/workrave/Makefile	(working copy)
>@@ -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>
>Index: x11/x3270/Makefile
>===================================================================
>--- x11/x3270/Makefile	(revision 357106)
>+++ x11/x3270/Makefile	(working copy)
>@@ -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
>Index: x11/xscreensaver-gnome/Makefile
>===================================================================
>--- x11/xscreensaver-gnome/Makefile	(revision 357106)
>+++ x11/xscreensaver-gnome/Makefile	(working copy)
>@@ -29,9 +29,8 @@ CONFIGURE_ARGS=	--with-gtk --with-gl --w
> 		--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
>Index: x11/xterm/Makefile
>===================================================================
>--- x11/xterm/Makefile	(revision 357106)
>+++ x11/xterm/Makefile	(working copy)
>@@ -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
> 
>Index: x11/xtermcontrol/Makefile
>===================================================================
>--- x11/xtermcontrol/Makefile	(revision 357106)
>+++ x11/xtermcontrol/Makefile	(working copy)
>@@ -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
> 
>Index: x11/zenity/Makefile
>===================================================================
>--- x11/zenity/Makefile	(revision 357106)
>+++ x11/zenity/Makefile	(working copy)
>@@ -20,10 +20,8 @@ USE_GNOME=	gnomeprefix gtk20 gnomedocuti
> 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.*
> 
>Index: x11-fm/nautilus/Makefile
>===================================================================
>--- x11-fm/nautilus/Makefile	(revision 357106)
>+++ x11-fm/nautilus/Makefile	(working copy)
>@@ -26,9 +26,9 @@ USE_GNOME=	gnomeprefix intlhack gnomedes
> 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"
> 
>Index: x11-toolkits/gtk12/Makefile
>===================================================================
>--- x11-toolkits/gtk12/Makefile	(revision 357106)
>+++ x11-toolkits/gtk12/Makefile	(working copy)
>@@ -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>
>Index: x11-toolkits/gtksourceview/Makefile
>===================================================================
>--- x11-toolkits/gtksourceview/Makefile	(revision 357106)
>+++ x11-toolkits/gtksourceview/Makefile	(working copy)
>@@ -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>
>Index: x11-toolkits/gtksourceview2/Makefile
>===================================================================
>--- x11-toolkits/gtksourceview2/Makefile	(revision 357106)
>+++ x11-toolkits/gtksourceview2/Makefile	(working copy)
>@@ -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>
>Index: x11-toolkits/libzvt/Makefile
>===================================================================
>--- x11-toolkits/libzvt/Makefile	(revision 357106)
>+++ x11-toolkits/libzvt/Makefile	(working copy)
>@@ -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 \
>Index: x11-toolkits/py-gnome2/Makefile
>===================================================================
>--- x11-toolkits/py-gnome2/Makefile	(revision 357106)
>+++ x11-toolkits/py-gnome2/Makefile	(working copy)
>@@ -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
>Index: x11-toolkits/wxgtk28/Makefile
>===================================================================
>--- x11-toolkits/wxgtk28/Makefile	(revision 357106)
>+++ x11-toolkits/wxgtk28/Makefile	(working copy)
>@@ -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
>Index: x11-toolkits/wxgtk30/Makefile
>===================================================================
>--- x11-toolkits/wxgtk30/Makefile	(revision 357106)
>+++ x11-toolkits/wxgtk30/Makefile	(working copy)
>@@ -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
>Index: x11-wm/fbcmd/Makefile
>===================================================================
>--- x11-wm/fbcmd/Makefile	(revision 357106)
>+++ x11-wm/fbcmd/Makefile	(working copy)
>@@ -14,13 +14,16 @@ RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/
> 
> 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
>Index: x11-wm/fluxbox/Makefile
>===================================================================
>--- x11-wm/fluxbox/Makefile	(revision 357106)
>+++ x11-wm/fluxbox/Makefile	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 190592: 143345 | 143582