28 files changed, 40 insertions, 91 deletions

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 9f8c4cebacac..6347825f3ca8 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GL=		gl
 USE_LUA=	5.0+	# should be optional, but the build fails without it
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 504d8f55f59e..6524c5d5ba7b 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://starplot.org/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3-dimensional viewer for star charts
 
-USES=		gmake pathfix gettext
+USES=		gmake pathfix gettext pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 9808a4c786d4..228149a285e9 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Audio visualization plugin for the X Window System
 
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
 
-USES=        pathfix
+USES=        pathfix pkgconfig
 USE_GNOME=	esound gnomehier gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index c98aae01536a..f3309f1571b0 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
 		notify:${PORTSDIR}/devel/libnotify
 
-USES=		gmake desktop-file-utils
+USES=		gmake desktop-file-utils pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile
index d6ee81ffb5bd..cb56322b5b05 100644
--- a/audio/whysynth/Makefile
+++ b/audio/whysynth/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	dssialsacompat:${PORTSDIR}/audio/libdssialsacompat \
 		fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float
 
-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 942df56b6bb2..9361fc58b5d9 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	m4>=1.4.11:${PORTSDIR}/devel/m4 \
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USE_AUTOTOOLS=	autoconf
-USES=		gmake
+USES=		gmake pkgconfig
 USE_TK_RUN=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index d802c0e1dc11..8b377731e395 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wenju
-# Date created:				18 Oct 2003
-# Whom:				Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
-#
+# Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	wenju
 PORTVERSION=	1.6
@@ -14,6 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of writing tools in Chinese
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index ec10f5169977..7cf4339627db 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	gpsk31
-# Date created:		2005-05-27
-# Whom:				Søren Straarup <xride@x12.dk>
-#
+# Created by: Søren Straarup <xride@x12.dk>
 # $FreeBSD$
 
 PORTNAME=	gpsk31
@@ -13,6 +10,7 @@ MASTER_SITES=	http://www.qsl.net/pg4i/download/
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	A gtk psk31 client
 
+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 33051b634f57..f26b07501d0a 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xwota
-# Date created:				September 13 2006
-# Whom:					Diane Bruce <db@db.net>
-#
+# Created by: Diane Bruce <db@db.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xwota
 PORTVERSION=	0.4
@@ -16,8 +12,8 @@ MASTER_SITE_SUBDIR=	db
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	X version of who is on the air
 
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index 97219ec71010..9529a92750cd 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_TUCOWS}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 address book
 
-USES=        pathfix
+USES=        pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 libxml2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index 902977e841d1..9e62cd6d6f9c 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	avg@icyb.net.ua
 COMMENT=	GTK2 substitute for xmessage
 
 USE_GNOME=	gtk20 gnomeprefix
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index d84c84904783..2db82a10bb4f 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mdh
-# Date created:				12 November 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mdh
 PORTVERSION=	1.9.60
@@ -16,7 +12,7 @@ COMMENT=	GTK2-based toolbar, like a smaller GNOME panel
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index 9ef21f038cbc..f95432f5ab84 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
 GNU_CONFIGURE=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 USE_GNOME=	intltool gnomehack glib20 gtk20
 USE_LDCONFIG=	yes
 WANT_GSTREAMER=	yes
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index 913dd8ad032b..a439da970660 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	urlgfe
-# Date created:				8 January 2004
-# Whom:					Nosov Artem <chip-set@mail.ru>
-#
+# Created by: Nosov Artem <chip-set@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
@@ -17,6 +13,7 @@ COMMENT=	A download manager
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 lthack
+USES=		pkgconfig
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index 89723adc5fe0..1f0a8ef9dc4d 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	GTKPool
-# Date created:				31 Jul 2005
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gtkpool
 PORTVERSION=	0.5.0
@@ -15,7 +11,7 @@ MASTER_SITES=	ftp://ftp.seul.org/pub/gtkpool/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 2D pool game using the GTK+ toolkit
 
-USES=		perl5
+USES=		perl5 pkgconfig
 USE_GNOME=	gtk20
 USE_PERL5=	build
 USE_GMAKE=	yes
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 16037e499d93..2ab9e5647212 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	macopix
-# Date created:				15 Apr 2003
-# Whom:					Shinya Esu <esu@yk.rim.or.jp>
-#
+# Created by: Shinya Esu <esu@yk.rim.or.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	macopix
 PORTVERSION=	1.7.4
@@ -34,8 +30,7 @@ RESTRICTED_FILES=	\
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
 
 WANT_GNOME=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN1=		macopix.1
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index d58a376ec03c..762a0ea7aae1 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mt_gtk_client
-# Date created:		Sun 7 mar 2004
-# Whom:			thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=		mt_gtk_client
 PORTVERSION=		0.1.98
@@ -20,7 +16,7 @@ RUN_DEPENDS=		${LOCALBASE}/share/cardpics/images/78.png:${PORTSDIR}/games/cardpi
 
 USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
