Add an explicit dependency on pkgconf

32 files changed, 49 insertions, 89 deletions

diff --git a/converters/pecl-fribidi/Makefile b/converters/pecl-fribidi/Makefile
index fa0d43df589d..278187ac0f7a 100644
--- a/converters/pecl-fribidi/Makefile
+++ b/converters/pecl-fribidi/Makefile
@@ -14,6 +14,7 @@ COMMENT=	A PECL extension for the Unicode Bidi algorithm
 
 LIB_DEPENDS=	fribidi.3:${PORTSDIR}/converters/fribidi
 
+USES=		pkgconfig
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
diff --git a/databases/pecl-tokyo_tyrant/Makefile b/databases/pecl-tokyo_tyrant/Makefile
index 8f2af112c1a6..8330d00a2db1 100644
--- a/databases/pecl-tokyo_tyrant/Makefile
+++ b/databases/pecl-tokyo_tyrant/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Wrapper to the Tokyo Tyrant client library
 
 LIB_DEPENDS=	tokyotyrant:${PORTSDIR}/databases/tokyotyrant
 
+USES=		pkgconfig
 USE_PHP=	session
 USE_PHP_BUILD=	spl
 USE_PHPIZE=	yes
diff --git a/deskutils/msynctool/Makefile b/deskutils/msynctool/Makefile
index 3efbea97fce9..c783afcb46c4 100644
--- a/deskutils/msynctool/Makefile
+++ b/deskutils/msynctool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	msynctool
-# Date created:				11 July 2008
-# Whom:					Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	msynctool
 PORTVERSION=	0.22
@@ -17,6 +13,7 @@ LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022
 
 CONFLICTS=	osynctool-[0-9]*
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index 8345ab80d8f6..f0e1dec1e0e3 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -14,8 +14,7 @@ COMMENT=	D-Bus bindings for GObject
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 USE_GNOME=	glib20 gnomehack
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 7029e262257f..c0a201597642 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -17,9 +17,8 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 USE_XZ=		yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	glib20 gtk30 ltverhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index d79f9e72faf1..9e211d2136e7 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	flatzebra:${PORTSDIR}/devel/flatzebra
 
+USES=		pkgconfig
 USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 4a812f026dc5..5924af001761 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GL=		gl
 USE_SDL=	sdl mixer image
 USE_PYTHON=	yes
diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 2fcd22077e2e..9b2219885088 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	glib20 gtk30
 INSTALLS_ICONS=	yes
 
diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile
index 75163662d868..982861c25b76 100644
--- a/games/phlipple/Makefile
+++ b/games/phlipple/Makefile
@@ -14,6 +14,7 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 		GLEW:${PORTSDIR}/graphics/glew
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_SDL=	sdl mixer image
 USE_GL=		gl glu
 
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index eff88b743728..df1d9b17ce5a 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	wormux-*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_SDL=	sdl image mixer ttf gfx net
 USE_DOS2UNIX=	fixed_class.h
 
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index c8e7a4a9fbf8..0f2b0333b045 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Cuddlesome teddy for the X desktop
 
 LICENSE=	GPLv2
 
+USES=		pkgconfig
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 245ef9dcb19e..542b4ef6fc63 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_SDL=	sdl image
 USE_GL=		gl glu
 
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 2877264bef89..418b0e68e5cb 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Clutter Box2D integration library
 
 LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	ltverhack gnomeprefix
 USE_GL=		gl
 USE_XORG=	xp x11
diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile
index 1968c8873f6d..be536ed4fae1 100644
--- a/graphics/goocanvasmm2/Makefile
+++ b/graphics/goocanvasmm2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ bindings for the goocanvas widget for GTK
 
 LIB_DEPENDS=	goocanvas-2.0:${PORTSDIR}/graphics/goocanvas2
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	ltverhack gtkmm30
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile
index b3e0bb491f5e..000ae7d279bb 100644
--- a/graphics/libwpg01/Makefile
+++ b/graphics/libwpg01/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	graphics/libwpg
-# Date created:		2009-01-09
-# Whom:			Dima Panov <fluffy@Fluffy.Khv.RU>
-#
+# Created by: Dima Panov <fluffy@Fluffy.Khv.RU>
 # $FreeBSD$
-#
 
 PORTNAME=	libwpg
 PORTVERSION=	0.1.3
@@ -22,7 +18,7 @@ LICENSE=	LGPL20
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack ltverhack
-USE_PERL5=	yes
+USES=		perl5 pkgconfig
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/irc/dxirc/Makefile b/irc/dxirc/Makefile
index 09c7deac694f..0a57441d2ba9 100644
--- a/irc/dxirc/Makefile
+++ b/irc/dxirc/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 
 USE_XORG=	xft
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 3e4b45d67f15..037aa8ab751e 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    libvmime
-# Date created:				September 17, 2005
-# Whom:					delphij@FreeBSD.org
-#
+# Created by: delphij@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	libvmime
 PORTVERSION=	0.9.1
@@ -18,8 +14,7 @@ LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 LIB_DEPENDS+=	gsasl:${PORTSDIR}/security/gsasl
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/misc/toilet/Makefile b/misc/toilet/Makefile
index 0f31ca0bff4e..46a092086856 100644
--- a/misc/toilet/Makefile
+++ b/misc/toilet/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	toilet
-# Date created:		13 August 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	toilet
 PORTVERSION=	0.3
@@ -18,6 +14,7 @@ LIB_DEPENDS=	caca.0:${PORTSDIR}/graphics/libcaca
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
+USES=		pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-fno-strength-reduce
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 2bf86e2ba9ce..16feef552956 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -16,11 +16,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_PERL5_RUN=	yes
 USE_PYTHON_RUN=	yes
-USES=		iconv
+USES=		iconv gmake perl5 pkgconfig
+USE_PERL5=	run
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl --with-openssl
 CONFLICTS=	centericq-[0-9]* centerim-[0-9]*
diff --git a/net-mgmt/scli/Makefile b/net-mgmt/scli/Makefile
index e6d9a8292736..0864ca4fdad8 100644
--- a/net-mgmt/scli/Makefile
+++ b/net-mgmt/scli/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	scli
-# Date created:		10 September 2001
-# Whom:			Michael Lyngbøl <lyngbol@wheel.dk>
-#
+# Created by: Michael Lyngbøl <lyngbol@wheel.dk>
 # $FreeBSD$
-#
 
 PORTNAME=	scli
 PORTVERSION=	0.3.1
@@ -18,7 +14,7 @@ COMMENT=	A collection of SNMP command line management tools
 LIB_DEPENDS=	gsnmp:${PORTSDIR}/net-mgmt/gsnmp
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	libxml2
 
 MAN1=		scli.1
diff --git a/security/razorback-fileInject/Makefile b/security/razorback-fileInject/Makefile
index 549182bcf0a1..57e9733700d8 100644
--- a/security/razorback-fileInject/Makefile
+++ b/security/razorback-fileInject/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	razorback-fileInject
-# Date created:				2011/06/8
-# Whom:					Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fileInject
 PORTVERSION=	0.5.0
@@ -22,13 +18,14 @@ LIB_DEPENDS=	razorback_api.2:${PORTSDIR}/security/razorback-api
 
 OPTIONS_DEFINE=	DEBUG ASSERT
 
-.include <bsd.port.options.mk>
-
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
 .if !empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
diff --git a/security/razorback-yaraNugget/Makefile b/security/razorback-yaraNugget/Makefile
index 3c2a5cd97a6a..ab0bd0d5eafb 100644
--- a/security/razorback-yaraNugget/Makefile
+++ b/security/razorback-yaraNugget/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	razorback-yaraNugget
-# Date created:				2011/06/8
-# Whom:					Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
 # $FreeBSD$
-#
 
 PORTNAME=	yaraNugget
 PORTVERSION=	0.5.0
@@ -27,13 +23,14 @@ RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
 OPTIONS_DEFINE=	DEBUG ASSERT
 ASSERT_DESC=	Enable Asserts
 
-.include <bsd.port.options.mk>
-
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${RB_LIBDIR}
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index bc91d0904feb..e3528508417c 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/s3fs
-USES=		fuse
+USES=		fuse pkgconfig
 
 MAN1=		s3fs.1
 
diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile
index cf9bab847b27..9fd7793bfaae 100644
--- a/sysutils/mtpfs/Makefile
+++ b/sysutils/mtpfs/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	mtp:${PORTSDIR}/audio/libmtp \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		mad:${PORTSDIR}/audio/libmad
 
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mtpfs
diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile
index 449b27387188..6a9d2ca405fd 100644
--- a/sysutils/rsyslog7-devel/Makefile
+++ b/sysutils/rsyslog7-devel/Makefile
@@ -36,11 +36,12 @@ RELP_DESC=	RELP input/output module for rsyslog
 RFC3195_DESC=	RFC3195 input support for rsyslog
 SNMP_DESC=	SNMP trap sender for rsyslog
 
