53 files changed, 78 insertions, 168 deletions

diff --git a/audio/bmp-songchange/Makefile b/audio/bmp-songchange/Makefile
index 8283358d3851..98465c334876 100644
--- a/audio/bmp-songchange/Makefile
+++ b/audio/bmp-songchange/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bmp-song_change
-# Date created:				27 January, 2005
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bmp-songchange
 PORTVERSION=	0.0.2
@@ -19,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
 
+USES=		pkgconfig
+
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/bmp/General/libsong_change.so
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 6230383bf8c9..d0d1cb4b65a9 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	cantus-1*
 
 LATEST_LINK=	${PORTNAME}3
 
-USES=		gmake pathfix gettext
+USES=		gmake pathfix gettext pkgconfig
 USE_GNOME=	gnomeprefix libglade2 glib20
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 755236f66d85..1ded81b09407 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Elegant music organizer
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 
-USES=		gmake pathfix gettext iconv
+USES=		gmake pathfix gettext iconv pkgconfig
 USE_GNOME=	gnomeprefix intltool gtksharp20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 43bf60bcd36d..73395ffe8456 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Another gtk-based MP3 frontend
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+USES=		pkgconfig
+
 .if defined(WITH_MPG321)
 RUN_DEPENDS+=	mpg321:${PORTSDIR}/audio/mpg321
 .else
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index 63f28ba28680..f30adcad785b 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	dssialsacompat:${PORTSDIR}/audio/libdssialsacompat \
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
diff --git a/audio/ipod-sharp/Makefile b/audio/ipod-sharp/Makefile
index 34cd7215811b..4c0a56b3da1b 100644
--- a/audio/ipod-sharp/Makefile
+++ b/audio/ipod-sharp/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/podsleuth.pc:${PORTSDIR}/misc/podsle
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtksharp20
 
 .include <bsd.port.mk>
diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile
index ed3fe4f18423..9d182cad79b8 100644
--- a/audio/jack_mixer/Makefile
+++ b/audio/jack_mixer/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection Makefile for:	jack_mixer
-# Date created:				13 August 2010
-# Whom:					gahr
-#
+# Created by: gahr
 # $FreeBSD$
-#
 
 PORTNAME=	jack_mixer
 PORTVERSION=	9
