Support LIBS like LDFLAGS.

- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV. - Add an option helper for LIBS. - Adjust all ports that already use LIBS. Also remove references to PTHREAD_CFLAGS and PTHREAD_LIBS while here. - Some ports did not support having a LIBS environment variable and required additional patches. Somewhat simplified a linker command line looks like: ${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS} where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and LIBS can be controlled by us. If possible -L and -l flags need to be added to LIBS to make sure they appear after any -L and -l flags set by upstream. Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this may appear too early on the command line causing installed libraries to be linked in instead of freshly built ones. Additional changes: benchmarks/netio: Replace WITH_IPV6 with an IPV6 option. comms/gnokii: Replace some patches with USES=pathfix. Also remove -fPIC. graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR. graphics/visionworkbench: Remove FreeBSD 7 support. multimedia/libmovtar: New LIB_DEPENDS syntax. multimedia/opencinematools: Use standard do-build. net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins) net-mgmt/nagios: Remove -fPIC. net-mgmt/nagios4: Remove -fPIC. print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036. security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS. This skips a test in configure that falsely detects pthread_mutexattr_init in our libc. sysutils/dar: Fix iconv detection. x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD hack and use $CXX as linker as on other platforms. PR: 190592 Exp-run by: antoine Approved by: portmgr (antoine)
svn path=/head/; revision=357486
2024-11-21 00:25:50 +00:00 · 2014-06-11 14:49:59 +00:00 · 2014-06-11 14:49:59 +00:00 · 9f8b4bcde3 · 2021-03-31 03:12:20 +00:00
commit 9f8b4bcde3
parent 0533abe3e7
297 changed files with 620 additions and 850 deletions
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -114,7 +114,7 @@ MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 			${MOZILLA}-xpcom ${MOZILLA}-plugin

 MOZ_EXPORT+=	${CONFIGURE_ENV} \
-				LIBS="${LIBS}" PERL="${PERL}"
+				PERL="${PERL}"
 MOZ_OPTIONS+=	--prefix="${PREFIX}"

 CPPFLAGS+=		-isystem${LOCALBASE}/include
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@ -104,11 +104,11 @@
 #							FOO=bar,baz and you'll get USE_FOO=bar baz
 #
 # For each of:
-# ALL_TARGET CATEGORIES CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
-# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES FLAGS
-# INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS
-# PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will add its
-# content to the actual variable when the option is enabled.  Defining
+# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
+# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES
+# INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES
+# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will
+# add its content to the actual variable when the option is enabled.  Defining
 # ${opt}_${variable}_OFF will add its content to the actual variable when the
 # option is disabled.
 #
@ -131,7 +131,7 @@ OPTIONS_FILE?=	${PORT_DBDIR}/${OPTIONS_NAME}/options

 _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
 				CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \
-				EXTRA_PATCHES INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV \
+				EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
 				PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \
 				USES
 _OPTIONS_DEPENDS=	PKG FETCH EXTRACT PATCH BUILD LIB RUN
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -2032,7 +2032,7 @@ MAKE_ENV+=		PREFIX=${PREFIX} \
 			LIBDIR="${LIBDIR}" \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
+			LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 			MANPREFIX="${MANPREFIX}"

@ -3629,7 +3629,7 @@ do-configure:
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	    LDFLAGS="${LDFLAGS}" \
+	    LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
 	    INSTALL_LIB="${INSTALL_LIB}" \
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@ -28,7 +28,7 @@ MAKE_ENV=	OLD_PO_FILE_INPUT=1
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CPPFLAGS=	-I${LOCALBASE}/include
-NLS_CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}"
+NLS_LIBS=	-L${LOCALBASE}/lib -lintl ${ICONV_LIB}
 NLS_CONFIGURE_ENABLE=	nls

 post-patch:
--- a/astro/cfitsio/Makefile
+++ b/astro/cfitsio/Makefile
@ -23,8 +23,8 @@ OPTIONS_DEFINE=	DOCS

 ALL_TARGET=	libcfitsio.a shared
 CFLAGS+=	-I${INCLUDEDIR}
+LIBS+=		-L${LIBDIR} -lz
 CONFIGURE_ARGS=	ac_cv_prog_FC=f2c
-CONFIGURE_ENV=	LIBS="-L${LIBDIR} -lz"
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c"
 USE_LDCONFIG=	yes
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@ -21,8 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib" \

-CONFIGURE_ENV=	LIBS="-lcompat"
 CPPFLAGS+=	-I${LOCALBASE}/include/GL -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lm
+LIBS+=		-L${LOCALBASE}/lib -lm -lcompat

 .include <bsd.port.mk>
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@ -52,6 +52,9 @@ post-patch:
 		 s|/usr/include|${LOCALBASE}/include|g ; \
 		 s|/usr/local/include|${LOCALBASE}/include|g ; \
 		 s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/src/options.mk
