Finish converting the whole ports tree to USES=pkgconfig

26 files changed, 32 insertions, 65 deletions

diff --git a/textproc/ctpl/Makefile b/textproc/ctpl/Makefile
index e375a74af167..68f092d7517c 100644
--- a/textproc/ctpl/Makefile
+++ b/textproc/ctpl/Makefile
@@ -10,7 +10,7 @@ COMMENT=	C Template (Parser) Library
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gnomehack
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 
 MAN1=	ctpl.1
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index f36f30e793af..62eb06589fb5 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Dictionary/spellchecking framework
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20 ltverhack
-USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--disable-uspell \
 		--disable-voikko
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index 4fac0408191d..0e66d9e32343 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -12,14 +12,13 @@ COMMENT=	A Collection of DOM Implementations
 LIB_DEPENDS=	gdome:${PORTSDIR}/textproc/gdome2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 OPTIONS_DEFINE=	OCAML
 
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 4f6878af0708..79aa900edc6d 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -16,10 +16,9 @@ LIB_DEPENDS=		translate:${PORTSDIR}/textproc/libtranslate
 INSTALLS_OMF=		yes
 INSTALLS_ICONS=		yes
 GCONF_SCHEMAS=		gnome-translate.schemas
-USES=        pathfix
+USES=			pathfix pkgconfig
 USE_GNOME=		gnomeprefix eel2 intlhack libgnomeui
 USE_GMAKE=		yes
-USE_PKGCONFIG=		build
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-export-dynamic
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index cd5a694b7f0f..e02aa2b76e10 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	hunspell-1.3:${PORTSDIR}/textproc/hunspell \
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	xtst
 USE_GNOME=	desktopfileutils
 USE_QT4=	corelib gui webkit phonon \
diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 4bba752dd204..375cdbb36664 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -29,6 +29,8 @@ PLIST_DIRSTRY=	%%DATADIR%%
 
 USALIASES=	en_AG en_AU en_BS en_BW en_BZ en_CA en_DK en_GB en_GH en_HK \
 		en_IE en_IN en_JM en_NA en_NZ en_PH en_SG en_TT en_ZA en_ZW
+
+CONFIGURE_ENV+=	ac_cv_prog_AWK=gawk
 .for ALIAS in ${USALIASES}
 PLIST_FILES+=	%%DATADIR%%/hyph_${ALIAS}.dic
 .endfor
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 4dbe14ed6494..d5b4d349073e 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	iksemel
-# Date created:			24 April 2006
-# Whom:				trasz
-#
+# Created by: trasz
 # $FreeBSD$
-#
 
 PORTNAME=	iksemel
 PORTVERSION=	1.4
@@ -22,16 +18,14 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 INFO=	iksemel
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \
 	    ${WRKSRC}/doc/iksemel.texi
 	@${REINPLACE_CMD} -e 's|pkgconfigdir=$$(libdir)/pkgconfig|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
 	    ${WRKSRC}/Makefile.am
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index fa0c38a119fa..48aa9a89d046 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -15,7 +15,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 CONFIGURE_ARGS=	--disable-gtk-doc-html
 
 PLIST_SUB=	VERSION="0.6"
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index bb6352b03c28..d14023fe6628 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -20,9 +20,8 @@ USE_AUTOTOOLS=	libtoolize automake autoconf aclocal
 ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_ICONV=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	libxml2 libxslt
 GNOME_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 116fb8603ad2..c86ca63929f5 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -18,7 +18,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 2f1a1b1d09ed..452a3a0e5d26 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -16,8 +16,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_BZIP2=	yes
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--enable-static
 USE_LDCONFIG=	yes
diff --git a/textproc/libvisio/Makefile b/textproc/libvisio/Makefile
index 73d2b284522c..391e3e79e9e6 100644
--- a/textproc/libvisio/Makefile
+++ b/textproc/libvisio/Makefile
@@ -21,9 +21,8 @@ CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index db90cdc41e96..c16e52a278b6 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mythes
-# Date created:		2011-06-18
-# Whom:			Baptiste Daroussin <bapt@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	mythes
 PORTVERSION=	1.2.3
@@ -16,8 +11,7 @@ COMMENT=	Simple thesaurus library
 
 LIB_DEPENDS=	hunspell-1.3:${PORTSDIR}/textproc/hunspell
 
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 8ee93737c95a..27d5867b2814 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	raptor2:${PORTSDIR}/textproc/raptor2 \
 USE_GNOME=	gnomehack lthack
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 2c01fce47751..a67ed3b89304 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS=	libltdl
 USE_GNOME=	gnomehack libxml2 lthack
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	both
+USES=		pkgconfig:both
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-threestore=no
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index c281f2ff75c0..f406760bd677 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	sary.10:${PORTSDIR}/textproc/sary
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 INSTALL_TARGET=	site-install
 
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index a9f9fcc12a47..497f2a529a60 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -11,10 +11,9 @@ COMMENT=	A GNOME tool to find strings in a set of files
 
 LICENSE=	GPLv2 # (or later)
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomehier libgnomeui
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index baad1afa4c67..00985d797cc4 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://sary.sourceforge.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A suffix array library and tools, which provide fast full-text search
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 3524cb8776c7..3683cbb5ff05 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	scim-openvanilla
-# Date Created:				3 September 2005
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#
 
 PORTNAME=	scim-openvanilla
 PORTVERSION=	0.7.2.20070514
@@ -26,7 +22,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	OV_MODULEDIR=${PREFIX}/lib/openvanilla/
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 6a5ab1e092bf..6da70ae7dd1c 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -1,8 +1,5 @@
-# Ports collection makefile for:	sdcv
-# Date created:			2005/07/07
-# Whom:				chinsan <chinsan.tw@gmail.com>
+# Created by: chinsan <chinsan.tw@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	sdcv
 PORTVERSION=	0.4.2
@@ -18,7 +15,7 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 SUB_FILES=	pkg-message
 
 .if !defined(WITHOUT_NLS)
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 6ac951308fc9..ad4964d51d9c 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -19,12 +19,11 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 LICENCE=	GPLv3
 
 USE_ZIP=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 USE_DOS2UNIX=	CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp
 NO_WRKSUBDIR=	yes
 USE_QT4=	qmake gui svg webkit xml moc uic rcc imageformats linguist
 USE_GNOME=	desktopfileutils
-USE_PKGCONFIG=	build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index 007fd0e3ffcc..47d87c2c8268 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	soothsayer
-# Date created:		7 August 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	soothsayer
 PORTVERSION=	0.6.3
@@ -24,7 +20,7 @@ CONFIGURE_ENV=	ac_cv_path_CPPUNIT_CONFIG=no \
 		ac_cv_prog_HAVE_DOXYGEN=no
 CONFIGURE_ARGS=	--disable-python-binding
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 MAN1=		soothsayer_demo.1 soothsayer_demo_text.1 \
 		soothsayer_simulator.1 text2ngram.1
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 5dc6d3bf9749..6f04169bb53b 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	raptor2:${PORTSDIR}/textproc/raptor2 \
 
 USE_QT4=	corelib dbus qtestlib network \
 		qmake_build moc_build uic_build rcc_build
-USE_PKGCONFIG=	both
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 CMAKE_ARGS+=	-DSOPRANO_DISABLE_CLUCENE_INDEX=yes \
 		-DSOPRANO_DISABLE_SESAME2_BACKEND=yes
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 75f7c1d1f925..8229841fb103 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -17,7 +17,7 @@ AUTOMAKE_ARGS+=	--add-missing
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/ag
 USE_AUTOTOOLS=	aclocal autoconf autoheader automake
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		ag.1
 
diff --git a/textproc/xml2/Makefile b/textproc/xml2/Makefile
index 1e05b013ad1f..0425f340f566 100644
--- a/textproc/xml2/Makefile
+++ b/textproc/xml2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert between XML and a line-oriented format similar to XPath
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	libxml2
 
 PLIST_FILES=	bin/xml2 \
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index ff61b78a6097..8ecfea836c54 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs
 OPTIONS_DEFINE=	XSLT
 XSLT_DESC=	Build libxsltwrap library (requires libxslt)
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-silent-rules
 USE_LDCONFIG=	yes