22 files changed, 31 insertions, 64 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 5659b008715d..f5449d19e7bc 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -24,7 +24,7 @@ USE_RC_SUBR=	rrdcached
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 WANT_PERL=	yes
 USE_GNOME=	gnomehack intltool
 
diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile
index 9a0bd9361a52..a52d4f056442 100644
--- a/devel/libnfc/Makefile
+++ b/devel/libnfc/Makefile
@@ -22,7 +22,7 @@ SERIALPROBE_DESC=	serial auto-probe
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 
 MAN1=		nfc-anticol.1 nfc-dep-initiator.1 nfc-dep-target.1 \
 		nfc-emulate-forum-tag4.1 nfc-emulate-tag.1 nfc-emulate-uid.1 \
diff --git a/games/mt_dolphin_ia/Makefile b/games/mt_dolphin_ia/Makefile
index fc5cf67efce6..5cc3e009202c 100644
--- a/games/mt_dolphin_ia/Makefile
+++ b/games/mt_dolphin_ia/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mt_dolphin_ia
-# Date created:		Sun 7 mar 2004
-# Whom:			thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=		mt_dolphin_ia
 PORTVERSION=		0.1.98
@@ -17,6 +13,7 @@ COMMENT=		A basic AI for MaitreTarot, a Tarot card game
 
 LIB_DEPENDS=		mt_client.0:${PORTSDIR}/games/libmt_client
 
+USES=			pkgconfig
 USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
 USE_GNOME=		glib20 libxml2
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 947b917ea120..d79140fd198f 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	cairomm
-# Date created:		2005-12-07
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/graphics/cairomm/Makefile,v 1.19 2011/06/07 14:00:26 kwm Exp $
-#
 
 PORTNAME=	cairomm
 PORTVERSION=	1.10.0
@@ -22,7 +18,7 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack ltverhack
 CONFIGURE_ENV=	AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/evas_generic_loaders-ps/Makefile b/graphics/evas_generic_loaders-ps/Makefile
index a86abed2f8a9..d53801273b7b 100644
--- a/graphics/evas_generic_loaders-ps/Makefile
+++ b/graphics/evas_generic_loaders-ps/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	spectre:${PORTSDIR}/print/libspectre
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	eina
 USE_LDCONFIG=	yes
 
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index f8520ecd1a44..7b1e513d6e8b 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USES=		gmake perl5 pkgconfig
+USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/graphics/libgaiagraphics/Makefile b/graphics/libgaiagraphics/Makefile
index fb44a4573358..2b75a31c5d29 100644
--- a/graphics/libgaiagraphics/Makefile
+++ b/graphics/libgaiagraphics/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libgaiagraphics
-# Date created:		2012-06-14
-# Whom:			lbartoletti <coder@tuxfamily.org>
-#
+# Created by: lbartoletti <coder@tuxfamily.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libgaiagraphics
 PORTVERSION=	0.4b
@@ -20,8 +16,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		cairo:${PORTSDIR}/graphics/cairo
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake pkgconfig
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile
index d6227d412ee2..b2748ebc55b7 100644
--- a/graphics/libsvg-cairo/Makefile
+++ b/graphics/libsvg-cairo/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
 PLIST_FILES=	include/svg-cairo.h \
 		lib/libsvg-cairo.a \
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 337cd0421d2a..ad9c6ee34c49 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		lcms2:${PORTSDIR}/graphics/lcms2
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libxml2 ltverhack
 USE_AUTOTOOLS=	libtool
 MAKE_JOBS_UNSAFE=	yes
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 8503a90a36a3..b7b3abb20ad7 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-cairo
-# Date created:		2004-12-05
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #	$MCom: ports/graphics/py-cairo/Makefile,v 1.28 2010/11/15 14:12:13 kwm Exp $
-#
 
 PORTNAME=	cairo
 PORTVERSION=	1.8.10
@@ -21,8 +17,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
 WRKSRC=		${WRKDIR}/py${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	2.6-2.7
-USE_GMAKE=	yes
-USES=	pathfix
+USES=	pathfix gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index 29d4e49ca1e5..96e3be9a7578 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	gsf-1:${PORTSDIR}/devel/libgsf
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		iconv pathfix
+USES=		iconv pathfix gmake pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ARGS+=	--disable-python --enable-libpst-shared
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 70acbe2d7d48..39e247601e0d 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	folks-0.[6-9].[0-9]*
 LATEST_LINK=	${PORTNAME}04
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	intlhack gnomehier
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index ed6600739dc2..62200a1089a7 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
 USE_PYTHON_BUILD=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
 USE_AUTOTOOLS=	libtool
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index a36b836ecaa1..ad9c6fe12678 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -26,7 +26,7 @@ USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
 USE_GNOME+=	ltverhack glib20 intltool
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME_SUBR=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 6b0a5cef401d..3f0c2efe3159 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20 intltool
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 0f766255ff2a..3780a47b5fac 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -21,8 +21,7 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		popt:${PORTSDIR}/devel/popt
 
-USES=		bison pathfix gettext
-USE_GMAKE=	yes
+USES=		bison pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
 USE_LDCONFIG=	yes
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index cd0f74ab12dd..ef7f87bd73de 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	ConsoleKit
-# Date Created:				26 Aug 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/sysutils/consolekit/Makefile,v 1.25 2010/10/23 10:12:30 kwm Exp $
 
@@ -20,7 +17,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
 USE_XORG=	x11
-USES=	pathfix gettext
+USES=	pathfix gettext pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 4a916b6ee00b..0d0399ce35d8 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/d
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack glib20
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 8b88ae623913..71ded24d850d 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    libwpd
-# Date created:         Mon May 19 09:09:10 PDT 2003
-# Whom:                 reed@pugetsoundtechnology.com
-#
+# Created by: reed@pugetsoundtechnology.com
 # $FreeBSD$
-#
 
 PORTNAME=	libwpd
 PORTVERSION=	0.8.14
@@ -20,6 +16,7 @@ LICENSE=	LGPL21
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GNOME=	gnomehack libgsf
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index e09d6db1747e..d5f08a49d16c 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -20,6 +20,7 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 USE_AUTOTOOLS=	libtool
+USES=		pkgconfig
 USE_GNOME=	gnomehack gnomeprefix ltverhack
 USE_LDCONFIG=	yes
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 67d21b1e6422..41254718709a 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    wv
-# Date created:         Fri Nov  6 09:06:33 PST 1998
-# Whom:                 sumikawa@kame.net
-#
+# Created by: sumikawa@kame.net
 # $FreeBSD$
-#
 
 PORTNAME=	wv
 PORTVERSION=	1.2.9
@@ -17,7 +13,7 @@ COMMENT=	A library and executables to access Microsoft Word files
 LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf
 
 USE_GNOME=	libgsf
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index c3bd6bf0959f..5b312690ec7f 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:		libgdiplus
-# Date created:					20040820
-# Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libgdiplus
 PORTVERSION=	2.10
@@ -21,8 +17,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack glib20
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15