+	@${ECHO_CMD} 'CFLAGS=${CFLAGS}' > ${WRKSRC}/src/overrides.mk
+	@${ECHO_CMD} 'LDFLAGS=${LDFLAGS}' >> ${WRKSRC}/src/overrides.mk
+	@${ECHO_CMD} 'LIBS=${LIBS}' >> ${WRKSRC}/src/overrides.mk

 do-install:
 .for _BIN in ${BINS}
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@ -14,8 +14,8 @@ GNU_CONFIGURE=	yes
 USES=		iconv
 USE_XORG=	xt xscrnsaver
 CONFIGURE_ARGS=	--with-map-extension=jpg
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lm"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm

 OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@ -21,9 +21,9 @@ GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig gettext iconv shebangfix tar:bzip2 desktop-file-utils \
 		libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
-		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
+CONFIGURE_ARGS=	--disable-alsa --disable-nullout
+CPPFLAGS+=	-I../dumb/dumb-kode54/include -I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lexecinfo -lintl
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL="${LOCALBASE}/bin/bash"
--- a/audio/fdk-aac/Makefile
+++ b/audio/fdk-aac/Makefile
@ -17,7 +17,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 NOT_FOR_ARCHS=		sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to this architecture

-CONFIGURE_ENV=	LIBS="-lm"
+LIBS+=		-lm
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		pathfix
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@ -37,11 +37,9 @@ CONFIGURE_WRKSRC=	${WRKDIR}/festival
 USES=		gmake
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
-MAKE_ENV+=	GCC="${CC}" \
-		GXX="${CXX}" \
-		EST_HOME=${SPEECHTOOLS} \
-		EGCS_CC="${CC}" \
-		EGCS_CXX="${CXX}"
+MAKE_ARGS+=	CC="${CC}" GCC="${CC}" \
+		CXX="${CXX}" GXX="${CXX}" \
+		EST_HOME=${SPEECHTOOLS}
 WRKSRC=		${WRKDIR}

 SPT_PATCHES=	base__class_EST__TVector.cc	\
@ -60,14 +58,13 @@ SPT_PATCHES=	base__class_EST__TVector.cc	\

 do-build:
 .for d in speech_tools festival
-	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile \
-		${MAKE_ARGS}
+	${MAKE_CMD} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile ${MAKE_ARGS}
 .endfor

 # Can not make test in `festival', because the voices may not be installed
 # XXX: this should fail, if the verdict is not "CORRECT"...
 post-build test:
-	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test
+	${MAKE_CMD} -C ${WRKDIR}/speech_tools test

 # The below is needed, because Debian's patches expect a different
 # directory-name
@ -96,8 +93,8 @@ CONFIGURE_ARGS+=--disable-$m
 do-configure:
 .for d in speech_tools festival
 	@cd ${WRKDIR}/$d && \
-		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}; then \
 		${ECHO_CMD} "===>  configuration script for $d failed."; \
 		${FALSE}; \
@ -105,8 +102,9 @@ do-configure:
 	# This step helps non-i386 systems and is harmless on i386
 	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH}_unknown.mak
 .endfor
-	${REINPLACE_CMD} -E -e 's,^(CC|CXX) *=,\1 ?=,' \
-	    -e 's,^(CFLAGS|CXXFLAGS) *=,\1 +=,' \
+	${REINPLACE_CMD} \
+	    -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \
+	    -e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \
 	    -e 's,^OPTIMI,#OPTIMI,' \
 	    ${WRKSRC}/speech_tools/config/compilers/gcc*.mak
 	# This step helps to use a compiler, the vendor has not seen before:
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@ -24,10 +24,8 @@ LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \

 GNU_CONFIGURE=	yes
 NO_STAGE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-id3tag=${PREFIX} \
 			--enable-sqlite3 --enable-oggvorbis --enable-flac
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@ -20,11 +20,10 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		gmake pathfix pkgconfig libtool:keepla

-CONFIGURE_ENV=	LIBS="-pthread"
 CONFIGURE_ARGS=	--enable-portaudio \
 		--with-default-tmpdir=/tmp
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib

 LATEST_LINK=	jack

--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@ -20,12 +20,11 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \
 		--with-boost-thread=boost_thread
-CONFIGURE_ENV+=	"LIBS=-lboost_system"

 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz

-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lboost_system

 .include <bsd.port.options.mk>

--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@ -19,8 +19,6 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

-MAKE_ENV+=	LIBS="${LDFLAGS}"
-CONFIGURE_ENV+=	LIBS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-ccore --disable-optimisations

 PLIST_FILES=	bin/playgsf
@ -29,7 +27,7 @@ ONLY_FOR_ARCHS=	i386 amd64

 PORTSCOUT=	skipv:0.7.2

-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if ${OSVERSION} >= 901000
 EXTRA_PATCHES=	${FILESDIR}/extrapatch-VBA__Util.cpp
