diff options
| author | bsam <bsam@FreeBSD.org> | 2013-09-06 04:18:30 +0800 |
|---|---|---|
| committer | bsam <bsam@FreeBSD.org> | 2013-09-06 04:18:30 +0800 |
| commit | d4be7ebb16af8657e516c12bf0574fb925a3f26f (patch) | |
| tree | 3b1d1321b78dcf4a659d95ca332649d8253316c1 /dns | |
| parent | d17cc05291e2481f97fd8cd319a6585d4004ffad (diff) | |
| download | freebsd-ports-gnome-d4be7ebb16af8657e516c12bf0574fb925a3f26f.tar.gz freebsd-ports-gnome-d4be7ebb16af8657e516c12bf0574fb925a3f26f.tar.zst freebsd-ports-gnome-d4be7ebb16af8657e516c12bf0574fb925a3f26f.zip | |
. 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)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind96/Makefile | 3 | ||||
| -rw-r--r-- | dns/bind98/Makefile | 3 | ||||
| -rw-r--r-- | dns/bind99/Makefile | 3 | ||||
| -rw-r--r-- | dns/idnkit/Makefile | 2 | ||||
| -rw-r--r-- | dns/idnkit2/Makefile | 11 |
5 files changed, 9 insertions, 13 deletions
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index c42c30305f0e..ebea70cc582c 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -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 diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile index 5e0bfd918b73..37fdb310a51f 100644 --- a/dns/bind98/Makefile +++ b/dns/bind98/Makefile @@ -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 diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 9a21b1de4c81..370218e1d622 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -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 diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile index eb63b3346b32..ce39ae91466a 100644 --- a/dns/idnkit/Makefile +++ b/dns/idnkit/Makefile @@ -18,7 +18,7 @@ COMMENT= A library to handle internationalized domain names USE_AUTOTOOLS= libtool USES= iconv GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \ +CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} \ --enable-runidn \ --enable-extra-ace diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile index 9b27efe4ae79..83326e48d29b 100644 --- a/dns/idnkit2/Makefile +++ b/dns/idnkit2/Makefile @@ -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 idn_comparenames2.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> |