From 54e44467d7a2aed3673c0a14dbbb8e6dd1bee7be Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Thu, 5 Sep 2013 20:18:30 +0000
Subject: . 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)
---
 dns/idnkit2/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'dns/idnkit2')

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>
-- 
cgit v1.2.3