- 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

7 files changed, 14 insertions, 14 deletions

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 05f6fd62f43b..f2af6dd6aafc 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -27,8 +27,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index 5e0222a67630..f73ae67d5c7e 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -24,8 +24,8 @@ USE_ICONV=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
 			--enable-256-color --enable-chat --enable-now-chat
-CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
-			CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		hanterm.1
 
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index ea701746b495..fab7db5d59a9 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index eb85e47b0383..585d5d81ded1 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index d158eaf515b7..5e140a329dba 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index 7ba7980ae24c..5a7eeabc9d12 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index fd3a652c0f1b..d1beacd6f8cb 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls