- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)

- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:		157936
Submitted by:	myself
Exp-runs by:	pav
Approved by:	pav

16 files changed, 30 insertions, 37 deletions

diff --git a/irc/bip/Makefile b/irc/bip/Makefile
index dea1bec32973..583c052cf902 100644
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A simple IRC proxy with SSL support
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 INSTALL_TARGET=	SUBDIR=src install-exec
 
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index c185e1833afe..0d00cbf409ed 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS}" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		BitchX.1
 
diff --git a/irc/bobot++/Makefile b/irc/bobot++/Makefile
index 30002e1fb571..9bf6dcea42b3 100644
--- a/irc/bobot++/Makefile
+++ b/irc/bobot++/Makefile
@@ -20,15 +20,14 @@ LICENSE_COMB=	dual
 OPTIONS=	GUILE "Use Guile scripts" on
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 INFO=		bobot++
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index 0c72b19b81c1..0a4efd4c1e93 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -22,13 +22,12 @@ USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ctrlproxy.1
 MAN5=		ctrlproxy_config.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1
diff --git a/irc/dcc/Makefile b/irc/dcc/Makefile
index e6f77345d66b..51612043a319 100644
--- a/irc/dcc/Makefile
+++ b/irc/dcc/Makefile
@@ -22,9 +22,8 @@ COMMENT=	DCC support program for irchat-pj
 USE_BZIP2=	yes
 PLIST_FILES=	bin/dcc
 ALL_TARGET=	dcc
-LDFLAGS=	${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS} -DUSE_PTHREAD -DENABLE_PTHREAD_ATTR
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dcc ${PREFIX}/bin
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 4a86b2c2d66c..ef3ae74263ea 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -21,14 +21,13 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-kde
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		lostirc.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/irc/miau/Makefile b/irc/miau/Makefile
index 530cf40a43cd..b775d38bbe70 100644
--- a/irc/miau/Makefile
+++ b/irc/miau/Makefile
@@ -32,9 +32,8 @@ CONFIGURE_ARGS=		--enable-dccbounce \
 			--enable-empty-awaymsg \
 			--enable-dumpstatus \
 			--disable-dependency-tracking
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
+CONFIGURE_ENV=		LIBS="${LIBS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .if defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
index d16fc607f13a..3c4e6f8bde1f 100644
--- a/irc/netwalker-ircc/Makefile
+++ b/irc/netwalker-ircc/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv2
 
 MAN1=		netwalker.1
 
-LDFLAGS=	-lncurses ${PTHREAD_LIBS}
+LDFLAGS+=	-lncurses ${PTHREAD_LIBS}
 CFLAGS?=	-O2 -Wall
 
 post-patch:
diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
index 6195c29f292f..52893180d123 100644
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -20,8 +20,8 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	ngircd
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN5=		ngircd.conf.5
 MAN8=		ngircd.8
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 455ed94a4a92..9625a3c35bfa 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -33,8 +33,8 @@ SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
 
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--prefix=${PREFIX}		\
 		--sysconfdir=${PREFIX}/etc/	\
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index f94b2328ccc5..41a09da76a9b 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -38,7 +38,6 @@ SUB_LIST+=	RUNDIR=${RUNDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	${CPPFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-listen=5 \
 		--with-dpath=${CONFIGDIR} \
 		--with-spath=${PREFIX}/libexec/ircd \
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 891a9e761603..852d5542d40f 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -25,7 +25,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 CCFLAGS+=	-Wall -O2 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	CCFLAGS="${CCFLAGS}"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	lib/xchat/plugins/xfish.so
 PORTDOCS=	FiSH-xchat.txt \
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 7bd3af38a661..f7403a119c5a 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -26,8 +26,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui gnomedocutils desktopfileutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--disable-tcl
 GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
 INSTALLS_ICONS=	yes
@@ -70,10 +70,10 @@ PLIST_SUB+=		PYTHON="@comment "
 .if defined(WITH_TCL)
 LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
 CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.3" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${LOCALBASE}/lib/tcl8.3"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.3
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 73b70d1b7862..a1a5f7f9c763 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-ipv6
 WANT_PERL=	yes
 
@@ -103,10 +103,10 @@ PLIST_SUB+=	PYTHON="@comment "
 USE_TCL=	84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${TCL_INCLUDEDIR}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${TCL_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${TCL_INCLUDEDIR}
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 4af03959bfac..5d2bf6d573bc 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=		gtk12
 WANT_GNOME=		yes
 GNU_CONFIGURE=		yes
 # Assign with `+=' for slave ports
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--without-included-gettext \
 			--enable-nls \
 			--enable-ipv6 \
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index bd07c05fa9f2..f48e49969866 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -94,7 +94,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .if defined(WITH_SASL)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		SASL=""
 .else
 PLIST_SUB+=		SASL="@comment "