svn commit: r326444 - in head: Mk/Uses devel/tig dns/bind96 dns/bind98 dns/bind99 dns/idnkit dns/idnkit2 japanese/chasen-base mail/gmime2 net/netatalk net/netatalk3 net/samba36 net/samba4 net/samba...
Boris Samorodov
bsam at FreeBSD.org
Thu Sep 5 20:18:35 UTC 2013
Author: bsam
Date: Thu Sep 5 20:18:30 2013
New Revision: 326444
URL: http://svnweb.freebsd.org/changeset/ports/326444
Log:
. introduce ICONV_CONFIGURE_BASE variable at Mk/Uses/iconv.mk. It's value is
"--with-libiconv=${LOCALBASE}" at systems pre OSVERSION 100043 and "" (null)
otherwise;
. convert all ports which has CONFIGURE_ARGS=--with-libiconv=${LOCALBASE}.
Approved by: portmgr (bapt, implicit)
Modified:
head/Mk/Uses/iconv.mk
head/devel/tig/Makefile
head/dns/bind96/Makefile
head/dns/bind98/Makefile
head/dns/bind99/Makefile
head/dns/idnkit/Makefile
head/dns/idnkit2/Makefile
head/japanese/chasen-base/Makefile
head/mail/gmime2/Makefile
head/net/netatalk/Makefile
head/net/netatalk3/Makefile
head/net/samba36/Makefile
head/net/samba4/Makefile
head/net/samba4wins/Makefile
head/palm/pilot-link/Makefile
head/palm/synce-librapi2/Makefile
head/palm/synce-vdccm/Makefile
head/www/dansguardian-devel/Makefile
head/www/dansguardian/Makefile
Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk Thu Sep 5 20:13:50 2013 (r326443)
+++ head/Mk/Uses/iconv.mk Thu Sep 5 20:18:30 2013 (r326444)
@@ -21,6 +21,7 @@ iconv_ARGS= lib
ICONV_CMD= ${LOCALBASE}/bin/iconv
ICONV_LIB= -liconv
ICONV_CONFIGURE_ARG= --with-libiconv-prefix=${LOCALBASE}
+ICONV_CONFIGURE_BASE= --with-libiconv=${LOCALBASE}
.if ${iconv_ARGS} == "lib"
LIB_DEPENDS+= libiconv.so.3:${PORTSDIR}/converters/libiconv
@@ -35,6 +36,7 @@ PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}
ICONV_CMD= /usr/bin/iconv
ICONV_LIB=
ICONV_CONFIGURE_ARG=
+ICONV_CONFIGURE_BASE=
.endif
Modified: head/devel/tig/Makefile
==============================================================================
--- head/devel/tig/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/devel/tig/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -18,7 +18,7 @@ MAN5= tigrc.5
MAN7= tigmanual.7
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE}
USE_GMAKE= yes
USES= iconv
Modified: head/dns/bind96/Makefile
==============================================================================
--- head/dns/bind96/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/dns/bind96/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -69,7 +69,8 @@ CONFIGURE_ARGS+= --without-libxml2
.endif
.if ${PORT_OPTIONS:MIDN}
-CONFIGURE_ARGS+= --with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
+USES+= iconv
+CONFIGURE_ARGS+= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit
.else
CONFIGURE_ARGS+= --without-idn
Modified: head/dns/bind98/Makefile
==============================================================================
--- head/dns/bind98/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/dns/bind98/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -72,7 +72,8 @@ CONFIGURE_ARGS+= --without-libxml2
.endif
.if ${PORT_OPTIONS:MIDN}
-CONFIGURE_ARGS+= --with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
+USES+= iconv
+CONFIGURE_ARGS+= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit
.else
CONFIGURE_ARGS+= --without-idn
Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/dns/bind99/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -81,7 +81,8 @@ CONFIGURE_ARGS+= --without-libxml2
.endif
.if ${PORT_OPTIONS:MIDN}
-CONFIGURE_ARGS+= --with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
+USES+= iconv
+CONFIGURE_ARGS+= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit
.else
CONFIGURE_ARGS+= --without-idn
Modified: head/dns/idnkit/Makefile
==============================================================================
--- head/dns/idnkit/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/dns/idnkit/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -18,7 +18,7 @@ COMMENT= A library to handle internation
USE_AUTOTOOLS= libtool
USES= iconv
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \
+CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} \
--enable-runidn \
--enable-extra-ace
Modified: head/dns/idnkit2/Makefile
==============================================================================
--- head/dns/idnkit2/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/dns/idnkit2/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -20,6 +20,7 @@ USE_AUTOTOOLS= libtool
USES= iconv
USE_BZIP2= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE}
USE_LDCONFIG= yes
@@ -32,16 +33,8 @@ MAN3= idn_checkname.3 idn_comparenames.3
MAN5= idn2.conf.5 idn2rc.5 idnalias.conf.5 idnlang.conf.5
MANCOMPRESSED= no
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
-CONFIGURE_ARGS= --with-libiconv=/usr
-.else
-CONFIGURE_ARGS= --with-libiconv=${LOCALBASE}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|' \
${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/japanese/chasen-base/Makefile
==============================================================================
--- head/japanese/chasen-base/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/japanese/chasen-base/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/dart
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include ${ICONV_CONFIGURE_BASE}
USES= iconv
USE_LDCONFIG= yes
Modified: head/mail/gmime2/Makefile
==============================================================================
--- head/mail/gmime2/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/mail/gmime2/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
# Rename uudecode and uuencode to gmime-* to not conflict with userland
-CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \
+CONFIGURE_ARGS?= ${ICONV_CONFIGURE_BASE} \
--with-html-dir=${PREFIX}/share/doc \
--enable-mono=no \
--program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;"
Modified: head/net/netatalk/Makefile
==============================================================================
--- head/net/netatalk/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/net/netatalk/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -21,6 +21,7 @@ USE_RC_SUBR= netatalk
CONFIGURE_ARGS+= --with-tcp-wrappers \
--with-pkgconfdir=${PREFIX}/etc \
+ ${ICONV_CONFIGURE_BASE} \
--with-libgcrypt-dir=${LOCALBASE} \
--with-uams-path=${PREFIX}/libexec/netatalk-uams \
--with-bdb=${LOCALBASE}
@@ -119,12 +120,6 @@ CONFIGURE_ARGS+= --enable-sendfile
CONFIGURE_ARGS+= --disable-sendfile
.endif
-.include <bsd.port.pre.mk>
-
-.if !empty(ICONV_LIB)
-CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
@@ -146,4 +141,4 @@ post-install:
.endfor
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net/netatalk3/Makefile
==============================================================================
--- head/net/netatalk3/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/net/netatalk3/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+= --enable-tcp-wrappers \
--with-libgcrypt-dir=${LOCALBASE} \
--with-uams-path=${PREFIX}/libexec/netatalk-uams \
--with-bdb=${LOCALBASE} \
+ ${ICONV_CONFIGURE_BASE} \
--localstatedir=/var \
--disable-bundled-libevent \
--with-libevent-header=${LOCALBASE}/include \
@@ -116,12 +117,6 @@ PLIST_SUB+= ATFUNCS="@comment "
PLIST_SUB+= ATFUNCS=""
.endif
-.include <bsd.port.pre.mk>
-
-.if !empty(ICONV_LIB)
-CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
@@ -137,4 +132,4 @@ post-install:
${INSTALL_DATA} -c ${PREFIX}/etc/extmap.conf.dist ${PREFIX}/etc/extmap.conf
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net/samba36/Makefile
==============================================================================
--- head/net/samba36/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/net/samba36/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -95,7 +95,7 @@ BUILD_DEPENDS+= tevent>=0.9.11:${PORTSD
RUN_DEPENDS+= tevent>=0.9.11:${PORTSDIR}/devel/tevent
CONFIGURE_ARGS+= --without-libtevent --enable-external-libtevent
# These options are common for all (sub)ports
-CONFIGURE_ARGS+= --with-libiconv="${LOCALBASE}" \
+CONFIGURE_ARGS+= ${ICONV_CONFIGURE_BASE} \
--disable-as-needed
.if !defined(SAMBA_SUBPORT)
Modified: head/net/samba4/Makefile
==============================================================================
--- head/net/samba4/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/net/samba4/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -159,7 +159,7 @@ CONFIGURE_ARGS+= \
--with-iconv \
--with-sendfile-support \
--builtin-libraries=smbclient \
- --with-libiconv="${LOCALBASE}" \
+ ${ICONV_CONFIGURE_BASE} \
--with-gettext="${LOCALBASE}"
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Modified: head/net/samba4wins/Makefile
==============================================================================
--- head/net/samba4wins/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/net/samba4wins/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
CONFIGURE_ARGS+= --disable-reg-gconf --disable-socket-wrapper \
--with-readline=/usr --with-included-popt \
- --with-libiconv=${LOCALBASE} --without-sqlite3 \
+ ${ICONV_CONFIGURE_BASE} --without-sqlite3 \
--without-pthreads --without-python
USE_RC_SUBR= smbd4wins
Modified: head/palm/pilot-link/Makefile
==============================================================================
--- head/palm/pilot-link/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/palm/pilot-link/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -17,7 +17,7 @@ USES= pathfix pkgconfig iconv
USE_BZIP2= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits --enable-xsltproc
+CONFIGURE_ARGS+=${ICONV_CONFIGURE_BASE} --with-included-popt --enable-conduits --enable-xsltproc
USE_LDCONFIG= yes
OPTIONS_DEFINE= PNG THREADS USB
Modified: head/palm/synce-librapi2/Makefile
==============================================================================
--- head/palm/synce-librapi2/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/palm/synce-librapi2/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -21,8 +21,7 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USES= pathfix iconv pkgconfig
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-libiconv="${LOCALBASE}" \
- --with-libsynce="${LOCALBASE}"
+CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} --with-libsynce="${LOCALBASE}"
.include <bsd.port.pre.mk>
Modified: head/palm/synce-vdccm/Makefile
==============================================================================
--- head/palm/synce-vdccm/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/palm/synce-vdccm/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -20,7 +20,7 @@ DESKTOP_DESC= Desktop integration
GNU_CONFIGURE= yes
WANT_GNOME= yes
USES= iconv pkgconfig
-CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \
+CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} \
--with-libsynce=${LOCALBASE}
MAN1= triggerconnection.1 ${PORTNAME}.1
Modified: head/www/dansguardian-devel/Makefile
==============================================================================
--- head/www/dansguardian-devel/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/www/dansguardian-devel/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var \
--with-logdir=/var/log \
--with-piddir=/var/run \
- --with-libiconv=${LOCALBASE} \
+ ${ICONV_CONFIGURE_BASE} \
--enable-fancydm
MAN8= dansguardian.8
@@ -96,7 +96,7 @@ PLIST_SUB+= SCANNERS="@comment "
.endif
.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+= --enable-ntlm --with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS+= --enable-ntlm ${ICONV_CONFIGURE_BASE}
USES+= iconv
PLIST_SUB+= NTLMCONF=""
.else
Modified: head/www/dansguardian/Makefile
==============================================================================
--- head/www/dansguardian/Makefile Thu Sep 5 20:13:50 2013 (r326443)
+++ head/www/dansguardian/Makefile Thu Sep 5 20:18:30 2013 (r326444)
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var \
--with-logdir=/var/log \
--with-piddir=/var/run \
- --with-libiconv=${LOCALBASE} \
+ ${ICONV_CONFIGURE_BASE} \
--enable-fancydm
MAN8= dansguardian.8
@@ -96,7 +96,7 @@ PLIST_SUB+= SCANNERS="@comment "
.endif
.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+= --enable-ntlm --with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS+= --enable-ntlm ${ICONV_CONFIGURE_BASE}
USES+= iconv
PLIST_SUB+= NTLMCONF=""
.else
More information about the svn-ports-all
mailing list