30 files changed, 35 insertions, 56 deletions

diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index 1237a6ac7367..a0b76ab0f92e 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=		SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The real-time guitar processor
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index c2963022a069..61381ebcf1c4 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Measure your system's GTK+ performance
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 gnomeprefix
 
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index cbbe92c96686..b64f03c6acb1 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 GROUPS=		${PORTNAME}
 USE_BZIP2=	yes
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
 WANT_GNOME=	yes
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index 6dbda0e94501..1b18bc184d37 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 
 MAN1=		grig.1
 
diff --git a/devel/guiloader/Makefile b/devel/guiloader/Makefile
index 829e78c300d2..8b3d3e06592d 100644
--- a/devel/guiloader/Makefile
+++ b/devel/guiloader/Makefile
@@ -12,9 +12,8 @@ COMMENT=	A high-performance and compact GuiXml loader library
 
 PROJECTHOST=	nothing-personal
 USE_BZIP2=	yes
-USES=        pathfix gettext
+USES=        pathfix gettext gmake pkgconfig
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-hidden-visibility
 USE_LDCONFIG=	yes
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index 13ea7a7163cb..b8efa3cae224 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -14,6 +14,7 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug
 USE_GGZ=	client
+USES=		pkgconfig
 
 MAN6=	ggz-gtk.6
 
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index fd4cf3e6264f..170662abc4e9 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kanatest
-# Date created:		2004-03-27
-# Whom:			S H A N <shanali@yahoo.com>
-#
+# Created by: S H A N <shanali@yahoo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	kanatest
 PORTVERSION=	0.4.8
@@ -14,8 +10,7 @@ MASTER_SITES=	http://clayo.org/kanatest/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Japanese kana (Hiragana and Katakana) simple flashcard tool
 
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index d1a00ba7b419..ff830a91c3f5 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Diagram creation program, similar to Visio
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		desktop-file-utils gettext gmake pathfix
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	gtk20 gnomeprefix libxslt libartlgpl2 intlhack
 INSTALLS_ICONS=	yes
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index 3aed9c2ec21a..62f0aeb57e8a 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gcolor2
-# Date created:		18 April 2005
-# Whom:			Piotr Smyrak, piotr.smyrak@heron.pl
-#
+# Created by: Piotr Smyrak, piotr.smyrak@heron.pl
 # $FreeBSD$
-#
 
 PORTNAME=	gcolor2
 PORTVERSION=	0.4
@@ -14,6 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ps.ports@smyrak.com
 COMMENT=	A simple GTK+ 2.0 color selector
 
+USES=		pkgconfig
 USE_GNOME=	gtk20 gnomeprefix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index edbc406bda8a..e671b9f3ed95 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple and Fast Image Viewer for X
 
 LICENSE=	GPLv2
 
-USES=		desktop-file-utils gmake
+USES=		desktop-file-utils gmake pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 099237e7f8cf..e5c35f2940d1 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Another gtk2-based graphic file viewer
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+USES=		pkgconfig
 USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 62558f77e6c7..af99cef44fc8 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	autoconf libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index aa13ad66681c..89e61f6f2aad 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -25,6 +25,7 @@ INTERFILE_DESC=	With InterFile 3.3
 INW_DESC=	With INW (RUG)
 
 USE_BZIP2=	yes
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/xmedcon \
 		--enable-llcheck
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index df7d09fb446b..66d7dc625115 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/41436
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A dictionary management tool for anthy
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehier gtk20
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy
 
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 2f52b360327e..497bcb3eefed 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	jikes:${PORTSDIR}/java/jikes
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_XORG=	x11 ice xtst sm
 WANT_GNOME=	yes
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index a18329c0a6fd..800b0113dccc 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -31,7 +31,7 @@ QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GL=		gl
 
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 4b7f4848d47b..90f97c69311c 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	cups-pk-helper
-# Date created:		2009-12-29
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/print/cups-pk-helper/Makefile,v 1.1 2009/12/29 16:01:07 ahze Exp $
 
@@ -19,9 +16,8 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		polkit.2:${PORTSDIR}/sysutils/policykit
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intlhack gtk20
-USES=		gettext
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/libs
diff --git a/security/openvas-client/Makefile b/security/openvas-client/Makefile
index e38a48edf92e..497b216da3df 100644
--- a/security/openvas-client/Makefile
+++ b/security/openvas-client/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openvas-client
-# Date created:		2008-04-27
-# Whom:			Tomoyuki Sakurai <cherry@trombik.org>
-#
+# Created by: Tomoyuki Sakurai <cherry@trombik.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openvas-client
 PORTVERSION=	2.0.4
@@ -17,7 +13,7 @@ COMMENT=	A GUI client for OpenVAS
 MAN1=		OpenVAS-Client.1 openvasclient-mkcert.1
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 
 .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index 8edc754e286b..99c99083651c 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	viewglob
-# Date created:			06 Oct 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	viewglob
 PORTVERSION=	2.0.4
@@ -17,6 +13,7 @@ COMMENT=	A GTK+ add-on to bash and zsh
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+USES=		pkgconfig
 USE_XORG=	x11
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index 3a8e8caaff85..a07aeff31ad7 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -9,12 +9,11 @@ MASTER_SITES=	SF/lxde/LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/LXInput%
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Keyboard and mouse config tool from the LXDE project
 
-USES=		iconv
+USES=		iconv gmake pkgconfig
 USE_GNOME=	gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	yes
 
 MAN1=		lxinput.1
 
diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index 9600b3cdbacf..a23ab2532454 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Lightweight desktop-independent task manager
 
 LICENSE=	GPLv2
 
-USES=		iconv
+USES=		iconv gmake pkgconfig
 USE_GNOME=	gtk20 intlhack
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS README TODO
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 7f17caafbc74..0acd556a9700 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -13,8 +13,7 @@ COMMENT=	GNOME frontend to the PolicyKit framework
 LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehack gnomeprefix gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 3fc96632c6af..c3f92fb1eb58 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libgnomeprint libxslt \
 		libxml2 gtk20 glib20 pango
 USE_LDCONFIG=	yes
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 17231572bcb3..ab699054b557 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -34,7 +34,7 @@ QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GL=		gl
 NO_MOZPKGINSTALL=yes
 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 1f8177289281..515db0a7e6bc 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -33,7 +33,7 @@ QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GL=		gl
 USE_DOS2UNIX=	media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
 NO_MOZPKGINSTALL=yes
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 882b5ac7dd9e..46e4b03334ef 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GECKO=	gecko
 WANT_GNOME=	yes
 USE_QT4=	# empty
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 8e3d22eee5b1..1c85d05804c3 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
 
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_FAM=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index bd616e95835b..4ef859a5f353 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ wrapper for GTK+ toolkit
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=        pathfix
+USES=        pathfix pkgconfig
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 9bbcf7401462..1dc28cc892ef 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png\
 		expat.6:${PORTSDIR}/textproc/expat2\
 		mspack.1:${PORTSDIR}/archivers/libmspack
 
-USES=		iconv
+USES=		iconv pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile
index f9069949a3a1..8ed2ddae635d 100644
--- a/x11/lxrandr/Makefile
+++ b/x11/lxrandr/Makefile
@@ -11,11 +11,10 @@ COMMENT=	LXDE screen manager
 
 LICENSE=	GPLv2
 
-USES=		desktop-file-utils
+USES=		desktop-file-utils gmake pkgconfig
 USE_GNOME=	gtk20
 USE_XORG=	xrandr
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 
 MAN1=		lxrandr.1