@ -37,19 +35,20 @@ EXTRA_PATCHES=	${FILESDIR}/extrapatch-VBA__Util.cpp

 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|\(@LDFLAGS@\)|\1 ${LDFLAGS}|' \
 		-e 's|\([[:space:]]*\).*configure.*|\1@true|' \
 			${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|^\(CFLAGS="\)\(-DLINUX\)|\1${CFLAGS} \2|' \
+	@${REINPLACE_CMD} \
+		-e '/^CFLAGS="-DLINUX/s|"$$| ${CFLAGS}"|' \
+		-e '/^LDFLAGS="-lz/s|"$$| ${LDFLAGS}"|' \
 		${WRKSRC}/configure

 post-configure:
-	@(cd ${WRKSRC}/libresample-0.1.3; ./configure ${CONFIGURE_ENV})
+	@(cd ${WRKSRC}/libresample-0.1.3 && ${SETENV} \
+		CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		${CONFIGURE_ENV} ./configure)

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin

-post-install:
-	${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -35,10 +35,9 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
-		LIBS="-lm -lintl" \
 		ac_cv_header_linux_input_h=
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm -lintl

 .if ${CC} == clang
 CFLAGS+=	-fheinous-gnu-extensions
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -36,10 +36,9 @@ CONFIGURE_ARGS=	--disable-vala --with-libbrasero-media \
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-lm"

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm

 GCONF_SCHEMAS=	rhythmbox.schemas

--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@ -14,8 +14,8 @@ LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm

 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 INFO=		RPLAY RPTP librplay rplayd

--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@ -19,9 +19,9 @@ LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
 USE_XORG=	x11
 GNU_CONFIGURE=	yes

-CONFIGURE_ENV=	FLTK_CONFIG="${FLTK_CONFIG}" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	FLTK_CONFIG="${FLTK_CONFIG}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 WRKSRC=		${WRKDIR}/spiralmodular-0.2.2

--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@ -16,9 +16,9 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 LICENSE=	GPLv3

 CFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--datadir=${DATADIR}

 post-install:
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@ -15,23 +15,26 @@ WRKSRC=		${WRKDIR}
 USES=		gmake zip
 PLIST_FILES=	bin/netio

-CFLAGS+=	-DUNIX ${PTHREAD_CFLAGS}
-MAKE_ENV+=	OUT="-o" LIBS=${PTHREAD_LIBS}
-.if defined(WITH_IPV6)
-PLIST_FILES+=	bin/netio6
-.endif
+CFLAGS+=	-DUNIX
+LIBS+=		-pthread
+MAKE_ENV+=	OUT=-o
+
+OPTIONS_DEFINE=	IPV6
+IPV6_PLIST_FILES=	bin/netio6
+
+.include <bsd.port.options.mk>

 do-build:
-	cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${GMAKE} all
-.if defined(WITH_IPV6)
-	cd ${WRKSRC}; \
-	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${GMAKE} all
+	@(cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all)
+.if ${PORT_OPTIONS:MIPV6}
+	@(cd ${WRKSRC} && \
+	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all)
 .endif

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 	${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin
 .endif

--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@ -12,7 +12,7 @@ COMMENT=	Show you font info and add new 'name' and 'cmap' tables
 USES=		gmake iconv
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}

 post-patch:
 	@${FIND} ${WRKSRC}/src/ -type f -print0 | \
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@ -17,10 +17,10 @@ COMMENT=	Education software to help people to study English
 LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 USES=		tar:bzip2 gettext gmake pkgconfig
 USE_GNOME=	gtk20 esound
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO readme.txt

--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@ -15,10 +15,8 @@ COMMENT=	The Gnome MFSK terminal program
 LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw

 GNU_CONFIGURE=	yes
-# This is pure evil but it looks like autoconf 2.53 has a bug in linking the
-# preprocessor include tests.  The following line is a work around.
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USES_CSTD=	gnu89
 USES=		gmake pkgconfig
 USE_GNOME=	libgnomeui gnomehack gnomeprefix
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@ -19,19 +19,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser

 GROUPS=		${PORTNAME}
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
-WANT_GNOME=	yes
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include -fPIC
 CONFIGURE_ARGS+=	--enable-security
-CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
-		XGETTEXT="${LOCALBASE}/bin/xgettext" \
-		LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
-		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 SUB_FILES+=	pkg-message
 PORTDOCS=	*
--- a/comms/gnokii/files/patch-common-Makefile.in
+++ b/comms/gnokii/files/patch-common-Makefile.in
@ -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 = \
--- a/comms/gnokii/files/patch-xgnokii-Makefile.in
+++ b/comms/gnokii/files/patch-xgnokii-Makefile.in
@ -9,13 +9,3 @@
 am__DEPENDENCIES_1 =
 xgnokii_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la \
-@@ -360,7 +360,8 @@
- #FIXME install help
- HELP_DIR = docs/help
- pkgconfig_DATA = xgnokii.pc
-pkgconfigdir = $(libdir)/pkgconfig
-+libdatadir = $(libdir)data
-+pkgconfigdir = $(libdatadir)/pkgconfig
- desktop_in_files = xgnokii.desktop.in
- desktopdir = $(datadir)/applications
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@ -19,8 +19,8 @@ USE_GNOME=	libxml2
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	autoconf libtool libltdl
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-perl-binding \
 		--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-python-binding --without-rigmatrix
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@ -20,13 +20,12 @@ NLS_CONFIGURE_ENABLE=	nls

 USES=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lcurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
 			--sysconfdir=${PREFIX}/etc/minicom \
 			--enable-lock-dir=/var/spool/lock \
 			--enable-dfl-port=/dev/cuau0
-MAKE_ARGS+=	LIBS+="${ICONV_LIB} -lcurses"

 .include <bsd.port.pre.mk>

--- a/comms/nokryptia/Makefile
+++ b/comms/nokryptia/Makefile
@ -14,8 +14,8 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib

 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 PLIST_FILES=	bin/nokryptia man/man1/${PORTNAME}.1.gz

--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@ -15,7 +15,7 @@ LICENSE=	GPLv2

 INSTALL_TARGET=	install install.man

-MAKE_ENV=	LIBS="${PTHREAD_LIBS}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"

 post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h
--- a/comms/predict/files/Makefile
+++ b/comms/predict/files/Makefile
@ -16,7 +16,7 @@ CFLAGS	=	-O2
 default:	all
 all:		predict vocalizer/vocalizer

-LIBS += -lm -lncurses
+LIBS = ${LDFLAGS} -pthread -lm -lncurses
 predict:	predict.c predict.h
 		${CC} ${CFLAGS} -o predict predict.c ${LIBS}

--- a/converters/fix-mime-charset/Makefile
+++ b/converters/fix-mime-charset/Makefile
@ -20,8 +20,8 @@ GNU_CONFIGURE=	yes
 USES=		perl5
 USE_PERL5=	build

-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 PLIST_FILES=	bin/fix-mime-charset \
 		man/man1/fix-mime-charset.1.gz
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@ -18,8 +18,6 @@ LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
 		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS=-pthread
-CPPFLAGS+=	-I${LOCALBASE}/include
 USES=		compiler:c++11-lang gmake pkgconfig

 PLIST_FILES=	bin/pdf2djvu man/man1/pdf2djvu.1.gz
--- a/converters/rcctools/Makefile
+++ b/converters/rcctools/Makefile
@ -15,8 +15,8 @@ LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes

-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 PLIST_FILES=	bin/rcc-recode

--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@ -24,8 +24,8 @@ EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LICENSE=	GPLv2

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 USES=		gmake
 REINPLACE_ARGS=	-i ""
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@ -16,8 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \

 USES=	pkgconfig gettext iconv tar:bzip2
 USE_PYTHON=	yes
-CXXFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
+LIBS+=		-L${LOCALBASE}/lib -largp -lintl
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//}
 CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@ -19,9 +19,6 @@ USES=		gmake libtool pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-isqlxx
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
-CXXFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS+=	-I${LOCALBASE}/include
 INSTALL_TARGET=	install-strip

 LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@ -22,8 +22,8 @@ ORACLE_HOME=	${LOCALBASE}/oracle8-client

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}" \
-		LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\
 		AUTOHEADER=true
