Introduce ICONV_CONFIGURE_ARG variable defined at Uses/iconv.mk.

It's value is "--with-libiconv-prefix=/usr/local" for systems
before 100043 with ports libiconv and to use at systems post
100043 with base iconv it's value is "" (NULL).

Co-authors:	bapt, madpilot and bsam (me)

63 files changed, 75 insertions, 83 deletions

diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index d974c4029223..facf45cc739d 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -30,8 +30,8 @@ VIDMODE_DESC=	Support VIDMODE for changing colors (NVIDIA)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+USES+=		gettext iconv
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
                 --with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .else
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index b055bfe99c61..58084fb65e8a 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -17,10 +17,10 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
 
 PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
 
-USES=		pkgconfig
+USES=		iconv pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
 
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 9361fc58b5d9..c6b16fa5288d 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -45,7 +45,7 @@ NONE_DESC=	No GUI support
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+= \
 	--enable-nls \
-	--with-libiconv-prefix=${LOCALBASE} \
+	${ICONV_CONFIGURE_ARG} \
 	--with-libintl-prefix=${LOCALBASE}
 USES+=		gettext iconv
 .for L in fr nl ru
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 2175a470e2dd..bddbd8dadd7b 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -17,7 +17,7 @@ USES=		gettext iconv perl5
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE}
+		${ICONV_CONFIGURE_ARG}
 USE_LDCONFIG=	yes
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index f71492ce566e..bf5954eb3e43 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	libiodbc-[0-9]*
 USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static --enable-shared \
-		--with-libiconv-prefix=${LOCALBASE}
+		${ICONV_CONFIGURE_ARG}
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index d5bcf994c163..7b1797c3b8b8 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
 USES=		bison iconv gmake pkgconfig
 
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 
 MAN1=		tpb.1
 
diff --git a/devel/cross-gcc/Makefile b/devel/cross-gcc/Makefile
index dc9200a14d1f..6ded5fdc7cfb 100644
--- a/devel/cross-gcc/Makefile
+++ b/devel/cross-gcc/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS?=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison
+USES=		bison iconv
 STRIP=		#empty
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all info
@@ -61,7 +61,7 @@ CONFIGURE_ARGS=	--target=${OURTARGET} \
 		--datadir="${TGT_DATADIR}" \
 		--with-system-zlib \
 		--disable-nls \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--without-included_gettext \
 		--with-newlib \
 		--with-dwarf2 \
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index d320dfd6df31..a9dc9821bb02 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--without-libunwind-ia64 \
 		--enable-targets=all
 CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 1d91e5dd5a4d..4d98b082dd1f 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--enable-target=all \
-		--enable-tui
+		--enable-tui ${ICONV_CONFIGURE_ARG}
 CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
 CFLAGS+=	-DRL_NO_COMPAT
 EXCLUDE=	dejagnu expect readline sim texinfo intl
@@ -38,10 +38,6 @@ MAN1=	gdb${VER}.1
 
 .include <bsd.port.options.mk>
 
-.if empty(ICONV_LIB)
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
-.endif
-
 .if ${PORT_OPTIONS:MINSIGHT}
 PKGNAMESUFFIX=	-insight
 USE_TK=	84+
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 8c0a42640025..15ac57ec7877 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -24,8 +24,8 @@ OPTIONS_DEFINE=	NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+USES+=		gettext iconv
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .else
diff --git a/devel/libhtp/Makefile b/devel/libhtp/Makefile
index bf619530164f..901042dc8844 100644
--- a/devel/libhtp/Makefile
+++ b/devel/libhtp/Makefile
@@ -18,17 +18,12 @@ ACLOCAL_ARGS=	-Im4
 USE_LDCONFIG=	yes
 USES=		pkgconfig pathfix iconv
 
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
 		${ICONV_LIB}
 
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -Ee 's,^(pkgconfigdir = ).*,\1$$(exec_prefix)/libdata/pkgconfig,' ${WRKSRC}/Makefile.am
 	@cd ${WRKSRC} && ${SH} ./autogen.sh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index a8d8dd315edc..b3e9515f1a97 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -61,7 +61,7 @@ CONFIGURE_ARGS=	--disable-nls --target=${GCC_TARG} \
 		--enable-libstdcxx-debug \
 		--disable-build-poststage1-with-cxx \
 		--enable-version-specific-runtime-libs \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--includedir=${PREFIX}/${GCC_TARG}/include \
 		--datadir=${PREFIX}/${GCC_TARG}/share \
 		--with-system-zlib
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index 2b411f7b9bc1..05f8b314aee6 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -14,7 +14,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USES=		iconv
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index ec2609b6618e..82f7d533535d 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-languages=c,c++ \
 		--enable-lto \
 		--with-gmp=${LOCALBASE} --with-mpfr=${LOCALBASE} \
