- 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

32 files changed, 70 insertions, 69 deletions

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 1929ea73ad66..31993a2fbc3f 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -25,7 +25,7 @@ SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L
 SKKJISYOCDB?=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
 
-MAKE_ENV+=	LOCALBASE="${LOCALBASE}" CFLAGS="${CFLAGS}"
+MAKE_ENV+=	LOCALBASE="${LOCALBASE}"
 MAKE_ENV+=	SKKJISYOCDB="${SKKJISYOCDB}"
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${PORTDOCS_FILE} ${PORTDOCS_SH}
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index a20d50fcfa09..862d90cd85b9 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	ebview.desktop
 
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index ab3fe81888ed..779d28b90737 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -21,12 +21,11 @@ CONFLICTS=	ja-ebview-gtk2-*
 USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 7eb765da412d..fa4f58a5012b 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -161,7 +161,6 @@ BROKEN=		does not build
 .if ${ARCH} == "ia64"
 BROKEN=		Segfault during build on ia64
 CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 .endif
 
 pre-everything::
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 187a19ee9dee..84af29517683 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${PREFIX}/include/wnn6" \
-		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
+CFLAGS+=	-I${PREFIX}/include/wnn6
 
 DIST_SUBDIR=    esecanna
 
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index b88ab7a7aaf0..82131c6254fa 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/japanese/libicq
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --disable-nls
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile
index 406ce1b0000e..9d94c143ad58 100644
--- a/japanese/gtkicq/Makefile
+++ b/japanese/gtkicq/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --datadir=${PREFIX}/share/gtkicq
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 24d50b74e5d5..722adb032730 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -23,13 +23,12 @@ USE_GNOME=	gconf2 gnomehack gnomeprefix intlhack libglade2
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		im-ja-conf.1 im-ja-xim-server.1
 GCONF_SCHEMAS=	im-ja.schemas
 
-CPPFLAGS=	-I${LOCALBASE}/include -DNO_MALLOC_H
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DNO_MALLOC_H
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index e62a793f480c..3ab22b9178dc 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS?=	anthy.1:${PORTSDIR}/japanese/anthy
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index b2edbc2bf8a6..6772c4b78138 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -20,10 +20,9 @@ USE_GNOME=	gnomehier gtk20
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		kasumi.1
 
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index de38aa5229c9..4c2183f26049 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -19,8 +19,8 @@ USE_PERL5_BUILD=	5.8.0+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I ${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Default charset (euc-jp/shift_jis/utf-8)
 .if defined(WITH_CHARSET)
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 951351e4f6b2..aedee0055645 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -66,8 +66,7 @@ USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 7209d8bf3efe..36f9c52ace4c 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -38,7 +38,7 @@ USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index e1cffb8720d5..3eb178402f9b 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -43,7 +43,6 @@ GRAPHICS=	X11_GRAPHICS
 .if ${PKGNAMESUFFIX} == "-gnome"
 CATEGORIES+=	gnome
 USE_GNOME=	gnomelibs
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
diff --git a/japanese/php5-mecab/Makefile b/japanese/php5-mecab/Makefile
index 9113d9351e57..a3bea4893140 100644
--- a/japanese/php5-mecab/Makefile
+++ b/japanese/php5-mecab/Makefile
@@ -22,8 +22,8 @@ USE_PHP=	yes
 DEFAULT_PHP_VER=5
 USE_PHPEXT=	yes
 CONFIGURE_ARGS=	--with-mecab=${LOCALBASE}/bin/mecab-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${LIBS} ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/py-zinnia/Makefile b/japanese/py-zinnia/Makefile
index 266ed6367704..03bbdc77dcdc 100644
--- a/japanese/py-zinnia/Makefile
+++ b/japanese/py-zinnia/Makefile
@@ -28,7 +28,7 @@ PYDISTUTILS_PKGVERSION=	0.0.0
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 post-extract:
diff --git a/japanese/quit/Makefile b/japanese/quit/Makefile
index bb7d5eed4e30..f1b6d4ed5f5b 100644
--- a/japanese/quit/Makefile
+++ b/japanese/quit/Makefile
@@ -11,6 +11,6 @@ MAINTAINER=	nork@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../../games/quit
 
-CPPFLAGS=	-DJAPANESE
+CPPFLAGS+=	-DJAPANESE
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 8b04a4013fca..3d73cd3560d9 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS=	--enable-xpm-background --enable-transparency \
 		--enable-utmp --enable-wtmp \
 		--with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \
 		--with-xpm-library=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCDIR=		${PREFIX}/share/doc/ja/rxvt
 RXVTLIB=	${PREFIX}/lib/X11/rxvt
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index d87a05fc8631..8c77887f7d4b 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index d6cf17099aed..91d6e608b496 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -25,8 +25,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 86d5b9284d8e..9283246734b2 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -26,8 +26,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index cb3fb5a1fe36..a844646650e3 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -29,8 +29,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index b0682cd6c354..99393e2d1460 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${ECHO_CMD}
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 9ee2e33ad0d8..b31abae9c4cd 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -24,8 +24,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 307cce7c8984..434fd3133f51 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -24,9 +24,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" ${WRKSRC}/src/scim_skk_prefs.h
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 5100fc39c4e9..49de49a67043 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \
 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 CONFIGURE_ARGS+=	--disable-skim-support
 
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 95cff36cc1c7..f4c6d3502c7f 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -25,9 +25,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/scim-tomoe \
 		lib/scim-1.0/1.4.0/Helper/tomoe.a \
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index b55ae92a5346..be2aab1983c2 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 56cc63ef46a4..fb366b1a5eb1 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOTOOLS=	autoconf213
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared
-CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg-install.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg-deinstall.tclsh
 
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 5997d3c75384..47ebbecbf0c4 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -36,8 +36,8 @@ USE_AUTOTOOLS=	autoconf213
 USE_XORG=	x11
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
 	--enable-xlibHack --enable-onTheSpot
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 RANLIB=		ranlib
 USE_LDCONFIG=	yes
 
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 4e673bea166e..0c82a74243cc 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -106,12 +106,12 @@ CONFIGURE_ARGS+=--disable-unihan
 PLIST_SUB+=	UNIHAN="@comment "
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
-		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
-		PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
 		pyexecdir=${PYTHON_SITELIBDIR} \
 		GMSGFMT="${LOCALBASE}/bin/msgfmt"
+CFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
 
 .if defined(WITH_UNIHAN)
 post-extract:
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 4dc3dbb7bf73..5c3c1c82ce0c 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -54,8 +54,8 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
-		XDEFS='-DMFMODE=\"${MF_MODE}\"' \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		XDEFS='-DMFMODE=\"${MF_MODE}\"'
+CFLAGS+=	-I${LOCALBASE}/include
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 PATCH_STRIP=	-p1