+LIBS+=		`${CAT} ${ORACLE_HOME}/lib/sysliblist`
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool

--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@ -18,8 +18,6 @@ IGNORE_WITH_PGSQL=	82 83

 USES=		gettext gmake pgsql
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
-CPPFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-wx-version=${USE_WX} --enable-databasedesigner
 USE_GNOME=	libxml2 libxslt
 USE_WX=		2.8
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@ -18,9 +18,8 @@ USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
 		libgnomeui
 USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`

 GCONF_SCHEMAS=	application-browser.schemas slab.schemas

--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@ -19,8 +19,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gtk20 libxml2 intlhack
 CONFIGURE_ARGS=	--program-transform-name="s/$$//"
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 .ifndef(WITHOUT_GTKSPELL)
 LIB_DEPENDS+=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@ -17,8 +17,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 USES=		gmake pathfix pkgconfig
 USE_AUTOTOOLS=	automake:env libtool
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes

 pre-configure:
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@ -114,9 +114,8 @@ APU_CONF_ARGS+=	--without-freetds
 APU_EXTRAS=	yes
 USE_MYSQL=	yes
 APU_CONF_ARGS+=	--with-mysql=${LOCALBASE}
-CONFIGURE_ENV+=	LIBS="${LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+LIBS+=		-L${LOCALBASE}/lib/mysql
 .else
 APU_CONF_ARGS+=	--without-mysql
 .endif
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@ -134,9 +134,8 @@ EXTRAS=	yes
 PLIST_SUB+=	MYSQL=""
 USE_MYSQL=	YES
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+LIBS+=		-L${LOCALBASE}/lib/mysql
 . if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-mysql${MYSQL_VER}
 . else
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@ -34,10 +34,10 @@ BINS=		bonus/asmutils basename cal cat chmod chown chroot cmp cp \
 LINKS=		arch cpuspeed domainname false halt inflate kldstat kldunload \
 		mkfifo more poweroff regs rmdir size sln todos umount usleep

-LIBS=		libc.so.0 libcrypto.so.0 libm.so.0
+LIBRARIES=	libc.so.0 libcrypto.so.0 libm.so.0

 PLIST_FILES=	${BINS:S/^/bin\/asmutils\//:S/bonus\///} \
-		${LINKS:S/^/bin\/asmutils\//} ${LIBS:S/^/lib\/asmutils\//}
+		${LINKS:S/^/bin\/asmutils\//} ${LIBRARIES:S/^/lib\/asmutils\//}
 PLIST_DIRS=	bin/asmutils lib/asmutils
 PORTDOCS=	*

@ -53,7 +53,7 @@ do-install:
 .for bin in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${PREFIX}/bin/asmutils
 .endfor
-.for lib in ${LIBS}
+.for lib in ${LIBRARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/${lib} ${PREFIX}/lib/asmutils
 .endfor
 	(cd ${PREFIX}/bin/asmutils && \
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@ -17,8 +17,8 @@ GNU_CONFIGURE=	yes
 USES=		gmake gettext iconv pkgconfig
 USE_LDCONFIG=	yes

-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INFO=	ccrtp

 post-patch:
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@ -29,9 +29,7 @@ USE_LDCONFIG=	yes
 USES=		compiler

 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-lexecinfo
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=LIBS="${LIBS}"
+LIBS+=		-L${LOCALBASE}/lib -lexecinfo

 .include <bsd.port.pre.mk>

--- a/devel/ifd-test/Makefile
+++ b/devel/ifd-test/Makefile
@ -15,7 +15,7 @@ LIB_DEPENDS=    pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 USES=		gmake
 NOMAN=
 PLIST_FILES=	sbin/ifdtest
-MAKE_ENV=	LIBS="-L${PREFIX}/lib -lpcsclite"
+LIBS+=		-L${LOCALBASE}/lib -lpcsclite

 post-patch:
 	${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g; \
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@ -14,8 +14,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USES=		gmake
 USE_BZIP2=	yes

--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 .include <bsd.port.mk>
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@ -18,8 +18,8 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L/usr/lib"
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 post-patch:
 	@${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--srcdir=${WRKSRC:H}

 MAKE_ENV=	DIST=${WRKSRC}/dist

-LIBS=		libnspr4.so.1 libplc4.so.1 libplds4.so.1
+LIBRARIES=	libnspr4.so.1 libplc4.so.1 libplds4.so.1

 .include <bsd.port.pre.mk>

@ -44,7 +44,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-.for lib in ${LIBS}
+.for lib in ${LIBRARIES}
 .if defined(STRIP) && ${STRIP} != ""
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
 .endif
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@ -19,8 +19,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}

 WRKSRC=		${WRKDIR}/${PORTNAME}

-USES+=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 USE_PYTHON=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
@ -39,6 +38,11 @@ post-patch:
 	${REINPLACE_CMD} -e 's|g++|${CXX}|g' ${WRKSRC}/tests/GNUmakefile
 	@${REINPLACE_CMD} -e 's|tolower|::tolower|' ${WRKSRC}/src/cc/utils_string.hh

+post-configure:
+	@(cd ${WRKSRC}/src/ctags-5.5.4 && ${SETENV} CC="${CC}" CPP="${CPP}" \
+		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		${CONFIGURE_ENV} ./configure)
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/pypersrc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/out/pypersrc.py ${STAGEDIR}${PREFIX}/bin
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@ -14,8 +14,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes

 USE_AUTOTOOLS=	libtool
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@ -14,8 +14,8 @@ OPTIONS_DEFINE=	DOCS NLS

 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USE_PERL5=	build
 USES=		iconv pathfix perl5 pkgconfig

--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@ -22,8 +22,8 @@ CONFLICTS=	joe-2.*

 USES=		gmake iconv ncurses
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}

 ALL_TARGET=	${PORTNAME}

--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@ -19,8 +19,8 @@ CONFLICTS=	joe-3*

 GNU_CONFIGURE=	yes
 USES=		iconv gmake
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}

 ALL_TARGET=	${PORTNAME}

--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@ -15,8 +15,8 @@ USE_AUTOTOOLS=	autoconf libtool
 USES=		pathfix gmake iconv pkgconfig tar:bzip2
 USE_GNOME=	eel2 gnomeprefix gtksourceview libgnomeui
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}"
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`
+LIBS+=		-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}

 GCONF_SCHEMAS=	mlview.schemas

