- Use USE_ICONV knob

Approved by:	portmgr

9 files changed, 13 insertions, 16 deletions

diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 6726387914ba..c64e358faa9d 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -16,14 +16,13 @@ DISTFILES=	${DISTNAME}.${IIIMF_VER:S/-/./}${EXTRACT_SUFX}
 MAINTAINER=	kcwu@csie.org
 COMMENT=	Internet/Intranet Input Method Framework language engine unit
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 IIIMF_VER=	r11_4-1467
 WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
 BUILD_WRKSRC=	${WRKSRC}/unit
 INSTALL_WRKSRC=	${WRKSRC}/unit
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index b119a73ad255..5df3cb1dbcb0 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -16,11 +16,11 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Xml internationalization support for GNOME, and others
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index ebcbc06a375c..bb4c61e0ffc9 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library to build and query a full text inverted index
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index af517f86c534..36459a6708f6 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A minimal implementation of the Document Object Model
 
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
 USE_LIBTOOL_VER=13
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 730700788737..9d969cd51609 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	openjade
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	This package is a collection of SGML/XML tools called OpenSP
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GETTEXT=	yes
 USE_GMAKE=	YES
+USE_ICONV=	yes
 USE_REINPLACE=	YES
 USE_LIBTOOL_VER=13
 USE_PERL5=	yes
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 02c063088d5f..ab8da59566d3 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A Perl interface to the Sablotron XSLT processor
 
-LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
 
+USE_ICONV=	yes
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
 		INC='-I${LOCALBASE}/include' \
diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index 4a2bc8176c8c..c405b4326ced 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -17,9 +17,9 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby interface to the Sablotron XSLT processor
 
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 9d78cd52e1cd..6b17b006368f 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 # If WITH_DISABLE_META is defined sablot will not output the META html tag
 #WITH_DISABLE_META=	yes
@@ -32,6 +31,7 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_LIBTOOL_VER=13
 USE_PERL5_BUILD=	yes
 
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index d83877d2b1a3..029c5089b6d6 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -18,12 +18,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML-Conscious PPM Compression
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_GMAKE=	yes
+USE_ICONV=	yes
 MAKE_ARGS=	CC="${CXX}" OPT_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"