-		--with-mpc=${LOCALBASE} --with-libiconv-prefix=${LOCALBASE} \
+		--with-mpc=${LOCALBASE} ${ICONV_CONFIGURE_ARG} \
 		--with-system-zlib --disable-nls \
 		--with-pkgversion="MSPGCC_${LTSVERSION}"
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 8d48c0653218..e99abf6b779c 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://rpm5.org/files/popt/
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	A getopt(3) like library with a number of enhancements, from Redhat
 
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--program-prefix=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index 825cee580c68..2b8890cbe4ac 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -19,8 +19,8 @@ MAN1=		ssed.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+USES+=		gettext iconv
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 200e537eaa4e..c8dc3b9ccbc5 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -39,7 +39,7 @@ PLIST_SUB+=	SO_EXT=""
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
-CONFIGURE_ARGS+=	--with-iconv --with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-iconv ${ICONV_CONFIGURE_ARG}
 PLIST_SUB+=	ICONV=""
 .else
 CONFIGURE_ARGS+=	--without-iconv --without-locale
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index c224753188a3..cd3d8201db24 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -53,7 +53,7 @@ PLIST_SUB+=	SO_EXT=""
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
-CONFIGURE_ARGS+=	--with-iconv --with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-iconv ${ICONV_CONFIGURE_ARG}
 PLIST_SUB+=	ICONV=""
 .else
 BROKEN=		Does not build if ICONV support is disabled
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index b2797864451b..a14950c40013 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--without-ssl
 USES+=		gettext iconv
 CONFIGURE_ARGS+=	--enable-nls \
 			--with-libintl-prefix=${LOCALBASE} \
-			--with-libiconv-prefix=${LOCALBASE}
+			${ICONV_CONFIGURE_ARG}
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls --without-libiconv-prefix
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 62d3c78bcec6..22f71146e910 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -38,7 +38,7 @@ MAN8=		wzdftpd.8
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .else
 CONFIGURE_ARGS+=	--disable-utf8
 .endif
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 1fe685e602df..87d11e62f39b 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Free turn-based multiplayer strategy
 
 RUN_DEPENDS=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
 
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake iconv pkgconfig
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-libiconv-prefix=${PREFIX} --program-transform-name=
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --program-transform-name=
 
 MAN6=		freeciv-server.6 freeciv-client.6 \
 		freeciv-xaw.6 freeciv-sdl.6 freeciv-gtk2.6 \
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 9e3bef8eba1b..ced1ee665d5b 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -16,6 +16,6 @@ USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix gnomelibs gdkpixbuf
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-libiconv-prefix=${LOCALBASE}"
+CONFIGURE_ARGS=	"${ICONV_CONFIGURE_ARG}"
 
 .include <bsd.port.mk>
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 09b1603821b9..5922649ea721 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -44,7 +44,7 @@ GNU_CONFIGURE_ARGS+=	--with-fontconfig=no
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
-GNU_CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+GNU_CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .else
 GNU_CONFIGURE_ARGS+=	--without-libiconv
 GNU_CONFIGURE_ARGS+=	--with-libiconv-prefix=no
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index cd507a83300c..426f8776717e 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=--with-hdf5=no
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
 USES+=		iconv
 .else
 CONFIGURE_ARGS+=--with-libiconv-prefix=no
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 11b0e3197e14..3bdf4edb195a 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 
 .if !defined(WITHOUT_JAPANESE_UTF8)
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
 		--enable-japanese-utf8
 .else
 CONFIGURE_ARGS+=--disable-japanese-utf8
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 1f3bc936a748..7b2ef2877fda 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -41,7 +41,7 @@ COLOR_STYLE_DESC=	Enable color style (ncurses/curses)
 DEFAULT_COLORS_DESC=	Enable default colors (ncurses/slang)
 
 JAPANESE_UTF8_USES=		iconv
