svn commit: r326316 - in head: accessibility/redshift audio/bmp-flac cad/pcb databases/namazu2 databases/unixODBC deskutils/tpb devel/cross-gcc devel/gdb devel/gdb66 devel/gmake devel/libhtp devel/...
Boris Samorodov
bsam at FreeBSD.org
Wed Sep 4 20:01:20 UTC 2013
Author: bsam
Date: Wed Sep 4 20:01:05 2013
New Revision: 326316
URL: http://svnweb.freebsd.org/changeset/ports/326316
Log:
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)
Modified:
head/accessibility/redshift/Makefile
head/audio/bmp-flac/Makefile
head/cad/pcb/Makefile
head/databases/namazu2/Makefile
head/databases/unixODBC/Makefile
head/deskutils/tpb/Makefile
head/devel/cross-gcc/Makefile
head/devel/gdb/Makefile
head/devel/gdb66/Makefile
head/devel/gmake/Makefile
head/devel/libhtp/Makefile
head/devel/mingw32-gcc/Makefile
head/devel/motor/Makefile
head/devel/msp430-gcc/Makefile
head/devel/popt/Makefile
head/editors/ssed/Makefile
head/editors/vile/Makefile
head/editors/xvile/Makefile
head/ftp/wput/Makefile
head/ftp/wzdftpd/Makefile
head/games/freeciv/Makefile
head/games/gnmm/Makefile
head/graphics/gd/Makefile
head/graphics/gdal/Makefile
head/japanese/lynx-current/Makefile
head/japanese/lynx/Makefile
head/japanese/mutt-devel/Makefile
head/lang/gawk/Makefile
head/lang/gcc-aux/Makefile
head/lang/gcc/Makefile
head/lang/gcc34/Makefile
head/lang/gcc42/Makefile
head/lang/gcc44/Makefile
head/lang/gcc46/Makefile
head/lang/gcc47/Makefile
head/lang/gcc48/Makefile
head/lang/gcc49/Makefile
head/lang/gnat-aux/Makefile
head/lang/gnat/Makefile
head/lang/gnatdroid-armv5/Makefile
head/lang/gnatdroid-armv7/Makefile
head/mail/mutt/Makefile
head/mail/mutt14/Makefile
head/mail/sqwebmail/Makefile
head/net-p2p/gnunet-gtk/Makefile
head/net-p2p/mldonkey/Makefile
head/net/rdesktop/Makefile
head/news/slrn/Makefile
head/news/tin/Makefile
head/palm/synce-libsynce/Makefile
head/print/lyx/Makefile
head/security/libgpg-error/Makefile
head/security/pam_krb5-rh/Makefile
head/sysutils/djmount/Makefile
head/sysutils/libcdio/Makefile
head/sysutils/xcdroast/Makefile
head/textproc/gxmlviewer/Makefile
head/textproc/hunspell/Makefile
head/textproc/xmlstarlet/Makefile
head/www/cadaver/Makefile
head/www/elinks/Makefile
head/www/lynx-current/Makefile
head/www/lynx/Makefile
Modified: head/accessibility/redshift/Makefile
==============================================================================
--- head/accessibility/redshift/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/accessibility/redshift/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -30,8 +30,8 @@ VIDMODE_DESC= Support VIDMODE for changi
.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
Modified: head/audio/bmp-flac/Makefile
==============================================================================
--- head/audio/bmp-flac/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/audio/bmp-flac/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -17,10 +17,10 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimed
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}"
Modified: head/cad/pcb/Makefile
==============================================================================
--- head/cad/pcb/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/cad/pcb/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/databases/namazu2/Makefile
==============================================================================
--- head/databases/namazu2/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/databases/namazu2/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/databases/unixODBC/Makefile
==============================================================================
--- head/databases/unixODBC/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/databases/unixODBC/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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= *
Modified: head/deskutils/tpb/Makefile
==============================================================================
--- head/deskutils/tpb/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/deskutils/tpb/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/devel/cross-gcc/Makefile
==============================================================================
--- head/devel/cross-gcc/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/cross-gcc/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -29,7 +29,7 @@ RUN_DEPENDS?= ${OURTARGET}-as:${PORTSDIR
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 \
Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/gdb/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/devel/gdb66/Makefile
==============================================================================
--- head/devel/gdb66/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/gdb66/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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+
Modified: head/devel/gmake/Makefile
==============================================================================
--- head/devel/gmake/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/gmake/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/devel/libhtp/Makefile
==============================================================================
--- head/devel/libhtp/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/libhtp/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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>
Modified: head/devel/mingw32-gcc/Makefile
==============================================================================
--- head/devel/mingw32-gcc/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/mingw32-gcc/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -61,7 +61,7 @@ CONFIGURE_ARGS= --disable-nls --target=$
--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
Modified: head/devel/motor/Makefile
==============================================================================
--- head/devel/motor/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/motor/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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>
Modified: head/devel/msp430-gcc/Makefile
==============================================================================
--- head/devel/msp430-gcc/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/msp430-gcc/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX
--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
Modified: head/devel/popt/Makefile
==============================================================================
--- head/devel/popt/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/devel/popt/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -9,7 +9,7 @@ MASTER_SITES= http://rpm5.org/files/popt
MAINTAINER= jpaetzel at 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
Modified: head/editors/ssed/Makefile
==============================================================================
--- head/editors/ssed/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/editors/ssed/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/editors/vile/Makefile
==============================================================================
--- head/editors/vile/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/editors/vile/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/editors/xvile/Makefile
==============================================================================
--- head/editors/xvile/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/editors/xvile/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/ftp/wput/Makefile
==============================================================================
--- head/ftp/wput/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/ftp/wput/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/ftp/wzdftpd/Makefile
==============================================================================
--- head/ftp/wzdftpd/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/ftp/wzdftpd/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/games/freeciv/Makefile
==============================================================================
--- head/games/freeciv/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/games/freeciv/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -11,12 +11,12 @@ COMMENT= Free turn-based multiplayer str
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 \
Modified: head/games/gnmm/Makefile
==============================================================================
--- head/games/gnmm/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/games/gnmm/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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>
Modified: head/graphics/gd/Makefile
==============================================================================
--- head/graphics/gd/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/graphics/gd/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -44,7 +44,7 @@ GNU_CONFIGURE_ARGS+= --with-fontconfig=n
.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
Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/graphics/gdal/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/japanese/lynx-current/Makefile
==============================================================================
--- head/japanese/lynx-current/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/japanese/lynx-current/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --
.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
Modified: head/japanese/lynx/Makefile
==============================================================================
--- head/japanese/lynx/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/japanese/lynx/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -41,7 +41,7 @@ COLOR_STYLE_DESC= Enable color style (nc
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
Modified: head/japanese/mutt-devel/Makefile
==============================================================================
--- head/japanese/mutt-devel/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/japanese/mutt-devel/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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 \
Modified: head/lang/gawk/Makefile
==============================================================================
--- head/lang/gawk/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gawk/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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}
Modified: head/lang/gcc-aux/Makefile
==============================================================================
--- head/lang/gcc-aux/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc-aux/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc34/Makefile
==============================================================================
--- head/lang/gcc34/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc34/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -46,7 +46,7 @@ TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_T
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++/
Modified: head/lang/gcc42/Makefile
==============================================================================
--- head/lang/gcc42/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc42/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc44/Makefile
==============================================================================
--- head/lang/gcc44/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc44/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc46/Makefile
==============================================================================
--- head/lang/gcc46/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc46/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc47/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc48/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gcc49/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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"
Modified: head/lang/gnat-aux/Makefile
==============================================================================
--- head/lang/gnat-aux/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gnat-aux/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/lang/gnat/Makefile
==============================================================================
--- head/lang/gnat/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gnat/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS= --enable-languages="c,a
--program-prefix=gnat \
--disable-nls \
--with-system-zlib \
- --with-libiconv-prefix=${LOCALBASE} \
+ ${ICONV_CONFIGURE_ARG} \
--libdir=${targlib} \
--libexecdir=${targlibexec} \
--disable-libada
Modified: head/lang/gnatdroid-armv5/Makefile
==============================================================================
--- head/lang/gnatdroid-armv5/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gnatdroid-armv5/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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}
Modified: head/lang/gnatdroid-armv7/Makefile
==============================================================================
--- head/lang/gnatdroid-armv7/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/lang/gnatdroid-armv7/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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}
Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/mail/mutt/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/mail/mutt14/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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}
Modified: head/mail/sqwebmail/Makefile
==============================================================================
--- head/mail/sqwebmail/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/mail/sqwebmail/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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=${PRE
--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} \
Modified: head/net-p2p/gnunet-gtk/Makefile
==============================================================================
--- head/net-p2p/gnunet-gtk/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/net-p2p/gnunet-gtk/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/net-p2p/mldonkey/Makefile
==============================================================================
--- head/net-p2p/mldonkey/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/net-p2p/mldonkey/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/net/rdesktop/Makefile
==============================================================================
--- head/net/rdesktop/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/net/rdesktop/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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)
Modified: head/news/slrn/Makefile
==============================================================================
--- head/news/slrn/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/news/slrn/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/news/tin/Makefile
==============================================================================
--- head/news/tin/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/news/tin/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--with-nntp-default-serv
--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}
Modified: head/palm/synce-libsynce/Makefile
==============================================================================
--- head/palm/synce-libsynce/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/palm/synce-libsynce/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/d
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
Modified: head/print/lyx/Makefile
==============================================================================
--- head/print/lyx/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/print/lyx/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/security/libgpg-error/Makefile
==============================================================================
--- head/security/libgpg-error/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/security/libgpg-error/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/security/pam_krb5-rh/Makefile
==============================================================================
--- head/security/pam_krb5-rh/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/security/pam_krb5-rh/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/sysutils/djmount/Makefile
==============================================================================
--- head/sysutils/djmount/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/sysutils/djmount/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -15,7 +15,7 @@ LIB_DEPENDS= upnp.9:${PORTSDIR}/devel/up
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}
Modified: head/sysutils/libcdio/Makefile
==============================================================================
--- head/sysutils/libcdio/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/sysutils/libcdio/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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}
Modified: head/sysutils/xcdroast/Makefile
==============================================================================
--- head/sysutils/xcdroast/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/sysutils/xcdroast/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -20,7 +20,7 @@ NONROOT_DESC= Use xcdroast w/o being roo
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
Modified: head/textproc/gxmlviewer/Makefile
==============================================================================
--- head/textproc/gxmlviewer/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/textproc/gxmlviewer/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -10,10 +10,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= ports at 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
Modified: head/textproc/hunspell/Makefile
==============================================================================
--- head/textproc/hunspell/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/textproc/hunspell/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -14,7 +14,7 @@ COMMENT= Improved spell-checker for Hung
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
Modified: head/textproc/xmlstarlet/Makefile
==============================================================================
--- head/textproc/xmlstarlet/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/textproc/xmlstarlet/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
Modified: head/www/cadaver/Makefile
==============================================================================
--- head/www/cadaver/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/www/cadaver/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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 at quot es it
.for lang in ${LANGS}
Modified: head/www/elinks/Makefile
==============================================================================
--- head/www/elinks/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/www/elinks/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -191,7 +191,7 @@ CONFIGURE_ARGS+= --disable-sm-scripting
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
-CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG}
.endif
#
Modified: head/www/lynx-current/Makefile
==============================================================================
--- head/www/lynx-current/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/www/lynx-current/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-zlib --libdir="${
--enable-idna \
--enable-ipv6 \
--with-mime-libdir=${PREFIX}/etc \
- --with-libiconv-prefix=${LOCALBASE} \
+ ${ICONV_CONFIGURE_ARG} \
--with-screen=ncursesw \
--with-ssl=${OPENSSLBASE}
Modified: head/www/lynx/Makefile
==============================================================================
--- head/www/lynx/Makefile Wed Sep 4 19:49:35 2013 (r326315)
+++ head/www/lynx/Makefile Wed Sep 4 20:01:05 2013 (r326316)
@@ -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
More information about the svn-ports-all
mailing list