Add an explicit dependency on pkgconf

49 files changed, 64 insertions, 123 deletions

diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index db3f71ff80e4..2e9ab979d4c3 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Gnome Java Accessibility Bridge
 BUILD_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 RUN_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	atspi gnomehack
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 55ef0ad00573..6974058e6ebd 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 OPTIONS_DEFINE_i386=	SSE
 
 USE_BZIP2=	yes
-USES=		gmake pathfix gettext
+USES=		gmake pathfix gettext pkgconfig
 USE_GCC=	yes
 USE_GNOME=	gnomehier libgnomecanvas
 GNU_CONFIGURE=	yes
diff --git a/audio/calf/Makefile b/audio/calf/Makefile
index 6223fcd33923..f15036aeed7c 100644
--- a/audio/calf/Makefile
+++ b/audio/calf/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	LASH LV2
 OPTIONS_DEFAULT=LASH LV2
 LV2_DESC=	LV2 audio plugin
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GCC=	any
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
diff --git a/audio/gstreamer-plugins-fluendo-mp3/Makefile b/audio/gstreamer-plugins-fluendo-mp3/Makefile
index d2b81186ab4e..df480ed2db9d 100644
--- a/audio/gstreamer-plugins-fluendo-mp3/Makefile
+++ b/audio/gstreamer-plugins-fluendo-mp3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gstreamer-plugins-fluendo-mp3
-# Date created:		2007-02-25
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gstreamer-plugins-fluendo-mp3
 PORTVERSION=	0.10.20
@@ -17,6 +13,7 @@ COMMENT=	Mp3 gstreamer plugin from fluendo
 LICENSE=	MIT
 
 CFLAGS:=	${CFLAGS} -O2
+USES=		pkgconfig
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 PLIST_FILES=	lib/gstreamer-0.10/libgstflump3dec.la \
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index 8f87478bd5b9..4b8420abea05 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
 
 CFLAGS:=	${CFLAGS} -O2
 USE_GSTREAMER=	yes good
-USES=		gmake
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index d59e9dc3ada1..65bf2cfc8728 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS=	libltdl
 USE_GSTREAMER=	yes
 USE_GNOME=	gnomedocutils gtk20
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index f196d3cd0e79..789ccc5b703a 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 CONFLICTS=	bmp-scrobbler-[0-9]* \
 		xmms-scrobbler-[0-9]*
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GCC=	any
 GNU_CONFIGURE=	yes
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 0405607fe61a..312abc3ab715 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 
 USE_GCC=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
 
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 8714dbc36095..e30453c9c648 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   gmfsk
-# Date created:                29th May 2003
-# Whom:                        Carl Makin <carl@stagecraft.cx>
-#
+# Created by: Carl Makin <carl@stagecraft.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	gmfsk
 PORTVERSION=	0.6
@@ -23,7 +19,7 @@ GNU_CONFIGURE=	yes
 # preprocessor include tests.  The following line is a work around.
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	libgnomeui gnomehack gnomeprefix
 INSTALLS_OMF=	yes
 
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index cd6f4b6e4635..052dfcaf98c9 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -13,10 +13,9 @@ COMMENT=	GTK frontend for XNeur keyboard layout switcher
 BUILD_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
 RUN_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
 
-
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils
+USES=		desktop-file-utils pkgconfig
 USE_GNOME=	gconf2 gtk20 libglade2
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index f9fb220d7d81..0105fbdd129a 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -11,11 +11,10 @@ COMMENT=	Mind-mapping tool for GNOME
 RUN_DEPENDS+=	f2py:${PORTSDIR}/math/py-numpy
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt
 USE_GNOME=	pygnome2 gnomedesktop gnomehack
 USE_PYTHON=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 6e4394a858bb..e443fd65b4c5 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_DOS2UNIX=	textcat32_conf.txt
 USE_XORG=	pixman
-USES=		gettext
+USES=		gettext pkgconfig
 USE_SQLITE=	3
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index 984bddea2abf..f219486d51f9 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -14,9 +14,8 @@ COMMENT=	A free (GPL) "data flow oriented" development environment
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		fftw.2:${PORTSDIR}/math/fftw
 