--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@ -11,8 +11,8 @@ COMMENT=	Multiwindow mouse-based text editor for X

 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lgnuregex"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
+LIBS+=		-lgnuregex
 MAKE_JOBS_UNSAFE=	yes

 PLIST_SUB=	VERSION="${PORTVERSION}"
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@ -21,8 +21,8 @@ USES=		pkgconfig gmake
 USE_GNOME=	libxml2 glib20

 CONFIGURE_ARGS+=--without-alsa --without-joystick
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 OPTIONS_DEFINE=		AO ICONS ROMS
 OPTIONS_DEFAULT=	ICONS GTK2
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@ -19,10 +19,9 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 USES=		gettext gmake
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
-CONFIGURE_ARGS=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl"

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lintl

 WRKSRC=		${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
 SUB_FILES=	pkg-message
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@ -23,7 +23,7 @@ USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 AUTOMAKE_ARGS=	--add-missing --copy -Wno-portability
 ACLOCAL_ARGS=	# default args (--acdir=...) produce broken configure script
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LIBS=-lutil
+LIBS+=		-lutil
 USES=		gmake pkgconfig
 USE_XORG=	x11 xext xt
 NO_WRKSUBDIR=	yes
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@ -23,11 +23,11 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 USES=		iconv shebangfix

 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 # XXX FreeBSD 9.x has posix_fallocate() for OSVERSION > 900035,
 # but is missing the required POSIX_FADV_* macros
-CONFIGURE_ENV=	i_cv_posix_fallocate_works=no \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	i_cv_posix_fallocate_works=no

 PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \
 		MIRRORS NEWS README README.debug-levels README.modules \
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@ -100,8 +100,8 @@ PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATEDIR}"
 .include <bsd.port.options.mk>

 .if !defined(_BUILDING_PROFTPD_MODULE)
-CFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
-PROFTPD_LIBS+=	-lssl -lcrypto -L${OPENSSLLIB}
+CPPFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
+LIBS+=		-lssl -lcrypto -L${OPENSSLLIB}
 .endif

 .if !defined(_BUILDING_PROFTPD_MODULE)
@ -180,7 +180,7 @@ MODULES+=		mod_memcache \
 			mod_tls_memcache
 LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
 CONFIGURE_ARGS+=	--enable-memcache
-PROFTPD_LIBS+=		-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
+LIBS+=			-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
 PLIST_SUB+=	MEMCACHE=""
 .else
 CONFIGURE_ARGS+=	--disable-memcache
@ -193,7 +193,6 @@ _MODULES:=${_MODULES}:${m}
 .endfor

 # Keep this here below, in case similar constructs need to be made
-CONFIGURE_ENV+=		LIBS="${PROFTPD_LIBS}"
 CONFIGURE_ARGS+=	--with-shared=${_MODULES:C/^://g}

 .endif #!defined(_BUILDING_PROFTPD_MODULE)
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@ -16,8 +16,6 @@ PORTEXAMPLES=	USAGE.examples USAGE.resumehandling USAGE.urlhandling \
 		passwordfile wputrc

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="${LDFLAGS}"
-CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=yes

 OPTIONS_DEFINE=	TLS NLS DOCS EXAMPLES
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@ -24,8 +24,8 @@ RUN_DEPENDS=	${DATADIR}/data1/default.cfg:${PORTSDIR}/games/alienarena-data
 USES=		dos2unix gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-xf86vm \
 		--with-xf86dga

--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@ -14,11 +14,11 @@ COMMENT=	Monsters, explosions, destruction game for X Window System

 USE_BZIP2=	yes
 USE_GL=		glu
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}"

 CFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \
 		-DLINUXVERSION -DLINUXAUDIO
-LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lm
+LIBS+=		-L${LOCALBASE}/lib -lX11 -lm

 OPTIONS_DEFINE=	DOCS

--- a/games/chroma/Makefile
+++ b/games/chroma/Makefile
@ -13,9 +13,8 @@ COMMENT=	Abstract puzzle game

 USES=		tar:bzip2 gettext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lintl"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lintl

 PORTDOCS=	*
 PORTDATA=	*