-JAPANESE_UTF8_CONFIGURE_ON=	--with-libiconv-prefix=${LOCALBASE}
+JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
 COLOR_STYLE_CONFIGURE_ENABLE=	color-style
 DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index b08f7e948c0b..9763504a5d4f 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -65,7 +65,7 @@ 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"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--with-ssl \
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index a01d1ec07ac4..66f27a3b7373 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -18,7 +18,8 @@ INFO=		gawk gawkinet
 
 USE_XZ=		true
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+USES=		iconv
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE} \
 		AWK=${AWK}
 
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 39ac24f969c8..465dba79e8e1 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -197,7 +197,7 @@ ADA_CONFIG_ARGS+=	--with-system-zlib
 ADA_CONFIG_ARGS+=	--with-gmp=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpfr=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpc=${PREFIX}
-ADA_CONFIG_ARGS+=	--with-libiconv-prefix=${PREFIX}
+ADA_CONFIG_ARGS+=	${ICONV_CONFIGURE_ARG}
 ADA_CONFIG_ARGS+=	--enable-shared
 ADA_CONFIG_ARGS+=	--enable-threads=posix
 ADA_CONFIG_ARGS+=	--disable-bootstrap
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index f86a6e6513cf..67e1d866a8c9 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index ec6f6ae83cc1..64faa44d86c8 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -46,7 +46,7 @@ TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 6e50c2af75d6..6fd6d1f8d414 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=--disable-bootstrap \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=/usr/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 85228e9159b0..7c701064e7a8 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--disable-bootstrap \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 623bcb92391b..45c0acc325bc 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 4b5852bfb834..0db23c296bdb 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -77,7 +77,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 64c497bac842..4a7327aa8ceb 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -77,7 +77,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 17bd1e6d4a35..314253f06a17 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -77,7 +77,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
diff --git a/lang/gnat-aux/Makefile b/lang/gnat-aux/Makefile
index 80136a37356a..a30042f0efbf 100644
--- a/lang/gnat-aux/Makefile
+++ b/lang/gnat-aux/Makefile
@@ -170,7 +170,7 @@ CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-gmp=${PKG_PREFIX}
 CONFIGURE_ARGS+=	--with-mpfr=${PKG_PREFIX}
 CONFIGURE_ARGS+=	--with-mpc=${PKG_PREFIX}
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${PKG_PREFIX}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--disable-bootstrap
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index e2429122eb22..27822a77abcd 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS=		--enable-languages="c,ada" \
 			--program-prefix=gnat \
 			--disable-nls \
 			--with-system-zlib \
-			--with-libiconv-prefix=${LOCALBASE} \
+			${ICONV_CONFIGURE_ARG} \
 			--libdir=${targlib} \
 			--libexecdir=${targlibexec} \
 			--disable-libada
