Date: Sat, 7 Sep 2013 19:49:42 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326683 - in head: Mk/Uses devel/apr1 devel/apr2 devel/git irc/epic5 lang/gauche net-mgmt/ettercap net/ssltunnel-client net/yaz net/zebra-server textproc/libxml2 textproc/py-libxml2 www... Message-ID: <201309071949.r87JngNc034920@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bsam Date: Sat Sep 7 19:49:41 2013 New Revision: 326683 URL: http://svnweb.freebsd.org/changeset/ports/326683 Log: Introduce variable ICONV_PREFIX at Mk/Uses/iconv.mk. The default for pre 100043 is ${LOCALBASE} and /usr otherwise. Convert all ports to new variable usage. Approved by: portmgr (bapt, implicit) Modified: head/Mk/Uses/iconv.mk head/devel/apr1/Makefile head/devel/apr2/Makefile head/devel/git/Makefile head/irc/epic5/Makefile head/lang/gauche/Makefile head/net-mgmt/ettercap/Makefile head/net/ssltunnel-client/Makefile head/net/yaz/Makefile head/net/zebra-server/Makefile head/textproc/libxml2/Makefile head/textproc/py-libxml2/Makefile head/www/apache22/Makefile head/www/apache24/Makefile Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Sat Sep 7 19:16:54 2013 (r326682) +++ head/Mk/Uses/iconv.mk Sat Sep 7 19:49:41 2013 (r326683) @@ -20,6 +20,7 @@ iconv_ARGS= lib ICONV_CMD= ${LOCALBASE}/bin/iconv ICONV_LIB= -liconv +ICONV_PREFIX= ${LOCALBASE} ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE} ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE} @@ -35,6 +36,7 @@ PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR} ICONV_CMD= /usr/bin/iconv ICONV_LIB= +ICONV_PREFIX= /usr ICONV_CONFIGURE_ARG= ICONV_CONFIGURE_BASE= Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/devel/apr1/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -44,7 +44,7 @@ SHLIB_APU_MAJOR= 5 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ - --with-iconv=${LOCALBASE} + --with-iconv=${ICONV_PREFIX} .include <bsd.port.options.mk> Modified: head/devel/apr2/Makefile ============================================================================== --- head/devel/apr2/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/devel/apr2/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -42,7 +42,7 @@ CONFIGURE_ENV= CC="${CC}" CONFIGURE_ARGS= --with-installbuilddir=${DATADIR}/build-2 \ --with-expat=${LOCALBASE} \ - --with-iconv=${LOCALBASE} + --with-iconv=${ICONV_PREFIX} WRKSRC= ${WRKDIR}/apr Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/devel/git/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -257,8 +257,8 @@ PLIST_SUB+= PERLSUB="@comment " .if ${PORT_OPTIONS:MICONV} USES+= iconv MAKE_ENV+= NEEDS_LIBICONV=yes \ - ICONVDIR=${LOCALBASE} -CONFIGURE_ARGS+= --with-iconv=${LOCALBASE} + ICONVDIR=${ICONV_PREFIX} +CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX} .else MAKE_ENV+= NO_ICONV=1 .endif Modified: head/irc/epic5/Makefile ============================================================================== --- head/irc/epic5/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/irc/epic5/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -29,6 +29,9 @@ OPTIONS_DEFINE= IPV6 TCL PERL SSL TERMCA OPTIONS_DEFAULT= TCL PERL SSL RUBY TERMCAP_DESC= Refuse to use terminfo/ncurses +CONFIGURE_ARGS+=--with-iconv=${ICONV_PREFIX} +USES= iconv + .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MIPV6} @@ -63,9 +66,6 @@ CONFIGURE_ARGS+= --without-ruby CONFIGURE_ARGS+= --with-termcap .endif -CONFIGURE_ARGS+= --with-iconv=${LOCALBASE} -USES= iconv - post-extract: @${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf Modified: head/lang/gauche/Makefile ============================================================================== --- head/lang/gauche/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/lang/gauche/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -34,7 +34,7 @@ DATADIR?= ${PREFIX}/share/${PORTNAME}-0. GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-tls=none \ - --with-iconv=${LOCALBASE} + --with-iconv=${ICONV_PREFIX} PLIST_SUB= VERSION="${PORTVERSION}" \ TARGET="${CONFIGURE_TARGET}" USES= iconv Modified: head/net-mgmt/ettercap/Makefile ============================================================================== --- head/net-mgmt/ettercap/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/net-mgmt/ettercap/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -51,7 +51,7 @@ CONFIGURE_ARGS+=--disable-gtk .endif .if ${PORT_OPTIONS:MUTF8} -CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} +CONFIGURE_ARGS+=--with-iconv=${ICONV_PREFIX} USES+= iconv .endif @@ -91,6 +91,7 @@ post-patch: -e 's|test -f /usr/include/libnet\.h|${TRUE}|' \ -e 's|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|' \ -e 's|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \ + -e '/ICONVLIB/s|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -E \ -e 's|(^pkgdatadir.+=).+|\1 ${DATADIR}|' \ Modified: head/net/ssltunnel-client/Makefile ============================================================================== --- head/net/ssltunnel-client/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/net/ssltunnel-client/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -17,7 +17,7 @@ COMMENT= PPP over SSL virtual private ne LICENSE= BSD -CONFIGURE_ARGS= --disable-server --with-iconv=${LOCALBASE} +CONFIGURE_ARGS= --disable-server --with-iconv=${ICONV_PREFIX} GNU_CONFIGURE= yes USES= iconv Modified: head/net/yaz/Makefile ============================================================================== --- head/net/yaz/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/net/yaz/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -18,7 +18,7 @@ USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-shared --with-openssl=${OPENSSLBASE} \ - --with-iconv=${LOCALBASE} --with-xml2=${LOCALBASE} \ + --with-iconv=${ICONV_PREFIX} --with-xml2=${LOCALBASE} \ --with-xslt=${LOCALBASE} --with-icu=${LOCALBASE} \ --enable-tcpd Modified: head/net/zebra-server/Makefile ============================================================================== --- head/net/zebra-server/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/net/zebra-server/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -20,7 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textpro GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \ --with-tclconfig=${TCL_LIBDIR} \ - --with-iconv=${LOCALBASE} --with-expat=${LOCALBASE} + --with-iconv=${ICONV_PREFIX} --with-expat=${LOCALBASE} USES= iconv USE_LDCONFIG= yes Modified: head/textproc/libxml2/Makefile ============================================================================== --- head/textproc/libxml2/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/textproc/libxml2/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -20,7 +20,7 @@ USE_CSTD= gnu89 GNU_CONFIGURE= yes USES= pathfix gmake iconv pkgconfig USE_LDCONFIG= yes -CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \ +CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-lzma=/usr \ Modified: head/textproc/py-libxml2/Makefile ============================================================================== --- head/textproc/py-libxml2/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/textproc/py-libxml2/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -16,9 +16,10 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 USE_PYTHON= -2.7 +USES= iconv CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` -CONFIGURE_ARGS= --with-iconv=${LOCALBASE} \ +CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/www/apache22/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -65,7 +65,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --with-perl=${PERL5} \ --with-port=${WITH_HTTP_PORT} \ --with-expat=${LOCALBASE} \ - --with-iconv=${LOCALBASE} \ + --with-iconv=${ICONV_PREFIX} \ --enable-http \ --with-pcre=${LOCALBASE} \ --with-apr=${APR_CONFIG} \ Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Sep 7 19:16:54 2013 (r326682) +++ head/www/apache24/Makefile Sat Sep 7 19:49:41 2013 (r326683) @@ -74,7 +74,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --with-port=${WITH_HTTP_PORT} \ --with-sslport=${WITH_SSL_PORT} \ --with-expat=${LOCALBASE} \ - --with-iconv=${LOCALBASE} \ + --with-iconv=${ICONV_PREFIX} \ --enable-http \ --with-pcre=${LOCALBASE} \ --with-apr=${APR_CONFIG} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309071949.r87JngNc034920>