--- a/games/frobtads/Makefile
+++ b/games/frobtads/Makefile
@ -19,10 +19,9 @@ CONFLICTS=	tads-2.*
 USES=		gmake
 USE_AUTOTOOLS=	automake autoconf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lcompat"

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lcompat

 pre-configure:
 	(cd ${WRKSRC}; ${SH} bootstrap)
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@ -23,8 +23,8 @@ USE_SDL=	yes
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	mk/linux/configure
-CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=		-I${LOCALBASE}/include
+LIBS+=			-L${LOCALBASE}/lib
 SUB_FILES=		glest-wrapper pkg-message

 JAM_CMD=		${LOCALBASE}/bin/jam -qa
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@ -13,8 +13,7 @@ COMMENT=	GNOME 2 game featuring a bizarre flying GNOME logo
 GNU_CONFIGURE=	yes
 USES=		pathfix gmake pkgconfig
 USE_GNOME=	gnomeprefix gnomevfs2 libgnomeui
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lm
+LIBS+=		-L${LOCALBASE}/lib -lm

 .include <bsd.port.mk>
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@ -36,11 +36,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" MKDIR_P="${MKDIR}"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS:S/"//g}|g ; \
-		 s|-pthread ||g' ${WRKSRC}/configure
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}"

 post-build:
 .if ${PORT_OPTIONS:MOPENING_BOOK}
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@ -19,9 +19,9 @@ USE_GL=		glut
 USES=		gmake perl5 tcl:84
 USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf213
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${TCL_INCLUDEDIR}
+LIBS+=		-L${LOCALBASE}/lib
 # for plib (sound):
 CONFIGURE_ARGS+=	--with-plib=${LOCALBASE}/plib

--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@ -13,8 +13,8 @@ COMMENT=	Simple Turing machine simulator for GNOME 2
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes

 PORTDOCS=	AUTHORS COPYING NEWS ChangeLog TODO README INSTALL
--- a/games/highmoon/Makefile
+++ b/games/highmoon/Makefile
@ -16,10 +16,10 @@ WRKSRC=		${WRKDIR}/HighMoon

 USES=		gmake
 USE_SDL=	image sdl
-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
+MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LIBS}"

 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
-LDFLAGS+=	`${SDL_CONFIG} --libs` -lSDL_image
+LIBS+=		`${SDL_CONFIG} --libs` -lSDL_image

 PORTDOCS=	AUTHORS NEWS README
 OPTIONS_DEFINE=	DOCS
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@ -13,7 +13,7 @@ COMMENT=	Nice clone of classical Breakout game
 USE_SDL=	sdl
 USES=		gmake
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lcompat"
+LIBS+=		-lcompat

 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@ -19,7 +19,7 @@ USE_GNOME=	gnomehack gnomeprefix gtk20 libgnome librsvg2
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@ -22,8 +22,8 @@ USE_GL=		gl glu
 BUILD_WRKSRC=	${WRKSRC}/src

 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
-LDFLAGS+=	`${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
-MAKE_ARGS=	CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
+LIBS+=		`${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
+MAKE_ARGS=	CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LIBS}"

 PLIST_FILES=	bin/sdb
 PORTDOCS=	*
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@ -15,9 +15,8 @@ LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer image

-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib

 SUB_FILES=	spacejunk

--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@ -20,11 +20,11 @@ LIB_DEPENDS=	libclan23Core.so:${PORTSDIR}/devel/clanlib \
 USES=		gmake pkgconfig
 USE_GCC=	yes
 USE_GL=		glu
-MAKE_ENV=	METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LDFLAGS}"
+MAKE_ENV=	METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LIBS}"
 MAKE_JOBS_UNSAFE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
+LIBS+=		-L${LOCALBASE}/lib -lexecinfo

 PORTDOCS=	*
 PLIST_FILES=	bin/methane
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@ -27,8 +27,6 @@ USE_XORG=	xrender xmu ice xext x11 xxf86vm xrandr
 USE_GL=		glut
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

--- a/games/trophy/Makefile
+++ b/games/trophy/Makefile
@ -17,9 +17,8 @@ LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/devel/clanlib1
 USES=		pkgconfig

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO

--- a/games/tsito/Makefile
+++ b/games/tsito/Makefile
@ -10,7 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chinese chess (Xiangqi) program

 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lcompat"
 CONFIGURE_ARGS=	--prefix="${PREFIX}"
+LIBS+=		-lcompat

 .include <bsd.port.mk>
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@ -21,9 +21,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 USES=		gmake
 USE_GL=		gl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lusbhid"
 CONFIGURE_ARGS=	--with-plib=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lusbhid

 PORTDOCS=	*