diff --git a/lang/gnatdroid-armv5/Makefile b/lang/gnatdroid-armv5/Makefile
index 87b22c34127a..a5b473b8b982 100644
--- a/lang/gnatdroid-armv5/Makefile
+++ b/lang/gnatdroid-armv5/Makefile
@@ -109,7 +109,7 @@ CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpfr=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpc=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 CONFIGURE_ARGS+=	--with-sysroot=${SRPREFIX}
 CONFIGURE_ARGS+=	--with-float=soft
 CONFIGURE_ARGS+=	--with-fpu=${FPU}
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index 8fc4db2bf6da..133905ff62e7 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -109,7 +109,7 @@ CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpfr=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpc=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 CONFIGURE_ARGS+=	--with-sysroot=${SRPREFIX}
 CONFIGURE_ARGS+=	--with-float=soft
 CONFIGURE_ARGS+=	--with-fpu=${FPU}
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 879e250f1c12..dbf6790dea54 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -244,7 +244,7 @@ CONFIGURE_ARGS+=	--enable-locales-fix
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=			iconv
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .else
 CONFIGURE_ARGS+=	--disable-iconv
 .endif
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 488e77742f34..2096893ade33 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -123,7 +123,7 @@ PLIST_SUB+=	NLS="@comment "
 .if ! ${PORT_OPTIONS:MMUTT_ICONV} && ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-iconv
 .else
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .endif
 .if ${PORT_OPTIONS:MSLANG}
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 957cc27b7dfa..c68ce0ed9524 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -53,7 +53,7 @@ CACHEOWNER?=	bin
 
 USE_PERL5=	YES
 USE_BZIP2=	YES
-USES=		gettext
+USES=		gettext iconv
 USE_GMAKE=	YES
 USE_RC_SUBR=	sqwebmail-sqwebmaild
 GNU_CONFIGURE=	yes
@@ -65,7 +65,7 @@ CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		--enable-imageurl=/${IMAGEURL} \
 		--with-locking-method=fcntl \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--cache-file=${WRKDIR}/sqwebmail.cache
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index bf9d65a78b19..ed92ba70addf 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -28,7 +28,7 @@ USE_LDCONFIG=		yes
 
 CONFIGURE_ARGS =	--with-extractor=${LOCALBASE} \
 			--with-gnunet=${LOCALBASE} \
-			--with-libiconv-prefix=${LOCALBASE}
+			${ICONV_CONFIGURE_ARG}
 
 MAN1=	gnunet-fs-gtk.1
 
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 8ecbb371101a..440b2d941888 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -27,7 +27,7 @@ ALL_TARGET=	opt
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
 CONFIGURE_ENV+=	NEWCXX="${CXX}" \
 		PTHREAD_LIBS="-pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 992757f29acc..e16212ac193a 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-ipv6
 
 .if defined(WITH_ICONV)
 USES+=		iconv
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .endif
 
 .if defined(WITH_RDESKTOP_DEBUG)
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 15747edb5644..2362cb0cf1e4 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -19,7 +19,7 @@ USES=		iconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-ipv6 --disable-inews --with-slrnpull \
-			--with-libiconv-prefix=${LOCALBASE}
+			${ICONV_CONFIGURE_ARG}
 
 ALL_TARGET=	all
 
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 89034ed01608..552b8cc8fc87 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--with-nntp-default-server=news \
 		--with-pcre=yes \
 		--with-screen=${TIN_SCREEN} \
 		--enable-break-long-lines \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-mime-default-charset=US-ASCII \
 		--enable-ipv6
 MAKE_ARGS+=	MAKE=${GMAKE}
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index beefe9647469..6ada5c04af63 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USES=		pathfix iconv pkgconfig
-CONFIGURE_ARGS+=	--with-libiconv-prefix="${LOCALBASE}" \
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} \
 			--enable-dccm-file-support=no \
 			--enable-hal-support=yes \
 			--enable-odccm-support=no
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 3dc1e04612a8..ebeac82c0563 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	lyx-1.[0-9]*
 MAJOR_VERSION=	2.0
 MINOR_VERSION=	6
 
-USES=		gmake pkgconfig
+USES=		gmake iconv pkgconfig
 USE_XZ=		yes
 USE_QT4=	corelib gui moc_build uic_build rcc_build
 USE_GNOME=	desktopfileutils