-USES=        pathfix
+USES=        pathfix gmake pkgconfig
 USE_GNOME=	libgnomeui libxml2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	${CONFIGURE_SCRIPT} FuzzyEngine/configure \
 		HMM/configure NNet/configure \
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index b21818325955..891266b174c2 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Java wrapper for GConf
 BUILD_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
 RUN_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
 
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile
index bebe3be4d683..03734a315872 100644
--- a/devel/nemiver/Makefile
+++ b/devel/nemiver/Makefile
@@ -26,11 +26,10 @@ GHEX_DESC=	Enable memory view
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	ac_cv_path_GDB_PROG=${LOCALBASE}/bin/gdb
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intltool gnomedocutils gconf2 vte
 USE_GCC=	yes
 USE_LDCONFIG=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 MAN1=		nemiver.1
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 55098acb5dce..5f48d9d78d4c 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	An open-source and cross-platform text/hex editor
 
-USES=		gettext
+USES=		gettext pkgconfig
 USE_WX=		2.6+
 WANT_UNICODE=	yes
 USE_DOS2UNIX=	yes
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 2c83788c3bf6..093a7500ff87 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -24,7 +24,7 @@ MANCOMPRESSED=	no
 
 CONFIGURE_ARGS+=	--with-freedesktop_org-menu=${GNOME_LOCALSTATEDIR}/applications --with-icon-path=${GNOME_LOCALSTATEDIR}/pixmaps
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	libgnomeui desktopfileutils gnomehier
 USE_TEX=	latex
 
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 6c28aaa135a1..87867aa6b4b8 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_SQLITE=	3
 USE_WX=		2.8
 WX_CONF_ARGS=	relative
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index 0a2c8bb3b210..70a6e0b4e07b 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Evolving Artificial Life
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env aclocal:env automake:env libtool
 USE_SDL=	sdl
diff --git a/games/lander/Makefile b/games/lander/Makefile
index b4e2844f1b7f..880e12bbe81b 100644
--- a/games/lander/Makefile
+++ b/games/lander/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		boost_filesystem:${PORTSDIR}/devel/boost-libs
 
 GNU_CONFIGURE=	yes
-USES=		gettext
+USES=		gettext pkgconfig
 USE_SDL=	sdl image mixer
 USE_GL=		gl glu
 USE_GCC=	4.2+
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index cc69772e01aa..18bb1cf5a0c8 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -16,11 +16,10 @@ LIB_DEPENDS=	tar:${PORTSDIR}/devel/libtar \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		gnet-2:${PORTSDIR}/net/gnet2
 
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehier gtkmm24
 USE_SDL=	sdl image mixer
 USE_GCC=	any
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost-includedir=${LOCALBASE}/include
 
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 4020cdd374fa..a948ca6a1420 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -11,11 +11,10 @@ DISTNAME=	monkey-bubble-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 Puzzle Bobble clone with monkeys
 
-USES=        pathfix
+USES=        pathfix gmake pkgconfig
 USE_GNOME=	gnomedocutils gnomeprefix intlhack \
 		librsvg2 libgnomeui
 USE_GSTREAMER=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 385733f099fd..72029c79b0ab 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -9,6 +9,7 @@ MASTER_SITES=	LOCAL/gblach/e17/extra/
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A simple viewer for .edj files
 
+USES=		pkgconfig
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index a5a54da0ffa9..081953eb11e4 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS=	gdata.7:${PORTSDIR}/devel/libgdata
 RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GL=		gl
 USE_GNOME=	gnomeprefix intlhack gtk20
 WANT_GNOME=	yes
-USES=		gettext pathfix
+USES=		gettext pathfix gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index 88791b4615a5..ba32786f38f5 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 MANCOMPRESSED=	yes
 
 CONFIGURE_ARGS+=--with-boost-system=boost_system \
diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile
index 3d4d7f92b8a1..aab54eb9554b 100644
--- a/graphics/gstreamer-plugins-gl/Makefile
+++ b/graphics/gstreamer-plugins-gl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gstreamer-plugins-gl
-# Date created:		6 Sep 2010
-# Whom:			Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gstreamer-plugins-gl
 PORTVERSION=	0.10.3
@@ -19,9 +15,8 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=	pathfix gettext
+USES=	pathfix gettext gmake pkgconfig
 USE_GSTREAMER=	yes
 USE_XORG=	ice x11
 USE_GL=		gl glu glew
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index 686a97a8e064..6ac5f080f773 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gTimelapse
-# Date created:				29 Aug 2011
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gtimelapse
 DISTVERSION=	0.1