--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@ -32,12 +32,11 @@ USE_SDL=	sdl
 USE_QT4=	corelib network script gui moc_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--program-transform-name="" --with-distributor="FreeBSD ports"
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" \
-		PATH="${LOCALBASE}/bin:$$PATH" \
+CONFIGURE_ENV=	PATH="${LOCALBASE}/bin:$$PATH" \
 		CCOMPILER="${CC}" \
 		CXXCOMPILER="${CXX}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 REINPLACE_ARGS=	-i ''

 PORTDOCS=	*
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@ -16,10 +16,9 @@ USE_GNOME=	intlhack
 USES=		gettext gmake pkgconfig
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-lX11" # uses XGetWindowAttributes but doesn't link with X11

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lX11

 PORTDATA=	*
 PORTDOCS=	*
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@ -17,8 +17,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+LIBS+=		-L${LOCALBASE}/lib
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken

 NO_STAGE=	yes
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@ -20,9 +20,8 @@ USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}

 CONFIGURE_ARGS=--enable-ltdl-install=no
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		GL_LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 MAN1=	gldb.1 gldb-gui.1
 MAN3=	bugle.3
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@ -34,9 +34,8 @@ CONFIGURE_ARGS=	--disable-gudev \
 # takes ages we don't want to wait.
 CONFIGURE_ARGS+=--disable-print-profiles
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	USB_CFLAGS="-I/usr/include" \
-		USB_LIBS="-L/usr/lib -lusb"
+LIBS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV=	USB_CFLAGS=" " USB_LIBS="-lusb"
 INSTALL_TARGET=	install-strip

 GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@ -22,8 +22,8 @@ IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 USES=		gettext
 USE_GNOME=	gtk12 gdkpixbuf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-included-gettext

 PLIST_FILES=	bin/danpei \
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@ -30,10 +30,9 @@ CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo"

 USE_GL=		glew glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	"LIBS=-lboost_system"
 CONFIGURE_ARGS+=	--with-boost-filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lboost_system

 .include <bsd.port.pre.mk>

--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USES=	pathfix
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig

-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
-CFLAGS+=	-I${LOCALBASE}/include/libpng15 -I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include/libpng15 -I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@ -13,8 +13,8 @@ COMMENT=	GTK-based color picker
 PLIST_FILES=	bin/gcolor
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib

 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gimageview
 PORTVERSION=	0.2.27
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}

@ -13,15 +13,13 @@ COMMENT=	Yet another GTK+ based image viewer
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png

-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_XORG=	xinerama ice
 CONFIGURE_ARGS=	--with-gtk2
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CFLAGS+=	-DUSE_GTK2
 CPPFLAGS+=	-I${LOCALBASE}/include
-MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip

 OPTIONS_DEFINE=	SPLASH NLS LIBMNG LIBWMF LIBRSVG2 LIBEXIF MPLAYER LIBXINE IMLIB
@ -56,24 +54,12 @@ MPLAYER_CONFIGURE_ENABLE=mplayer
 MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer

 LIBXINE_CONFIGURE_WITH=	xine
-LIBXINE_LIB_DEPENDS=	xine:${PORTSDIR}/multimedia/libxine
-
-.include <bsd.port.options.mk>
+LIBXINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine

 post-patch:
-	@${REINPLACE_CMD} -e 's/DATADIRNAME=lib/DATADIRNAME=share/g' \
-		-e 's|echo aout|echo elf|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/gnome/apps/|/apps/|' \
-		${WRKSRC}/gimageview.spec \
+	@${REINPLACE_CMD} '/^desktopdir =/s|=.*|= ${DESKTOPDIR}|' \
 		${WRKSRC}/etc/Makefile.in
-	@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
-		's|= $$(DESTDIR)|= |' {} \;
-
-post-configure:
-.if ${PORT_OPTIONS:MIMLIB}
-	@${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -Ee \
-		's/^(GDK_IMLIB_(CFLAGS|LIBS) =).*$$/$${1}/'
-.endif
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|= $$(DESTDIR)|= |' -e '/^CPPFLAGS =/s/\\/@CPPFLAGS@ \\/'

 .include <bsd.port.mk>
--- a/graphics/gimageview/files/patch-ltmain.sh
+++ b/graphics/gimageview/files/patch-ltmain.sh
@ -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"
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@ -32,7 +32,7 @@ lib/gimageview/thumbnail/libgimv_nautilus_thumb.so
 lib/gimageview/thumbnail/libgimv_thumb.so
 lib/gimageview/thumbnail/libgimv_xvpics_thumb.so
 lib/gimageview/thumbnail_view/libgimv_thumbview_detail.so
-share/apps/Graphics/gimageview.desktop
+share/applications/gimageview.desktop
 share/doc/gimageview/html/ja/01.html
 share/doc/gimageview/html/ja/02.html
 share/doc/gimageview/html/ja/03.html
@ -136,5 +136,3 @@ share/pixmaps/gimv.png
@dirrm share/gimageview/pixmaps/default
@dirrm share/gimageview/pixmaps
@dirrm share/gimageview
-@dirrmtry share/apps/Graphics
-@dirrmtry share/apps
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@ -51,10 +51,9 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
 		--with-desktop-dir=${PREFIX}/share \
 		--docdir=${PREFIX}/share/doc/gimp \
 		--enable-default-binary
-CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS} \
-		LIBS=${LIBS}
+CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib

 .if !defined(GIMP_SLAVE)

--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@ -19,7 +19,7 @@ GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	28cade5

 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+LIBS+=		-L${LOCALBASE}/lib -lintl
 USES=		gettext gmake pkgconfig compiler:nestedfct
 USE_AUTOTOOLS=	aclocal automake
 AUTOMAKE_ARGS=	--add-missing
--- a/Show More
+++ b/Show More