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)
svn path=/head/; revision=326316
2025-07-18 17:59:20 -04:00 · 2013-09-04 20:01:05 +00:00 · 2013-09-04 20:01:05 +00:00 · 9f7e7e1326 · 2021-03-31 03:12:20 +00:00
commit 9f7e7e1326
parent 4b842875ea
63 changed files with 75 additions and 83 deletions
--- 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
--- 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}"

--- 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
--- 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"
--- 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=	*
--- 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

--- 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 \
--- 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
--- 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+
--- 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
--- 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>
--- 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
--- 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>

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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}

--- 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
--- 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"
--- 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++/
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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
--- 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}
--- 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}
--- 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
--- 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}
--- 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} \
--- 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

--- 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
--- 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)
--- 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

--- 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}
--- 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
--- 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
--- 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
--- 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
--- 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}

--- 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}
--- 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

--- 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
--- 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
--- 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
--- 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}
--- 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

 #
--- 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}

--- 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