@@ -34,7 +34,7 @@ CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--without-included-boost \
 		--without-included-mythes \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-extra-prefix=${LOCALBASE}
 
 MAN1=		lyx.1 lyxclient.1 tex2lyx.1
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index caf14020db55..e68c7a6b1057 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext iconv
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .else
diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
index 4fafb5f3cf2c..7047f35abde3 100644
--- a/security/pam_krb5-rh/Makefile
+++ b/security/pam_krb5-rh/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	pam_krb5-4.*
 
 USES=		iconv
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} --without-afs \
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} --without-afs \
 		--with-libintl-prefix=${LOCALBASE} --with-krb4=no \
 		--without-keyutils
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 65089d7763ce..03d5fe64c97c 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	upnp.9:${PORTSDIR}/devel/upnp
 PLIST_FILES=	bin/${PORTNAME}
 GNU_CONFIGURE=	yes
 USES=		fuse iconv:build pkgconfig
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-fuse-prefix=${LOCALBASE} \
 		--with-external-libupnp --with-libupnp-prefix=${LOCALBASE}
 
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index d280eb2b6ae9..3868ba673408 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig iconv ncurses
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
 USE_PERL5_BUILD=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index ffc23df04f5b..c87e23ed8a62 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -20,7 +20,7 @@ NONROOT_DESC=	Use xcdroast w/o being root
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 
@@ -29,7 +29,7 @@ CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 
 CONFIGURE_ARGS=	--with-cdrtools-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE}
+		${ICONV_CONFIGURE_ARG}
 
 MAN1=		xcdroast.1
 
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 94f9c1c1af67..7aff265a7293 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-USES=        pathfix gettext
+USES=		gettext iconv pathfix 
 USE_GNOME=	bonobo gnomelibs gnomeprefix libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}"
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 
 USE_WEBPLUGINS=	native
 WEBPLUGINS_DIR=	${PREFIX}/lib/gxmlviewer/plugins
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 1daa5dab6f8b..adceadc04327 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Improved spell-checker for Hungarian and other languages
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-CONFIGURE_ARGS=	--disable-nls --with-libiconv-prefix=${LOCALBASE} --with-readline --with-ui
+CONFIGURE_ARGS=	--disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui
 GNU_CONFIGURE=	yes
 USES=		pathfix iconv ncurses readline
 USE_LDCONFIG=	yes
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 62d89d38763e..381e9aec65ae 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -17,7 +17,7 @@ USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libxml-prefix=${LOCALBASE} \
 		--with-libxslt-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--disable-static-libs
 
 MAN1=		xmlstarlet.1
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 687ee0dd4d2c..8bc418f3bdc2 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -49,7 +49,7 @@ post-install:
 
 .if ${PORT_OPTIONS:MNLS}
 USES=		gettext iconv
-CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE}
 LANGS=en@quot es it
 .for lang in ${LANGS}
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 4de52607d229..119cb9cc71f3 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -191,7 +191,7 @@ CONFIGURE_ARGS+=	--disable-sm-scripting --without-spidermonkey
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=			iconv
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 .endif
 
 #
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 2fe4cdeb3f57..aa8f11c793ee 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	--with-zlib --libdir="${L_LIB}" \
 		--enable-idna \
 		--enable-ipv6 \
 		--with-mime-libdir=${PREFIX}/etc \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-screen=ncursesw \
 		--with-ssl=${OPENSSLBASE}
 
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 8303d6bdbc49..ddaa43edbdfe 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS='@comment '
 .else
 USES+=		gettext iconv
-CONFIGURE_ARGS+=--enable-nls --with-libiconv-prefix="${LOCALBASE}"
+CONFIGURE_ARGS+=--enable-nls ${ICONV_CONFIGURE_ARG}
 PLIST_SUB+=	NLS=''
 .endif