@@ -20,6 +16,7 @@ LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
+USES=		pkgconfig
 USE_WX=		2.8+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index 76ac9de63aaa..ed64b7124528 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -25,10 +25,9 @@ MAN1=		ocrfeeder-cli.1 ocrfeeder.1
 
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2 pygnomeextras
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GHOSTSCRIPT=yes
 
 .include <bsd.port.options.mk>
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index c9c768ebf7d8..4f6f1c4477bb 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	passepartout
-# Date created:				11st Sep 2003
-# Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/graphics/passepartout/Makefile,v 1.4 2006/09/30 15:31:05 ahze Exp $
-#
 
 PORTNAME=	passepartout
 PORTVERSION=	0.7.1
@@ -24,8 +20,7 @@ LIB_DEPENDS=	xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
 RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=	pathfix
+USES=	pathfix gmake pkgconfig
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 9854a4696e6f..ebcd59f00028 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -18,6 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_QT4=	moc_build qmake_build
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
diff --git a/japanese/gjiten/Makefile b/japanese/gjiten/Makefile
index 3f3b95aa2a2b..f7e125b5e366 100644
--- a/japanese/gjiten/Makefile
+++ b/japanese/gjiten/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	gjiten
-# Date created: 			2012-09-03
-# Whom: 				Stephane Lapie <stephane.lapie@darkbsd.org>
-#
+# Created by: Stephane Lapie <stephane.lapie@darkbsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gjiten
 PORTVERSION=	2.6
@@ -18,7 +14,7 @@ UTF8_DESC=	Use UTF-8 edict dictionaries
 KANJIPAD_DESC=	Use Kanjipad
 
 USE_GNOME=	gtk20 gconf2 libglade libgnomeui
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 5eadac96c026..31eed05deaa6 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ibus-skk
-# Date created:	4 January 2010
-# Whom:		Hiroto Kagotani <hiroto.kagotani@gmail.com>
-#
+# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ibus-skk
 PORTVERSION=	1.4.1
@@ -19,9 +15,7 @@ LIB_DEPENDS=	skk:${PORTSDIR}/japanese/libskk \
 		ibus-1.0:${PORTSDIR}/textproc/ibus
 
 USE_PYTHON=	yes
-USES=		gettext
-
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	DATADIRNAME=share
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index abdd25215745..9ce97e50f162 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -17,10 +17,9 @@ CANNA_DESC=		Use Canna
 WNN_DESC=		Use FreeWnn
 GNOMEPANEL_DESC=	Build GNOME Panel Applet
 
-USES=        pathfix perl5
+USES=        pathfix perl5 gmake pkgconfig
 USE_GNOME=	gconf2 gnomeprefix intlhack libglade2
 USE_PERL5=	build
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		im-ja-conf.1 im-ja-xim-server.1
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index c197e6409160..c9fcae1c969a 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -12,9 +12,8 @@ COMMENT=	GTK interactive geometry software
 
 LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehack gnomeprefix intlhack libglade2
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile
index e9a24bf5f586..c5dae5b891a4 100644
--- a/multimedia/audiopreview/Makefile
+++ b/multimedia/audiopreview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	audiopreview
-# Date created:		27 July 2010
-# Whom:			kevlo 
-#
+# Created by: kevlo 
 # $FreeBSD$
-#
 
 PORTNAME=	audiopreview
 PORTVERSION=	0.6
@@ -14,7 +10,7 @@ MASTER_SITES=	http://audiopreview.codealpha.net/files/
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	A command-line tool to play previews of audio and video files
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GSTREAMER=	core
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 5dc71ba81d2f..caf75c3015c7 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Clutter GStreamer integration
 
 LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 
-USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
+USES=		pathfix gmake pkgconfig
 USE_GNOME=	ltverhack gnomeprefix
 USE_GSTREAMER=	yes
 USE_GL=		gl
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 3c8cf8930968..9eafdc262bcc 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix libgnomeui
-USES=		pathfix
+USES=		pathfix gmake pkgconfig
 
 MAN1=		gmencoder.1
 
diff --git a/multimedia/gst123/Makefile b/multimedia/gst123/Makefile
index 9fe13bc39216..0749dfd94410 100644
--- a/multimedia/gst123/Makefile
+++ b/multimedia/gst123/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A command-line tool to play audio and video files
 LICENSE=	LGPL20
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ENV=	NCURSES5_CONFIG=/usr/bin/true
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index 628bb53de7a8..8edf1c504128 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gstreamer-plugins-buzztard
-# Date created:		2007-06-24
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	buzztard
 PORTVERSION=	0.6.0
