- 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

8 files changed, 8 insertions, 13 deletions

diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index fb66ad334424..2d4c0ea24268 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnome
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 7a75eed3fb47..8643c2af4288 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gpilot-install-file.1
 GCONF_SCHEMAS=	pilot.schemas
diff --git a/palm/jpilot-picsnvideos/Makefile b/palm/jpilot-picsnvideos/Makefile
index 6ceb558af0a5..93ac5151c354 100644
--- a/palm/jpilot-picsnvideos/Makefile
+++ b/palm/jpilot-picsnvideos/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
 PORTDOCS=	README AUTHORS
 PLIST_FILES=	lib/jpilot/plugins/libpicsnvideos.la	\
 		lib/jpilot/plugins/libpicsnvideos.so
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index d58a7eaa7f78..7356788733f7 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehier
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
 LICENSE=	GPLv2
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 7c697483cf6d..f3e70de5ecf5 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -23,7 +23,6 @@ USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${WRKSRC}/popt -I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE}  --with-included-popt --enable-conduits --enable-xsltproc
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS:S/-Werror//}" # clear -Werror from CFLAGS
 USE_LDCONFIG=	yes
 
 OPTIONS=	PNG "build with png support" off \
@@ -43,7 +42,7 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 . endif
 CONFIGURE_ARGS+=--enable-libusb
-CONFIGURE_ENV+=LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -lusb"
+LDFLAGS+=	-L${PREFIX}/lib -lusb
 
 .if defined(WITHOUT_THREADS)
 IGNORE=		cannot be built: USB support requires THREADS turned on.  Please reconfigure using 'make config'
diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index 09d0e8b6cf28..f33c9bbc2d03 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	PPM to Pilot bitmap converter
 
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
 
 post-patch:
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index a60fe3d890f5..e93977d8a12b 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -26,8 +26,6 @@ USE_GNOME=	gnomeprefix gnomehack gvfs
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 GVFS_PORTDIR=	${PORTSDIR}/devel/gvfs
 GVFS_WRKSRC_CMD=cd ${GVFS_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 3603230d8619..e381f8759755 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -31,8 +31,6 @@ INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
 MAN1=		${PORTNAME}.1