@@ -20,6 +15,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \
    		${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USES=		pkgconfig
 USE_PYTHON=	yes
 USE_GNOME=	gconf2
 GCONF_SCHEMAS=	jack_mixer.schemas
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 0441f25401a2..e611f6ba6fce 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 
 CONFIGURE_ARGS=	--disable-lynx
 
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 11cb4a5153da..41e5e3b38590 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		pulse.0:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 
 CONFIGURE_ARGS=	--disable-lynx
 
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 566460bb27ae..d7aed2372e98 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		pulse.0:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intltool
 
 CONFIGURE_ARGS=	--disable-lynx
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 93369d277d3c..ef7ce504bc16 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		canberra:${PORTSDIR}/audio/libcanberra
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	intltool
 
 CONFIGURE_ARGS=	--disable-lynx
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index b5af97aff7ca..d99621cb9f3b 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		pulse.0:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 
 CONFIGURE_ARGS=	--disable-lynx
 
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 728a2e709be4..db8a8f8ffc1b 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl \
 USE_GNOME=	pygtk2
 WANT_GNOME=	yes
 USE_PYTHON=	yes
-USES=		gettext gmake display pathfix
+USES=		gettext gmake display pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XML2PO=""
 CONFIGURE_ARGS=	--disable-oss-sound \
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 8754e5d73a74..dfad156bd4e5 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS?=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 HAS_CONFIGURE=	yes
 USE_CSTD=	gnu89
+USES=		pkgconfig
 APP?=		xmms
 .if ${APP} == bmp
 PORTVERSION=	0.3.12
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index e093bb24a28f..81c0f276f298 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -15,6 +15,7 @@ COMMENT=	ModPlug-based plugin for XMMS
 LIB_DEPENDS?=	xmms:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
 
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 PLUGDIR?=	lib/xmms/Input
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index c3812685ed69..d5bcf994c163 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	xosd.4:${PORTSDIR}/misc/xosd
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		bison iconv
+USES=		bison iconv gmake pkgconfig
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 
diff --git a/devel/gio-sharp/Makefile b/devel/gio-sharp/Makefile
index 11b308046fb9..872ba7de71ff 100644
--- a/devel/gio-sharp/Makefile
+++ b/devel/gio-sharp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GIO bindings not available in gtk-sharp
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gtksharp20
 
 MAKE_JOBS_UNSAFE=yes
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 2fa6b4cf938a..81a8f436d98b 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehack gnomeprefix intlhack intltool
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile
index bb138214e82b..55375832ed74 100644
--- a/devel/libfreefare/Makefile
+++ b/devel/libfreefare/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libfreefare
-# Date created:		2009-12-22
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
+# Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libfreefare
 PORTVERSION=	0.3.1
@@ -18,9 +14,8 @@ COMMENT=	MIFARE contactless tag access library
 LIB_DEPENDS=	nfc.1:${PORTSDIR}/devel/libnfc
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=	pathfix
+USES=	pathfix gmake pkgconfig
 
 MAN3=		freefare.3 freefare_error.3 mad.3 mifare_application.3 \
 		mifare_classic.3 mifare_desfire.3 mifare_desfire_aid.3 \
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index eeddc3181268..b24f4b514f06 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	notify-sharp
-# Date created:		2008-08-05
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
+# Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	notify-sharp
 PORTVERSION=	0.4.0
@@ -19,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/d
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gtksharp20
 
 .include <bsd.port.mk>
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 8143aa6ce26c..6838983e17f1 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A python bindings for libnotify
 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack pygtk2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index ccfcf520b5e2..f0d1174bf3ee 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 			pcre.3:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USES=        pathfix gettext
+USES=			pathfix gettext gmake pkgconfig
 USE_GNOME=		gnomeprefix intltool intlhack
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 4db5c84190c4..19a9d7e5e41e 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.gna.org/bless/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	A high quality, full featured hex editor
 
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gnomeprefix gnomedocutils gtksharp20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index c6ad0de3793e..2261e5b468a8 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	desmume
-# Date created:				Wed  7 Feb 2007 21:46:15 CET
-# Whom:					Stefan Sperling <stsp@stsp.in-berlin.de>
-#
+# Created by: Stefan Sperling <stsp@stsp.in-berlin.de>
 # $FreeBSD$
-#
 
 PORTNAME=	desmume
 PORTVERSION=	0.9.8
@@ -20,9 +16,8 @@ LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_GL=		gl
 USE_SDL=	sdl
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
-USES=		gettext
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt DATADIRNAME=share
 
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index aba1c3fa371d..f9d719766e8a 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
     		glademm-2.4:${PORTSDIR}/devel/libglademm24 \
 		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26
 
-USES=		gettext
+USES=		gettext pkgconfig
 USE_GNOME=	gconf2
 GCONF_SCHEMAS=	aeskulap.schemas
 USE_LDCONFIG=	${PREFIX}/lib/aeskulap
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 0efcb1c4a75d..d73c0687cc23 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_GNOME=	gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
 		--htmldir="${DOCSDIR}/html" \
 		--with-htmldir="${DOCSDIR}/html" \
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index d0d63651ca96..f93dbb6d3875 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gx
-# Date created:		11 June 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gx
 PORTVERSION=	0.4.0
@@ -18,7 +14,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gnomevfsmm-2.6.1:${PORTSDIR}/devel/gnome-vfsmm \
 		gconfmm-2.6.1:${PORTSDIR}/devel/gconfmm26
 
-USES=		gettext
+USES=		gettext pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index ca69343793f7..b1d552ecf851 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    libgnomecanvasmm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.0.1
@@ -18,7 +14,7 @@ COMMENT=	C++ wrapper for libgnomecanvas library
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libgnomecanvas
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index cf01f1720974..febbc70599f2 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:    libgnomecanvasmm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
 #   $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.22 2009/03/17 15:05:06 kwm Exp $
-#
 
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.26.0
@@ -21,8 +17,8 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 LATEST_LINK=	libgnomecanvasmm26
 
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomecanvas
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/pinta/Makefile b/graphics/pinta/Makefile
index 9370499cdec4..fd6544fe0a06 100644
--- a/graphics/pinta/Makefile
+++ b/graphics/pinta/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pinta
-# Date created:				2011-02-14
-# Whom:					Alexander Kojevnikov <alexander@kojevnikov.com>
-#
+# Created by: Alexander Kojevnikov <alexander@kojevnikov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	pinta
 PORTVERSION=	1.4
@@ -18,11 +14,10 @@ LICENSE=	MIT
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtksharp20 desktopfileutils
 INSTALLS_ICONS=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 
 MAN1=		pinta.1
 MANCOMPRESSED=	yes
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 6c35468be66e..20a2baf1cbe8 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	py-goocanvas
-# Date created:		2006-09-20
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/graphics/py-goocanvas/Makefile,v 1.6 2008/09/22 09:14:41 kwm Exp $
 
@@ -27,7 +24,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack pygtk2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(PYGOBJECT_PYGDOCS)/style.css||; \
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index b6822a61b1b2..2f2a3d7c90cb 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -13,9 +13,9 @@ COMMENT=	3D modeller for organic shapes
 LIB_DEPENDS=	gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm \
 		glademm-2.4:${PORTSDIR}/devel/libglademm24
 
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GL=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index 54d57c0a6d29..db328560dde2 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
 
+USES=		pkgconfig
 USE_GNOME=	desktopfileutils libgnomecanvas
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile
index d6713b7edb25..4a22907a4ddb 100644
--- a/multimedia/gtk-recordmydesktop/Makefile
+++ b/multimedia/gtk-recordmydesktop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gtk-recordmydesktop
-# Date created:				2010-07-16
-# Whom:					Ruslan Mahmatkhanov <cvs-src@yandex.ru>
-#
+# Created by: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gtk-recordmydesktop
 PORTVERSION=	0.3.8
@@ -19,8 +15,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydesktop
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	-2.7
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 51af77dc388a..e0f5675b3382 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 CONFLICTS=	gtk-vnc-0.4.[0-9]*
 
 USE_GNOME=	pygtk2 gnomehack
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile
index faef38897715..f7392eb08c6b 100644
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnome-keyring-sharp
-# Date created:		2008-10-08
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
+# Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gnome-keyring-sharp
 PORTVERSION=	1.0.2
@@ -19,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/deve
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gtksharp20
 USE_LDCONFIG=	yes
 
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index a17d59e753e3..04cb3d09b902 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   openvpn-admin
-# Date Created:                                06 Dec 2005
-# Whom:                                        Remington Lang <MrL0Lz@gmail.com>
-#
+# Created by: Remington Lang <MrL0Lz@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	openvpn-admin
 PORTVERSION=	1.9.4
@@ -18,7 +14,7 @@ RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtksharp20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile
index f1cd968994f2..9f8f4809f9d4 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/sysutils/fusefs-mp3fs/Makefile
@@ -19,7 +19,7 @@ FETCH_CMD=	fetch -Fpr
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 MAN1=		mp3fs.1
 PLIST_FILES=	bin/mp3fs
 
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index d5c9a9ef22de..c33057c8483c 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -32,6 +32,8 @@ SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
 
+USES=		pkgconfig
+
 .include <bsd.port.options.mk>
 
 LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index 885e9652e7c9..8670097cbd7b 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:		gecko-sharp
-# Date created:					20040825
-# Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
 #   $Id: Makefile,v 1.19 2007/02/07 15:49:20 killfill Exp $
-#
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.13
@@ -18,9 +14,9 @@ COMMENT=	Mono bindings to embed Mozilla
 
 USE_GECKO=	libxul
 USE_GNOME=	gtksharp20
+USES=		gmake pkgconfig
 LATEST_LINK=	gecko-sharp20
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_BZIP2=	yes
 
 post-patch:
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 44c59a5d6a54..e897b307d563 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
 
+USES=		pkgconfig
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xtst xxf86vm
 USE_PYTHON=	yes
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 9b9d9d7974da..196b72c937fb 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 USE_PYTHON=	2.6-2.7
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 PORTDATA=	*
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index b8f9d70f8d7e..bac8fed87f73 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-themes
-# Date Created:				05 October 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.183 2010/11/15 22:11:44 kwm Exp $
-#
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.32.1
@@ -23,10 +19,9 @@ RUN_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2
 CONFLICTS=	clearlooks-metacity-0.*
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack metacity gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 6d79e136637f..822bbcfc36de 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	bakery
-# Date created:				12th September 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
+# Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/bakery/Makefile,v 1.16 2009/01/09 22:07:11 kwm Exp $
 #
@@ -22,8 +19,7 @@ LIB_DEPENDS=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 
 USE_GNOME=	gnomehack gnomeprefix intlhack ltverhack
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 04dcb7550126..453e1a408729 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hippo-canvas
-# Date created:		2008-05-27
-# Whom:			Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	hippo-canvas
 PORTVERSION=	0.3.0
@@ -22,7 +18,7 @@ LIB_DEPENDS=	croco-0.6.3:${PORTSDIR}/textproc/libcroco \
 		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20 glib20 pygtk2 pango
 USE_PYTHON=	2.5+
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index d5ebf2da75ba..470d708a089d 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libbonoboui
-# Date created:				04 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.75 2010/09/28 16:03:49 kwm Exp $
-#
 
 PORTNAME=	libbonoboui
 PORTVERSION=	2.24.4
@@ -20,8 +16,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
 		libgnomecanvas libgnome referencehack
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 9fe96032abbd..ed6ccda0cc9d 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xpm
-USE_GMAKE=	yes
-USES=		bison pathfix gettext
+USES=		bison pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix libgnomeprint libgnomecanvas \
 		intlhack ltverhack
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 820da0ae4bb3..af4f5697f311 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	pygtksourceview-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A python bindings for the version 2 of the GtkSourceView library
 
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtksourceview2 pygtk2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 06be5c686831..cdb332cb1614 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -19,10 +19,9 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_XORG=	xpm
-USES=		bison pathfix gettext
+USES=		bison pathfix gettext pkgconfig gmake
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		ltverhack referencehack
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index ebf3b7c82938..e873f552aa9a 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnometerminal
-# Date created:				1 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-terminal/Makefile,v 1.137 2010/11/13 13:25:22 kwm Exp $
-#
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.32.1
@@ -18,10 +14,9 @@ COMMENT=	Terminal component for the GNOME 2 Desktop
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_BZIP2=	yes
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \
 		libgnome
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 0611dc1f1ab4..83af939e10e2 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    libgnomemm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.0.1
@@ -19,7 +15,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libgnome
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index ea3ebbc43199..79357b1b3644 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:    libgnomemm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
 #   $MCom: ports/x11/libgnomemm26/Makefile,v 1.24 2010/03/30 13:34:10 avl Exp $
-#
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.30.0
@@ -21,9 +17,9 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 LATEST_LINK=	libgnomemm26
 
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	xext
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnome
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 42977c4c2b7c..d31e4712aa80 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tilda
-# Date created:				4 Jan 2005
-# Whom:					Vlad V. Teterya <vlad@vlad.uz.ua>
-#
+# Create by: Vlad V. Teterya <vlad@vlad.uz.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	tilda
 PORTVERSION=	0.9.6
@@ -18,7 +14,7 @@ LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 libglade2 vte
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 DOCS=		AUTHORS ChangeLog README TODO