@@ -17,6 +13,7 @@ COMMENT=	Buzztard gstreamer plugins
 
 LIB_DEPENDS=	fluidsynth.1:${PORTSDIR}/audio/fluidsynth
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 USE_GNOME=	gnomehack ltverhack
diff --git a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
index 49fe6017ef0d..7437aca831b8 100644
--- a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
+++ b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gstreamer-plugins-fluendo-mpegdemux
-# Date created:		2007-02-25
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gstreamer-plugins-fluendo-mpegdemux
 PORTVERSION=	0.10.71
@@ -17,6 +13,7 @@ COMMENT=	MPEG2 demuxing gstreamer plugin from fluendo
 LICENSE=	MPL
 
 CFLAGS:=	${CFLAGS} -O2
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index d0a91a14b549..d14ce74e224d 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -33,9 +33,8 @@ MP4BOX_DESC=	Enable Mpeg-4 container support
 THEORA_DESC=	Enable Ogg Theora video codec support
 SRT_DESC=	Enable SRT text subtitles support
 
-USES=        pathfix gettext
+USES=        pathfix gettext gmake pkgconfig
 USE_GNOME=	glib20 intlhack libxml2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index cbaf87a467ee..702f34fe0b79 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		enchant:${PORTSDIR}/textproc/enchant \
 		pcre:${PORTSDIR}/devel/pcre
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 USE_GSTREAMER=	good
 INSTALLS_ICONS=	yes
diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile
index 504e33de74fb..9d1c5d1c3256 100644
--- a/net-im/psimedia/Makefile
+++ b/net-im/psimedia/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	psimedia
-# Date created:		2009-08-10
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
+# Created by: Max Brazhnikov <makc@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	psimedia
 PORTVERSION=	1.0.3
@@ -16,6 +12,7 @@ COMMENT=	Voice and video API for Psi-like IM clients
 
 LIB_DEPENDS=	oil-0.3:${PORTSDIR}/devel/liboil
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_QT4=	gui qmake_build moc_build uic_build
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index a75f44ab9cd9..5094ca36a964 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 		gnet-2.0.0:${PORTSDIR}/net/gnet2
 
 USE_BZIP2=	yes
-USES=		pathfix gettext gmake
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gconf2 gnomeprefix intlhack libglade2 vte
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-clamavNugget/Makefile b/security/razorback-clamavNugget/Makefile
index c40e137440d1..aae90213d583 100644
--- a/security/razorback-clamavNugget/Makefile
+++ b/security/razorback-clamavNugget/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	razorback-clamavNugget
-# Date created:				2011/06/8
-# Whom:					Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
 # $FreeBSD$
-#
 
 PORTNAME=	clamavNugget
 PORTVERSION=	0.5.0
@@ -26,8 +22,7 @@ RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
 OPTIONS_DEFINE=	DEBUG ASSERT
 ASSERT_DESC=	Enable Asserts
 
-.include <bsd.port.options.mk>
-
+USES=		pkgconfig
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
@@ -35,6 +30,8 @@ USE_LDCONFIG=	${RB_LIBDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index b1ebb0e0e22e..8eb52ce50edb 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	swfdec-plugin
-# Date created:				Jun 14, 2005
-# Whom:					anholt
-#
+# Created by: anholt
 # $FreeBSD$
-#
 
 PORTNAME=	swfdec-plugin
 PORTVERSION=	0.8.2
@@ -17,6 +13,7 @@ COMMENT=	Flash rendering plugin
 
 LIB_DEPENDS=	swfdec-0.8:${PORTSDIR}/graphics/swfdec
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20
diff --git a/x11-clocks/alarm-clock/Makefile b/x11-clocks/alarm-clock/Makefile
index ada378547c1d..c8507b73078d 100644
--- a/x11-clocks/alarm-clock/Makefile
+++ b/x11-clocks/alarm-clock/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	unique-1:${PORTSDIR}/x11-toolkits/unique \
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext pathfix gmake pkgconfig
 USE_GSTREAMER=	yes
 USE_GNOME=	gtk20
 
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index a42999886bc6..84ded4e074e6 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-USES=		desktop-file-utils iconv pathfix
+USES=		desktop-file-utils iconv pathfix pkgconfig
 USE_XORG=	xtst xext
 USE_GNOME=	gtk30 cairo intlhack gnomedocutils librsvg2
 USE_GSTREAMER=	yes
diff --git a/x11/terminology/Makefile b/x11/terminology/Makefile
index 62b4f72c48fe..708aeba10efa 100644
--- a/x11/terminology/Makefile
+++ b/x11/terminology/Makefile
@@ -12,6 +12,7 @@ COMMENT=	EFL Terminal Emulator
 
 LICENSE=	BSD
 
+USES=		pkgconfig
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes