Convert g* to USES=pkgconfig

84 files changed, 103 insertions, 201 deletions

diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index c70780c53379..30da704ebbad 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	alienarena
-# Date created:				11 May 2006
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	alienarena
 PORTVERSION=	2011.753
@@ -47,10 +43,10 @@ PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_CLIENT)
-USE_PKGCONFIG=	yes
+USES+=		pkgconfig
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -107,4 +103,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/epiar/Makefile b/games/epiar/Makefile
index d332f7df2b8c..89723d644441 100644
--- a/games/epiar/Makefile
+++ b/games/epiar/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		physfs:${PORTSDIR}/devel/physfs
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_SDL=	image mixer sdl
 USE_GL=		glu
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index c84adb8c4205..64d21a3ee66b 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -13,12 +13,11 @@ COMMENT=	GNOME vocabulary builder
 
 LICENSE=	GPLv2
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix pygnome2
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 INSTALLS_OMF=	yes
 
 post-patch:
diff --git a/games/gtkevemon/Makefile b/games/gtkevemon/Makefile
index 43b488129caf..d5e68b0bf105 100644
--- a/games/gtkevemon/Makefile
+++ b/games/gtkevemon/Makefile
@@ -15,9 +15,9 @@ FETCH_ARGS=	-pRr
 CHANGESET=	8fa5c0b5f16b
 WRKSRC=		${WRKDIR}/BattleClinic-${PORTNAME}-${CHANGESET}/${PORTNAME}
 
+USES=		pkgconfig:both
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
-USE_PKGCONFIG=	both
 USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 255b075b8b6f..48984fc08f57 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ioquake3
-# Date created:				3 Jun 2006
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME?=	ioquake3
 DISTVERSION?=	1.36
@@ -16,8 +12,8 @@ EXTRACT_SUFX?=	.zip
 MAINTAINER?=	kamikaze@bsdforen.de
 COMMENT?=	Cleaned-up and enhanced version of Quake 3
 
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*-server}
 # Server config
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index e8ec3b854e74..5fb726f4728a 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 		xcb:${PORTSDIR}/x11/libxcb
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index bf77f7a0cdf7..54febc406972 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tile matching game
 
 LICENSE=	GPLv2
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gtk20 esound
 USE_AUTOTOOLS=	aclocal automake autoconf libtool
 MAKE_JOBS_SAFE=	yes
diff --git a/games/libfov/Makefile b/games/libfov/Makefile
index 2ddc9f75300d..edad7fce052e 100644
--- a/games/libfov/Makefile
+++ b/games/libfov/Makefile
@@ -12,9 +12,8 @@ COMMENT=	C library for calculating fields of view on low resolution rasters
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	yes
 CONFIGURE_ENV=	ac_cv_prog_doxygen=no ac_cv_path_SDL_CONFIG=no
 USE_LDCONFIG=	yes
 
diff --git a/games/nlarn/Makefile b/games/nlarn/Makefile
index cf258e5d112f..fcf353cb70ca 100644
--- a/games/nlarn/Makefile
+++ b/games/nlarn/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Roguelike game and as such a remake of the classic game Larn
 
 LICENSE=	GPLv3
 
+USES=		pkgconfig
 USE_LUA=	5.1
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 
 post-configure:
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index fa5e8e4d9b71..e5850340a64b 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		pkgconfig
 USE_PYTHON=	2.5-2.7
-USE_PKGCONFIG=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/poker-eval/Makefile b/games/poker-eval/Makefile
index c43e8e4a5471..ad2280659f93 100644
--- a/games/poker-eval/Makefile
+++ b/games/poker-eval/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection Makefile for:	poker-eval
-# Date created:			Dec 14, 2006
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	poker-eval
 PORTVERSION=	0.138
@@ -19,9 +14,9 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index 5a97aa4e1d48..348fd951c699 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -39,7 +39,7 @@ USE_PYTHON=		2.7
 USE_XORG=		xcursor
 USE_GL=			gl
 
-USE_PKGCONFIG=		build
+USES=			pkgconfig
 
 post-patch:
 	${REINPLACE_CMD} -e 's/X11R6/local/g; s/libpng/ligpng15/g' ${WRKSRC}/build/openbsd4-config.py && \
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index f45e9d8a5fc5..9cac02240663 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection Makefile for:	py-poker-eval
-# Date created:			Dec 14, 2006
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	poker-eval
 PORTVERSION=	0.138
@@ -21,8 +16,8 @@ LIB_DEPENDS=	poker-eval.1:${PORTSDIR}/games/poker-eval
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		pkgconfig
 USE_PYTHON=	2.5-2.7
-USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	aclocal autoconf automake libtool
 ACLOCAL_ARGS=	-I config
 CONFIGURE_ARGS=	PYTHON=""
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 33261c839ebe..2f9d6b259b1e 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -15,10 +15,9 @@ LICENSE_FILE=	${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt
 
 USE_SQLITE=	yes
 USE_XZ=		yes
-USES=		bison
+USES=		bison pkgconfig
 USE_GMAKE=	yes
 USE_LUA=	5.1
-USE_PKGCONFIG=	build
 USE_PERL5_BUILD=	yes
 
 MAKE_JOBS_SAFE=	yes
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index 8879309ab7ea..12455697b48d 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	clan23Core:${PORTSDIR}/devel/clanlib \
 		execinfo:${PORTSDIR}/devel/libexecinfo
 
+USES=		pkgconfig
 USE_GCC=	4.6+
 USE_GL=		glu
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 MAKE_ENV=	METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LDFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile
index 8c6e70ed45a8..830b40ddd9e1 100644
--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@@ -1,9 +1,5 @@
-# New Ports collection makefile for:	The Grind
-# Date created:		2012-05-18
-# Whom:			nemysis@gmx.ch
-#
+# Created by: nemysis@gmx.ch
 # $FreeBSD$
-#
 
 PORTNAME=	thegrind
 PORTVERSION=	0.1.2
@@ -22,8 +18,8 @@ LIB_DEPENDS=	radius:${PORTSDIR}/graphics/radius-engine \
 		physfs.1:${PORTSDIR}/devel/physfs
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 ALL_TARGET=	${PORTNAME}
 USE_SDL=	sdl sound
 USE_GL=		glu
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index dab026f77608..7ca923780428 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -17,11 +17,11 @@ LIB_DEPENDS=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		pkgconfig
 USE_OPENAL=	al alut
 USE_GL=		gl glu
 USE_SDL=	sdl image
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openal
 MAKE_JOBS_UNSAFE=	yes
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d6b72d17f887..381c5783f83b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -32,10 +32,9 @@ COMMENT=	Image processing tools
 
 LICENSE=	AL2
 
+USES=		pkgconfig pathfix
 USE_XZ=		yes
 USE_PERL5=	yes
-USE_PKGCONFIG=	yes
-USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libltdl
 # For some reason, using our libtool breaks the build into pieces:
 #USE_AUTOTOOLS+=	libtool
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index b537a6c029b5..40dd8cd40dbe 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	OpenEXR
-# Date created:				2003/01/26
-# Whom:					nork@FreeBSD.org
-#
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	OpenEXR
 PORTVERSION=	1.7.1
@@ -20,8 +16,8 @@ LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	YES
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index c23e19bf3d7f..40e9ee8afa67 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -16,10 +16,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 USE_XORG=	x11
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize automake
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--foreign --add-missing --ignore-deps
diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index 5edc9c711ef3..adc4c5619e1c 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:	ampasCTL
-# Date created:				2007-10-08
-# Whom:					nork@FreeBSD.org
+# Created by: nork@FreeBSD.org
 #
 # $FreeBSD$
 #
@@ -18,7 +16,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 65e0f69eaee5..fb26ce69965f 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -20,8 +20,7 @@ OPTIONS_DEFAULT=	IMAGEMAGICK PSTOEDIT
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE= yes
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index dc3e4530d358..b6db86b7308c 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	jpegtopnm:${PORTSDIR}/graphics/netpbm
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	libgnomeui
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 05b2660dad90..b67253fb4f47 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -16,12 +16,12 @@ LIB_DEPENDS=	json-glib-1.0:${PORTSDIR}/devel/json-glib
 
 LICENSE=	LGPL21
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango
-USE_PKGCONFIG=	build
 USE_GL=		gl
 USE_XORG=	glproto x11 xfixes xdamage xcomposite xi
 USE_LDCONFIG=	yes
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index b281f6436e48..f6dc3ae06d1a 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -30,7 +30,7 @@ NO_OPTIONS_SORT=	yes
 GPHOTO2_DESC=		Enable gphoto2 camera support
 PIMLIBS_DESC=		Enable address book support
 
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 USE_KDE4+=	libkdcraw libkexiv2 libkipi
 USE_QT4+=	sql-sqlite3_run
 USE_LDCONFIG=	yes
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index 6a9f57172f41..4e4e0544e853 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -127,7 +127,7 @@ DISTINFO_FILE=	${.CURDIR}/../../graphics/digikam-kde4/distinfo
 CONFLICTS_INSTALL=	kipi-plugins-2.*
 
 DESCR=		${.CURDIR}/../../graphics/kipi-plugins-kde4/pkg-descr
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 
 .if ${KIPI_PLUGIN} != "libkipiplugins"
 EXTRA_PATCHES=	${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index c9c90958c517..c34fb2398a29 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	djview
-# Date created:		2007-02-13
-# Whom:			Stanislav Sedov <stas@FreeBSD.org>
-#
+# Created by: Stanislav Sedov <stas@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	djview
 PORTVERSION=	4.9
@@ -19,8 +15,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	djvulibre:${PORTSDIR}/graphics/djvulibre
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_QT4=	gui network rcc_build uic_build moc_build qmake_build
-USE_PKGCONFIG=	yes
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
 		--x-libraries="${LOCALBASE}/lib"
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index dceddd8a0013..de1200fee370 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -12,7 +12,7 @@ COMMENT=	OpenGL hardware acceleration drivers for the DRI
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
 ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 7914fb718bb3..5ab68ae44846 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -13,10 +13,10 @@ COMMENT=	An application to view PDF files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 desktopfileutils intltool intlhack
 USE_PYTHON=	yes
-USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
diff --git a/graphics/evas-core/Makefile b/graphics/evas-core/Makefile
index 7103a2741507..74b2964af4c1 100644
--- a/graphics/evas-core/Makefile
+++ b/graphics/evas-core/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GCC=	any
 USE_EFL=	librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/evas
 EXAMPLESDIR=	${PREFIX}/share/examples/evas
diff --git a/graphics/evas-engine-buffer/Makefile b/graphics/evas-engine-buffer/Makefile
index fd2eea035a61..4b397a96fc42 100644
--- a/graphics/evas-engine-buffer/Makefile
+++ b/graphics/evas-engine-buffer/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/buffer
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/graphics/evas-loader-bmp/Makefile b/graphics/evas-loader-bmp/Makefile
index 8b5862b8e9de..13be8f989c9f 100644
--- a/graphics/evas-loader-bmp/Makefile
+++ b/graphics/evas-loader-bmp/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/bmp
diff --git a/graphics/evas-loader-eet/Makefile b/graphics/evas-loader-eet/Makefile
index f8fcc3e178bc..ff958580bb6e 100644
--- a/graphics/evas-loader-eet/Makefile
+++ b/graphics/evas-loader-eet/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas eet librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/eet \
diff --git a/graphics/evas-loader-generic/Makefile b/graphics/evas-loader-generic/Makefile
index 56dffd5cd3df..436c8ea7f29d 100644
--- a/graphics/evas-loader-generic/Makefile
+++ b/graphics/evas-loader-generic/Makefile
@@ -23,8 +23,8 @@ OPTIONS+=	${NODE:U} "Install ${NODE} evas generic loader" on
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/generic
diff --git a/graphics/evas-loader-ico/Makefile b/graphics/evas-loader-ico/Makefile
index 3c37ffe9380c..068739d6ea04 100644
--- a/graphics/evas-loader-ico/Makefile
+++ b/graphics/evas-loader-ico/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/ico
diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile
index 5e39642237f9..5b9a3a38d522 100644
--- a/graphics/evas-loader-jpeg/Makefile
+++ b/graphics/evas-loader-jpeg/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/jpeg \
diff --git a/graphics/evas-loader-pmaps/Makefile b/graphics/evas-loader-pmaps/Makefile
index 369744b65431..fe6441358eda 100644
--- a/graphics/evas-loader-pmaps/Makefile
+++ b/graphics/evas-loader-pmaps/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/pmaps
diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile
index a232ca9c7aa7..02ae200937ce 100644
--- a/graphics/evas-loader-png/Makefile
+++ b/graphics/evas-loader-png/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/png \
diff --git a/graphics/evas-loader-psd/Makefile b/graphics/evas-loader-psd/Makefile
index 06676d36050c..37bbc2fade3f 100644
--- a/graphics/evas-loader-psd/Makefile
+++ b/graphics/evas-loader-psd/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/psd
diff --git a/graphics/evas-loader-tga/Makefile b/graphics/evas-loader-tga/Makefile
index c19a69588836..ee44c86a0a4a 100644
--- a/graphics/evas-loader-tga/Makefile
+++ b/graphics/evas-loader-tga/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/tga
diff --git a/graphics/evas-loader-tiff/Makefile b/graphics/evas-loader-tiff/Makefile
index 3d422fcd6330..545ad598e497 100644
--- a/graphics/evas-loader-tiff/Makefile
+++ b/graphics/evas-loader-tiff/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/tiff \
diff --git a/graphics/evas-loader-wbmp/Makefile b/graphics/evas-loader-wbmp/Makefile
index 61355bc9e3e3..f19064449a02 100644
--- a/graphics/evas-loader-wbmp/Makefile
+++ b/graphics/evas-loader-wbmp/Makefile
@@ -17,8 +17,8 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/wbmp
diff --git a/graphics/evas_generic_loaders-raw/Makefile b/graphics/evas_generic_loaders-raw/Makefile
index 24cd6127dd53..3251f238c5b5 100644
--- a/graphics/evas_generic_loaders-raw/Makefile
+++ b/graphics/evas_generic_loaders-raw/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	raw:${PORTSDIR}/graphics/libraw
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	eina
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
diff --git a/graphics/evas_generic_loaders-xcf/Makefile b/graphics/evas_generic_loaders-xcf/Makefile
index b2f98e207b46..f68c67c5e231 100644
--- a/graphics/evas_generic_loaders-xcf/Makefile
+++ b/graphics/evas_generic_loaders-xcf/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_EFL=	eina
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index f9fb7baf0288..cc0e9d0c1da6 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Command line utility to read and manipulate EXIF data
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		popt.0:${PORTSDIR}/devel/popt
 
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV+=		POPT_CFLAGS=-I${LOCALBASE}/include POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index ea27dbc6e245..9cf3c9f18cdc 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -1,10 +1,4 @@
-# vim:ts=8:sw=8
-# New ports collection makefile for:	freeglut
-# Date created:		Wed Apr 23 2003
-# Whom:			thierry@pompo.net
-#
 # $FreeBSD$
-#
 
 PORTNAME=	freeglut
 PORTVERSION=	2.8.0
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index f6dac3d89aaa..da16f923b53c 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fv
-# Date created:				07 Sep 2005
-# Whom:					Igor Pokrovsky <ip@doom.homeunix.org>
-#
+# Created by: Igor Pokrovsky <ip@doom.homeunix.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fv
 PORTVERSION=	1.03
@@ -19,10 +15,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+USES=		pkgconfig
 USE_ZIP=	yes
 USE_GL=		glut
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 ALL_TARGET=	${PORTNAME}
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index d2de454bef8d..4b05112a4276 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -22,8 +22,7 @@ SPIRO_DESC=	Spiro support
 #UMFPACK_DESC=	UMFpack support
 
 USE_GNOME=	glib20 intltool
-USES=		pathfix
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index dfb752871da0..5b41985fe07d 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -16,11 +16,11 @@ BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
 		gm4:${PORTSDIR}/devel/m4
 LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	glib20
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 4f7fe952f8e8..fad87c63a92e 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	giblib
-# Date created:				12 Nov 2000
-# Whom:					Jeremy Norris <ishmael27@home.com>
-#
+# Created by: Jeremy Norris <ishmael27@home.com>
 # $FreeBSD$
-#
 
 PORTNAME=	giblib
 PORTVERSION=	1.2.4
@@ -15,11 +11,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility library that includes a wrapper for imlib2
 
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index abfed61df2bf..ca8412d77978 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -39,8 +39,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier \
 		desktopfileutils
-USES=		pathfix
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index e4ae296bbcf5..dba841e27e49 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	A command-line frontend to libgphoto2
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		gphoto2:${PORTSDIR}/graphics/libgphoto2
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-cdk
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index dc23089a2d56..b0500966289a 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/gould/${PORTNAME}/release%20${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ based screen capture
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 USE_GNOME=	gtk20 libwnck libxml2
 USE_XORG=	x11 xmu
-USE_PKGCONFIG=	yes
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include/libxml2
 
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 93ca7927abca..44ca67208d5c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -16,12 +16,11 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS
 
 USE_XZ=	yes
 USE_GETTEXT=	yes
-USES=		bison pathfix
+USES=		bison pathfix pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2
 WANT_GSTREAMER=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/iccxml/Makefile b/graphics/iccxml/Makefile
index c86fb922ae77..7df3c4407b93 100644
--- a/graphics/iccxml/Makefile
+++ b/graphics/iccxml/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tools for reading and writing the ICC profile contents as XML files
 
 LIB_DEPENDS=	SampleICC:${PORTSDIR}/graphics/sampleicc
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GCC=	any
 USE_GNOME=	libxml2
diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile
index 168a501b5ccf..18b7960bde1f 100644
--- a/graphics/icon-slicer/Makefile
+++ b/graphics/icon-slicer/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 30de1b3f1285..39466683f343 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD
 
 CONFLICTS=	OpenEXR-1.[0-4].*
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 7902daddd2a1..a4f633f93801 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -17,10 +17,10 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}/src
 
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_LUA=	5.1
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 USE_QT4=	gui qt3support qmake_build moc_build uic_build rcc_build
 MAN1=		ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 ipescript.1
 
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 61c09f1737a5..4befc73d11e0 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -13,10 +13,10 @@ LICENSE=	LGPL3
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	yes
 
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 64d621092ef8..1557e3e82a88 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -11,7 +11,7 @@ COMMENT=	OpenGL library that renders using GLX or DRI
 LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
 
 SUB_FILES=	pkg-install pkg-deinstall
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 444ab959a345..8f4cb5e2472c 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/libcaca/
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Graphics library that outputs text instead of pixels
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	ltverhack
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-doc \
diff --git a/graphics/libcdr/Makefile b/graphics/libcdr/Makefile
index 833a34083474..901c3d0b8a98 100644
--- a/graphics/libcdr/Makefile
+++ b/graphics/libcdr/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=	icui18n:${PORTSDIR}/devel/icu \
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-werror --without-docs
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 CXXFLAGS+=	-Wno-long-long
 
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index c169a238f0ed..efcbb24e9832 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Library to read digital camera file meta-data
 
 LICENSE=	LGPL21
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 1a5472c1d8da..5d4d2e6e05fe 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -14,9 +14,9 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
 MAKE_JOBS_SAFE=	yes
+USES=		pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index 0ec191ffbdbb..3c6ca738cb21 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -13,8 +13,7 @@ COMMENT=	A C library for encoding data in a QR Code symbol
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
-USE_PKGCONFIG=	yes
-USES+=		pathfix
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
index 428f427aab6f..6ef5eaf0da84 100644
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	spatialite:${PORTSDIR}/databases/spatialite \
 		freexl:${PORTSDIR}/textproc/freexl
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index 774e16d5b33e..d3c109f01cd0 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -31,8 +31,8 @@ LIB_DEPENDS=	mspack:${PORTSDIR}/archivers/libmspack \
 		xcb:${PORTSDIR}/x11/libxcb
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index cb47ca979f9d..e1069dc04391 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libvisual
-# Date created:		23 oktober 2004
-# Whom:			Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#
 
 # WARNING: when updating this port check if the ports that use libvisual
 # can work with it. Backwards compatibility is known to be broken in the past.
@@ -17,10 +13,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction library that sits between apps and visual plugin
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index cc506bb134e2..696ca10b6ea4 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -14,11 +14,11 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	wpd-0.9:${PORTSDIR}/textproc/libwpd
 
 USE_AUTOTOOLS=	libtool
+USES=		pkgconfig
 USE_GNOME=	gnomeprefix gnomehack ltverhack
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 CONFIGURE_ARGS=	--disable-werror
 
 OPTIONS_DEFINE=	DOCS
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 0c6cc545f402..8203889489b5 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -68,7 +68,7 @@ LIB_DEPENDS+=		agg:${PORTSDIR}/graphics/agg
 LIB_DEPENDS+=		cairo:${PORTSDIR}/graphics/cairo \
 			expat:${PORTSDIR}/textproc/expat2
 CONFIGURE_ARGS+=	--with-cairo=yes --with-expat=${LOCALBASE}
-USE_PKGCONFIG=		yes
+USES+=			pkgconfig
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO_SVG}
@@ -78,7 +78,7 @@ LIB_DEPENDS+=		cairo:${PORTSDIR}/graphics/cairo \
 CONFIGURE_ARGS+=	--with-cairo=yes \
 			--with-libsvg-cairo \
 			--with-expat=${LOCALBASE}
-USE_PKGCONFIG=		yes
+USES+=			pkgconfig
 .endif
 
 .if ${PORT_OPTIONS:MKML}
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 401f79be40b1..135289f27408 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 
 USE_GMAKE=	yes
 MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man
+USES=		pkgconfig
 USE_XORG=	x11 xext
-USE_PKGCONFIG=	build
 MAN1=		mupdf.1 mubusy.1 mudraw.1
 
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/openexr_ctl/Makefile b/graphics/openexr_ctl/Makefile
index 110a6a284c31..d4915aaff54a 100644
--- a/graphics/openexr_ctl/Makefile
+++ b/graphics/openexr_ctl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openexr_ctl
-# Date created:				2007-10-09
-# Whom:					nork@FreeBSD.org
-#
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	openexr_ctl
 PORTVERSION=	1.0.1
@@ -18,7 +14,7 @@ LICENSE=	BSD
 LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		IlmCtl:${PORTSDIR}/graphics/ampasCTL
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index 5db6e4e79fc2..2a6e351a4791 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	pngwriter
-# Date created:			Nov 7, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	pngwriter
 PORTVERSION=	0.5.4
@@ -18,7 +13,7 @@ COMMENT=	C++ library for creating PNG images
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 438e53d214c8..11433fa2864c 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -20,9 +20,8 @@ EMF_DESC=	Enable emf interface
 MING_DESC=	Enable swf interface
 PLOTUTILS_DESC=	Enable libplot interface
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_GHOSTSCRIPT=	yes
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=yes
diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index f371ad88b063..5eb67aae5b5c 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	qtgtl
-# Date created:				28 September 2009
-# Whom:					Alberto Villa <villa.alberto@gmail.com>
-#
+# Created by: Alberto Villa <villa.alberto@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	qtgtl
@@ -19,10 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	GTLCore.0:${PORTSDIR}/graphics/opengtl
 
-USE_PKGCONFIG=	build
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 484dd1ac7352..d170649ae3bc 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rawtherapee
-# Date created:				01/10/2010
-# Whom:					stas
-#
+# Created by: stas
 # $FreeBSD$
-#
 
 PORTNAME=	rawtherapee
 PORTVERSION=	4.0.9
@@ -23,12 +19,11 @@ LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		tiff:${PORTSDIR}/graphics/tiff \
 		sigc-2.0:${PORTSDIR}/devel/libsigc++20
 
-USES=		cmake
+USES=		cmake pkgconfig
 MAKE_JOBS_SAFE=	yes
 USE_XZ=		yes
 USE_GNOME=	gtk20 glib20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
 CXXFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 25d613e3972f..694deca26e03 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		cairo.2:${PORTSDIR}/graphics/cairo
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
@@ -24,7 +25,6 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_XFCE=	configenv libmenu libutil xfconf
 USE_XORG=	x11
-USE_PKGCONFIG=	build
 
 post-install:
 	@-update-desktop-database
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 835fb9aa5946..c912fc3789ec 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -30,8 +30,7 @@ USB_DESC=	USB support
 GPHOTO2_DESC=	gPhoto2 support
 IEEE1284_DESC=	libieee1284 support
 
-USES=	pathfix
-USE_PKGCONFIG=	yes
+USES=	pathfix pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${WRKDIR}/tmproot \
diff --git a/graphics/silgraphite/Makefile b/graphics/silgraphite/Makefile
index 3bf0f5501adc..c7381abce9ed 100644
--- a/graphics/silgraphite/Makefile
+++ b/graphics/silgraphite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Font engine for complex non-Roman writing systems
 OPTIONS_DEFINE=	FREETYPE
 OPTIONS_DEFAULT=	FREETYPE
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-xft --without-pangographite
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index b3a0aa0f84f7..c2df54a3b497 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		bison
+USES=		bison pkgconfig
 USE_ICONV=	yes
-USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index efd9a9b2d86e..0a1775bb88fc 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	swftools
-# Date created:			Feb 9, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	swftools
 PORTVERSION=	0.9.2
@@ -27,9 +22,9 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 
 OPTIONS_DEFINE=	LAME PDF
 
+USES=		pkgconfig
 USE_GL=		glut
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_lib_zzip_zzip_file_open=no
 
diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile
index e9ef65a5846c..307bb191a639 100644
--- a/graphics/tif22pnm/Makefile
+++ b/graphics/tif22pnm/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	tif22pnm
-# Date created:			Jan 7, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	tif22pnm
 PORTVERSION=	0.14
@@ -21,7 +16,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff
 
 PROJECTHOST=	sam2p
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libtiff-ldir=${LOCALBASE}/lib \
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 021238b6856a..b978bc6831f5 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS=	avcodec1:${PORTSDIR}/multimedia/ffmpeg1 \
 		expat:${PORTSDIR}/textproc/expat2
 
 USE_BZIP2=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_WX=		yes
 WX_CONF_ARGS=	absolute
 USE_GNOME=	cairo
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}"
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index 673968f8f74d..31831604a168 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -21,10 +21,9 @@ TESSERACT_DESC=		Tesseract OCR engine
 
 OPTIONS_DEFAULT=	CUNEIFORM
 
-USES=		cmake
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_PKGCONFIG=	build
 USE_GNOME=	desktopfileutils
 USE_QT4=	corelib gui imageformats linguist_build \
 		moc_build qmake_build rcc_build uic_build