+USES=		pkgconfig
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}
 LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 		lib/rsyslog/omlibdbi.so
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+=--disable-libdbi
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		gcrypt:${PORTSDIR}/security/libgcrypt
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
 		lib/rsyslog/lmnsd_gtls.so
@@ -91,7 +91,6 @@ CONFIGURE_ARGS+=--disable-pgsql
 
 .if ${PORT_OPTIONS:MRELP}
 LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.la \
 		lib/rsyslog/imrelp.so \
@@ -103,7 +102,6 @@ CONFIGURE_ARGS+=--disable-relp
 
 .if ${PORT_OPTIONS:MRFC3195}
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.la \
 		lib/rsyslog/im3195.so
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 777903f3c135..2613c195ed19 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -32,11 +32,12 @@ RELP_DESC=	RELP input/output module for rsyslog
 RFC3195_DESC=	RFC3195 input support for rsyslog
 SNMP_DESC=	SNMP trap sender for rsyslog
 
+USES=		pkgconfig
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}
 LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 		lib/rsyslog/omlibdbi.so
@@ -46,7 +47,6 @@ CONFIGURE_ARGS+=--disable-libdbi
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
 		lib/rsyslog/lmnsd_gtls.so
@@ -86,7 +86,6 @@ CONFIGURE_ARGS+=--disable-pgsql
 
 .if ${PORT_OPTIONS:MRELP}
 LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.la \
 		lib/rsyslog/imrelp.so \
@@ -98,7 +97,6 @@ CONFIGURE_ARGS+=--disable-relp
 
 .if ${PORT_OPTIONS:MRFC3195}
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
-USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.la \
 		lib/rsyslog/im3195.so
diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile
index 399cb7729c1c..90237a3a904c 100644
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@@ -17,10 +17,9 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		A natural language translation library
 
-USES=        pathfix
+USES=			gmake pathfix pkgconfig
 USE_GNOME=		glib20 intlhack
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
 USE_LDCONFIG=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/textproc/libxml++26-reference/Makefile b/textproc/libxml++26-reference/Makefile
index 7b3a03cce2d7..fd0eff1cc0fb 100644
--- a/textproc/libxml++26-reference/Makefile
+++ b/textproc/libxml++26-reference/Makefile
@@ -1,17 +1,13 @@
-# New ports collection makefile for:	libxml++26-reference
-# Date created:				03 April 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/textproc/libxml++26-reference/Makefile,v 1.1 2010/04/03 16:21:50 avl Exp $
-#
 
 PORTREVISION=	0
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc:${PORTSDIR}/textproc/libxml++26 \
 		glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/libxml++-2.6
diff --git a/www/castget/Makefile b/www/castget/Makefile
index b2a86cdc8d8d..976930af3b9d 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	castget
-# Date created:		16 February 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	castget
 PORTVERSION=	1.0.1
@@ -18,6 +14,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		curl:${PORTSDIR}/ftp/curl
 
 USE_LDCONFIG=	yes
+USES=		pkgconfig
 USE_GNOME=	glib20 libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/varnish-libvmod-header/Makefile b/www/varnish-libvmod-header/Makefile
index 52458c698f31..1cf47762a9c3 100644
--- a/www/varnish-libvmod-header/Makefile
+++ b/www/varnish-libvmod-header/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	varnish-libvmod-header
-# Date created:				2011-08-23
-# Whom:					anders
-#
+# Created by: anders
 # $FreeBSD$
-#
 
 PORTNAME=	libvmod-header
 DISTVERSION=	0.3-5
@@ -24,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/varnish/varnishapi.h:${PORTSDIR}/www/varnish
 FETCH_ARGS=	-Fpr
 
 USE_AUTOTOOLS=	aclocal libtool libtoolize autoheader automake autoconf
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 ACLOCAL_ARGS=	-I m4
 LIBTOOLFLAGS=	--copy --force
 AUTOMAKE_ARGS=	--add-missing --copy --foreign
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index 42057a8a4bc6..a3db5eb78df7 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 LATEST_LINK=	libunique3
 USE_XORG=	ice x11
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk30 gnomeprefix ltverhack:0
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 04c03c2a062d..0ef9a7f1e6be 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xcb xorg-macros
-USES=		gmake
+USES=		gmake pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"