-USES=		gettext
+USES=		gettext pkgconfig
 USE_GNOME=		glib20 gtk20 libxml2
 
 .if !defined(WITHOUT_SERVER)
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 061a990c62da..6732f5355f10 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -14,8 +14,7 @@ COMMENT=	A graphical configurable talking cow
 OPTIONS_DEFINE=	DBUS
 
 USE_GNOME=	gtk20
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN6=		xcowsay.6
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 6a461e55abba..cac7d837b7e8 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Server browser for many popular 3D action games
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
 USE_GNOME=	intlhack
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN6=		xqf.6
diff --git a/math/matrices/Makefile b/math/matrices/Makefile
index f9aaf22bf238..68ee07c580fa 100644
--- a/math/matrices/Makefile
+++ b/math/matrices/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	matrices
-# Date created:				Oct. 29 - 2006
-# Whom:					Morten Slot Kristensen
-#
+# Created by: Morten Slot Kristensen
 # $FreeBSD$
-#
 
 PORTNAME=	matrices
 PORTVERSION=	1.0
@@ -14,6 +10,7 @@ MASTER_SITES=	http://mplus.dk/${PORTNAME}/
 MAINTAINER=	ontherenth@gmail.com
 COMMENT=	Matrix calculator (with both GUI & console-interface)
 
+USES=		pkgconfig
 USE_GNOME=	glib20 gtk20
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 2ee6cb6f7a59..f73c8a8b4461 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_XORG=	xpm xscrnsaver
 USE_GNOME=	gtk20
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libltdl libtool
 CONFIGURE_ARGS=	--enable-oscar --disable-workwizu --enable-smtp --enable-lj \
 		--disable-arts
diff --git a/science/euler/Makefile b/science/euler/Makefile
index 1a39c3e1229d..2f72f73652e1 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -13,13 +13,10 @@ COMMENT=	Program computes with real and complex numbers and matrices
 
 LICENSE=	GPLv2
 
+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-.if defined(.PARSEDIR)
-USE_GMAKE=	yes
-.endif
-
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 60ed2026138b..0bd9af795392 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gtk-flat-theme2
-# Date Created:				14 March 2003
-# Whom:				 	Philip Paeps <philip@paeps.cx>
-#
+# Created by: Philip Paeps <philip@paeps.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	gtk-flat-theme2
 PORTVERSION=	0.1
@@ -19,7 +15,7 @@ COMMENT=	A port of the Flat GTK+ engine to GTK+ 2.0
 WRKSRC=		${WRKDIR}/gtk-flat-theme-2.0
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/x11-themes/gtk-nodoka-engine/Makefile b/x11-themes/gtk-nodoka-engine/Makefile
index 7dee0bf79875..e662d6534a7a 100644
--- a/x11-themes/gtk-nodoka-engine/Makefile
+++ b/x11-themes/gtk-nodoka-engine/Makefile
@@ -15,7 +15,7 @@ ANIMATION_DESC=		Animation support
 ANIMATIONTOLEFT_DESC=	Animation from right to left
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile
index 5f30d0c0d1f1..26d1dbad5018 100644
--- a/x11-themes/nimbus/Makefile
+++ b/x11-themes/nimbus/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nimbus
-# Date created:		2011-04-07
-# Whom:			Karsten Pedersen <kpedersen@opencde.org>
-#
+# Created by: Karsten Pedersen <kpedersen@opencde.org>
 # $FreeBSD$
-#
 
 PORTNAME=		nimbus
 PORTVERSION=		0.1.7
@@ -21,7 +17,7 @@ RUN_DEPENDS=		${LOCALBASE}/bin/gtk-demo:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USES=			gmake pkgconfig
 INSTALLS_ICONS=		yes
 USE_LDCONFIG=		yes
 USE_GNOME=		gtk20
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 0cd5087458a8..6182faaeeda8 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Library components for Zed's Virtual Terminal
 
 USE_BZIP2=	yes
 USE_XORG=	x11
-USE_GMAKE=	yes
-USES=		bison pathfix
+USES=		bison pathfix gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gtk20 libartlgpl2
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 75c3fd585d4c..0558d744251a 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gcb
-# Date Created:				30 January 2006
-# Whom:					Nosov Artem <chip-set@mail.ru>
-#
+# Created by: Nosov Artem <chip-set@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gcb
 PORTVERSION=	0.2.8
@@ -16,6 +12,7 @@ MAINTAINER=	chip-set@mail.ru
 COMMENT=	A GTK+ tool for managing x11 cut-buffers
 
 HAS_CONFIGURE=	yes
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 
diff --git a/x11/yad/Makefile b/x11/yad/Makefile
index f470ed1920b7..4ba1bb45a3ef 100644
--- a/x11/yad/Makefile
+++ b/x11/yad/Makefile
@@ -8,14 +8,13 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	danilogondolfo@gmail.com
 COMMENT=	Display GNOME dialogs from the command line
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV+=	DATADIRNAME=share
 
-
 MAN1=	yad.1
 
 OPTIONS_DEFINE=	NLS