Finish converting the whole ports tree to USES=pkgconfig

58 files changed, 82 insertions, 184 deletions

diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 1881cc5a1a4f..858d8e0d61ba 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -15,10 +15,9 @@ MAN1=		archivemount.1
 GNU_CONFIGURE=	yes
 
 NO_INSTALL_MANPAGES=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	yes
 USE_GCC=	4.2+
 
 .include <bsd.port.mk>
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 684bdddb1d6c..fbc854c6888c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -13,12 +13,12 @@ COMMENT=	An advanced, highly configurable system monitor for X
 CONFLICTS?=	conky-awesome-[0-9]*
 SLAVEDIRS=	sysutils/conky-awesome
 
+USES=		pkgconfig
 USE_ICONV=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-hddtemp \
 			--disable-alsa \
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 9df6b0d593d8..dc8b95141acc 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -15,12 +15,11 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_BZIP2=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack nautilus2 libgnomeui
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 72aa2a02f99e..2523994475a9 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	flashrom
-# Date created:				06 May 2009
-# Whom:					Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	flashrom
 PORTVERSION=	0.9.6.1
@@ -45,7 +41,7 @@ RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
 
 .if ${PORT_OPTIONS:MFTDI}
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 LIB_DEPENDS+=	ftdi:${PORTSDIR}/devel/libftdi
 .endif
 
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index 99927db1e7f0..f8150be3650f 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -17,8 +17,7 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	AUTHORS ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 
-USES=		fuse
-USE_PKGCONFIG=	yes
+USES=		fuse pkgconfig
 
 MAN1=		afuse.1
 
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 294aa4f5f584..6731d95bc0d9 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
-USES=		fuse
+USES=		fuse pkgconfig
 
 PLIST_FILES=	bin/cryptofs
 
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 33f4022d95fa..24a714406037 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Mount remote ftp directories
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/curlftpfs
 
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 87704311dbbe..21c1582a9a3d 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -20,10 +20,9 @@ VCHMOD_DESC=	Fake hook for chmod that just returns 0
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include -DFUSE_USE_VERSION=26
 
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index addcb58179b0..cda7ce393988 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Interface between FUSE and the Gnome VFS 2.0
 
 RPORTNAME=	gnome-vfs-fuse
 WRKSRC=		${WRKDIR}/${RPORTNAME}
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GNOME=	gnomevfs2
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 PLIST_FILES=	bin/gnomevfs-mount
 PORTDOCS=	README
 
diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile
index aecd5db7e4ff..2cd800069ae1 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/sysutils/fusefs-httpfs/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Fuse-based http filesystem
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${VERSION}
 
 VERSION=	0.1.5
-USES=		fuse
-USE_PKGCONFIG=	yes
+USES=		fuse pkgconfig
 USE_GMAKE=	yes
 CFLAGS+=	-D__BSD_VISIBLE
 ALL_TARGET=	httpfs2
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 36f7435a424a..4524dc317605 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	FUSE allows filesystem implementation in userspace
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MOUNT_FUSE_PATH=${PREFIX}/sbin
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/sysutils/fusefs-mhddfs/Makefile b/sysutils/fusefs-mhddfs/Makefile
index 1e7eb9703c07..81f060cf5827 100644
--- a/sysutils/fusefs-mhddfs/Makefile
+++ b/sysutils/fusefs-mhddfs/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	proler@gmail.com
 COMMENT=	Multi HDD [FUSE] File System
 
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 MAKE_ARGS=	WITHOUT_XATTR=1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index e84fc4d3082f..60f439656f10 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -16,11 +16,10 @@ LICENSE=	GPLv2
 
 CONFLICTS_BUILD=	bonobo-1.*
 CONFLICTS_INSTALL=	ntfsprogs-*
-USES=		fuse
+USES=		fuse pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
-USE_PKGCONFIG=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
 		--disable-mtab --with-fuse=external
 CPPFLAGS+=	-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index 16aa6255596a..23a4b208197a 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Mount remote directories over ssh
 KMODDIR?=	${LOCALBASE}/modules
 
 GNU_CONFIGURE=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 
 MAN1=	sshfs.1
 
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 846480697466..3ddfb3387dae 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Mount remote WedDAV directories with Fuse
 LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 
 GNU_CONFIGURE=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 
 PLIST_FILES=	bin/wdfs
 
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index 8771ed110a6e..5b7714043187 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -13,8 +13,7 @@ LICENSE=	LGPL3
 LIB_DEPENDS=	zip:${PORTSDIR}/archivers/libzip
 
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
-USES=		fuse
+USES=		fuse pkgconfig
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index 5b46bdd7713e..4fe97d990c37 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -15,7 +15,7 @@ SUB_FILES=	pkg-message
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gconf2
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL README
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index b150081ad33d..9b813b1e922f 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	garcon
-# Date created:				11 January 2011
-# Whom:					Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	garcon
 PORTVERSION=	0.2.0
@@ -20,7 +16,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 intltool intlhack
 USE_XFCE=	configenv libutil
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index a838a353ef50..da0887487b9c 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gkleds2
-# Date Created:		Dec 10 2002
-# Whom:			Jan Stocker <Jan.Stocker@t-online.de>
-#
+# Created by: Jan Stocker <Jan.Stocker@t-online.de>
 # $FreeBSD$
-#
 
 PORTNAME=	gkleds2
 PORTVERSION=	0.8.2
@@ -18,11 +14,11 @@ COMMENT=	GKrellM Leds for CapsLock, NumLock, and ScrollLock
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
+USES=		pkgconfig
 USE_XORG=	x11 xtst
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 02c348250c12..139f43c47b29 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	gksu2:${PORTSDIR}/sysutils/libgksu \
 		nautilus-extension:${PORTSDIR}/x11-fm/nautilus \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring
 
-USES=		pathfix
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
 USE_GNOME=	desktopfileutils gconf2 gnomeprefix gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index cd6628728d17..dd24a973ebe4 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	goaccess
-# Date created:		2010-11-17
-# Whom:			Sofian Brabez <sbrabez@gmail.com>
-#
+# Created by: Sofian Brabez <sbrabez@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	goaccess
 PORTVERSION=	0.5
@@ -22,7 +18,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index e129fdd18a55..684a30a5a761 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -18,8 +18,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_CDRTOOLS=	yes
-USE_PKGCONFIG=	build
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	libglade2 intlhack gnomeprefix
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index f7a916f8dc7f..3a426fd7dcd1 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gsmartcontrol
-# Date created:		2009-03-25
-# Whom:			Pawel Pekala <c0rn@o2.pl>
-#
+# Created by: Pawel Pekala <c0rn@o2.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	gsmartcontrol
 PORTVERSION=	0.8.7
@@ -32,10 +28,10 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		smartctl:${PORTSDIR}/sysutils/smartmontools
 
 USE_AUTOTOOLS=	libtool
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 USE_GNOME=	gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender 
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 6106f5ae482c..ac3dad016e4a 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
diff --git a/sysutils/hardlink/Makefile b/sysutils/hardlink/Makefile
index 4630309195ac..f3031404bd97 100644
--- a/sysutils/hardlink/Makefile
+++ b/sysutils/hardlink/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hardlink
-# Date created:				14 January 2011
-# Whom:					Douglas Thrift
-#
+# Created by: Douglas Thrift
 # $FreeBSD$
-#
 
 PORTNAME=	hardlink
 PORTVERSION=	0.2.0
@@ -17,7 +13,7 @@ COMMENT=	Replace file copies using hardlinks
 
 LICENSE=	MIT
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 MAN1=		hardlink.1
 PLIST_FILES=	bin/hardlink
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index c92121c671db..7918f128ad9a 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -21,11 +21,11 @@ RUN_DEPENDS=	mcrypt:${PORTSDIR}/security/mcrypt \
 		gpgv:${PORTSDIR}/security/gnupg1 \
 		lzop:${PORTSDIR}/archivers/lzop
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	autoconf
 
 MAN1=		hdup.1
diff --git a/sysutils/iextract/Makefile b/sysutils/iextract/Makefile
index 059e37b3050b..0363018cb451 100644
--- a/sysutils/iextract/Makefile
+++ b/sysutils/iextract/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	IExtract
-# Date created:		19 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	IExtract
 PORTVERSION=	0.9.30
@@ -19,7 +15,7 @@ LIB_DEPENDS=	YGP.0:${PORTSDIR}/devel/libYGP
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} --disable-rpath
 
 .include <bsd.port.mk>
diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile
index 0ce4953d2d3c..4c0e19c749fa 100644
--- a/sysutils/kcm-polkit-kde/Makefile
+++ b/sysutils/kcm-polkit-kde/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS=	polkit-qt-agent-1:${PORTSDIR}/sysutils/polkit-qt
 RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USE_PKGCONFIG=	build
 USE_QT4=	dbus xml moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 36a976abc15c..a2627973b702 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	autoconf automake aclocal
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	LCDd lcdproc lcdexec
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS=	--enable-drivers="${LCDPROC_DRIVERS}" \
 		--disable-dependency-tracking \
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 065b0b51e4a7..b91da3a5564b 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop \
 RUN_DEPENDS=	xauth:${PORTSDIR}/x11/xauth \
 		sudo:${PORTSDIR}/security/sudo
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	desktopfileutils glib20 gconf2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-gtk-doc=no
diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile
index 62ab5d4aae9c..2800938e5318 100644
--- a/sysutils/libzeitgeist/Makefile
+++ b/sysutils/libzeitgeist/Makefile
@@ -10,12 +10,11 @@ MASTER_SITES=	https://launchpadlibrarian.net/100152436/ \
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Zeitgeist client library
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 intltool intlhack
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 246ca464a26c..3450a82f463c 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Moosefs client tools
 
 DISTINFO_FILE=	${.CURDIR}/../moosefs-master/distinfo
 
-USES=		fuse
-USE_PKGCONFIG=	yes
+USES=		fuse pkgconfig
 
 MAN1=		mfstools.1 mfscheckfile.1 mfsdirinfo.1 mfsfileinfo.1 \
 		mfsfilerepair.1 mfsgetgoal.1 mfsgettrashtime.1 \
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index e3569d984513..0f0f9897979a 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -13,9 +13,8 @@ LICENSE=	GPLv2
 
 CONFLICTS_INSTALL=	fusefs-ntfs-*
 
-USE_PKGCONFIG=	build
 USE_BZIP2=	yes
-USES=		fuse
+USES=		fuse pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index c3cc8ffe1a3c..893c54a4d83f 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 NO_LATEST_LINK=	yes
 
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index fad6a94d8d23..c02d05ba6b1c 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Write filesystems in Perl using FUSE
 PERL_CONFIGURE=	yes
 PORTSCOUT=	skipv:0.09_4
 
-USES=		fuse
-USE_PKGCONFIG=	build
+USES=		fuse pkgconfig
 
 MAN3=		Fuse.3
 
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3a129234ab23..5c573e2f025b 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehack glib20 intlhack gnomehier
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index b9876105fafd..5cd202cdf409 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 #   $MCom: ports/sysutils/pyrenamer/Makefile,v 1.1 2007/08/14 21:33:09 mezz Exp $
+
 PORTNAME=	pyrenamer
 PORTVERSION=	0.6.0
 PORTREVISION=	5
@@ -9,12 +10,11 @@ MASTER_SITES=	http://www.infinicode.org/code/pyrenamer/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mass file renamer written in PyGTK
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gconf2 pygtk2
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index ebdbff95e4cf..451a1873a495 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	synergys:${PORTSDIR}/sysutils/synergy
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix libglade2
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 51e381be047b..65b22c37f258 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
 USE_BZIP2=	yes
 
 USE_AUTOTOOLS=	autoconf
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/sysutils/rsyslog5-relp/Makefile b/sysutils/rsyslog5-relp/Makefile
index fa248bb11457..c68f3f43a22e 100644
--- a/sysutils/rsyslog5-relp/Makefile
+++ b/sysutils/rsyslog5-relp/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	RELP input/output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog5
 
 MNAME=	relp
 LIB_DEPENDS=	relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-relp
 
diff --git a/sysutils/rsyslog5-rfc3195/Makefile b/sysutils/rsyslog5-rfc3195/Makefile
index c87028d2ec0c..1cc5803a904d 100644
--- a/sysutils/rsyslog5-rfc3195/Makefile
+++ b/sysutils/rsyslog5-rfc3195/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	RFC3195 input support for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog5
@@ -11,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../rsyslog5
 MNAME=	rfc3195
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-rfc3195
 
diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile
index 62df117f8d20..91f3fd4a4b2b 100644
--- a/sysutils/rsyslog5/Makefile
+++ b/sysutils/rsyslog5/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	rsyslog
 PORTVERSION=	5.10.0
@@ -42,7 +38,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/rsyslog
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 OPTIONS=	DEBUG	"Enable debugging"	off
 
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index 9b3494054c57..92e98189c8cb 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -1,9 +1,5 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 PORTREVISION=	1
 
@@ -14,7 +10,7 @@ MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile
index 9ce6cc8988a7..4bff5126b1a0 100644
--- a/sysutils/rsyslog6-devel-relp/Makefile
+++ b/sysutils/rsyslog6-devel-relp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	RELP input/output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6-devel
@@ -11,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 MNAME=	relp
 LIB_DEPENDS=	relp.0:${PORTSDIR}/devel/librelp
 
-USE_PKGCONFIG=	yes
+USEs=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-relp
 
diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile
index e32ba5bd514a..b9c32036ab06 100644
--- a/sysutils/rsyslog6-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog6-devel-rfc3195/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	RFC3195 input support for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6-devel
@@ -11,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 MNAME=	rfc3195
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
 
-USE_PKGCONFIG=	yes
+USES+=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-rfc3195
 
diff --git a/sysutils/rsyslog6-gnutls/Makefile b/sysutils/rsyslog6-gnutls/Makefile
index 9a4169457ad6..57657e524a5c 100644
--- a/sysutils/rsyslog6-gnutls/Makefile
+++ b/sysutils/rsyslog6-gnutls/Makefile
@@ -1,9 +1,5 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 PORTREVISION=	1
 
@@ -14,7 +10,7 @@ MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-gnutls
 
diff --git a/sysutils/rsyslog6-relp/Makefile b/sysutils/rsyslog6-relp/Makefile
index 7224976e39c5..cd2275da2028 100644
--- a/sysutils/rsyslog6-relp/Makefile
+++ b/sysutils/rsyslog6-relp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	RELP input/output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
@@ -11,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../rsyslog6
 MNAME=	relp
 LIB_DEPENDS=	relp.0:${PORTSDIR}/devel/librelp
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-relp
 
diff --git a/sysutils/rsyslog6-rfc3195/Makefile b/sysutils/rsyslog6-rfc3195/Makefile
index d0521d2be5cd..b18847ac0770 100644
--- a/sysutils/rsyslog6-rfc3195/Makefile
+++ b/sysutils/rsyslog6-rfc3195/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 #
 # $FreeBSD$
 #
@@ -11,7 +9,7 @@ MASTERDIR=	${.CURDIR}/../rsyslog6
 MNAME=	rfc3195
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
 
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--enable-rfc3195
 
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 6a957dcf1f7c..b0da1344243c 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -34,7 +34,7 @@ SNMP_DESC=	SNMP trap sender for rsyslog
 
 .if ${PORT_OPTIONS:MDBI}
 LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
-USE_PKGCONFIG=	yes
+USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 		lib/rsyslog/omlibdbi.so
@@ -43,7 +43,7 @@ PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
-USE_PKGCONFIG=	yes
+USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
 		lib/rsyslog/lmnsd_gtls.so
@@ -75,7 +75,7 @@ PLIST_FILES+=	lib/rsyslog/ompgsql.so \
 
 .if ${PORT_OPTIONS:MRELP}
 LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.la \
 		lib/rsyslog/imrelp.so \
@@ -85,7 +85,7 @@ PLIST_FILES+=	lib/rsyslog/imrelp.la \
 
 .if ${PORT_OPTIONS:MRFC3195}
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.la \
 		lib/rsyslog/im3195.so
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 1a0e5df136dc..b15b3e202fff 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -13,9 +13,8 @@ COMMENT=	A GNOME applet displaying hardware sensor values
 RUN_DEPENDS=	mbmon:${PORTSDIR}/sysutils/mbmon \
 		smartctl:${PORTSDIR}/sysutils/smartmontools
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomepanel libgnomeui
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 DEFINES=	-DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 0ed5d94e0ebe..c83436941592 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	serpentine
-# Date created:		2005-06-25
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/sysutils/serpentine/Makefile,v 1.4 2006/08/31 05:21:45 marcus Exp $
 
@@ -17,11 +14,11 @@ COMMENT=	Gnome Audio Cd Burner
 BUILD_DEPENDS=	xmlproc_parse:${PORTSDIR}/textproc/py-xml
 RUN_DEPENDS=	xmlproc_parse:${PORTSDIR}/textproc/py-xml
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pygnomedesktop intlhack
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GSTREAMER=	core gnomevfs python
 USE_PYTHON=	2.4+
 
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index e2e79befc53d..202a0594b1b3 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A Terminal Multiplexer
 LICENSE=	BSD
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		tmux.1
 
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 147395fca79d..8220beac11fc 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS=	confuse:${PORTSDIR}/devel/libconfuse \
 		cdio:${PORTSDIR}/sysutils/libcdio
 
 USE_BZIP2=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--disable-doc
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 2f2d1de46c78..063accbe64b9 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wmfire
-# Date created:				21 October 1999
-# Whom:					Chris D. Faulhaber <jedgar@fxp.org>
-#
+# Created by: Chris D. Faulhaber <jedgar@fxp.org>
 # $FreeBSD$
-#
 
 PORTNAME=	wmfire
 PORTVERSION=	1.2.4
@@ -16,8 +12,8 @@ COMMENT=	Window Maker dock app showing load average as a flame
 
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
+USES=		pkgconfig
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index ace6f1378253..15d99c0a5db0 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -1,6 +1,5 @@
 # Created by: J.R. Oldroyd <fbsd@opal.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xfburn
 PORTVERSION=	0.4.3
@@ -24,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool
 USE_XFCE=	configenv libexo libgui
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 90e6f32b4234..cf54a06b0692 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfce4-fsguard-plugin
-# Date created:		2003-12-20
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
+# Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	1.0.1
@@ -22,7 +18,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 USE_XORG=	x11
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 OPTIONS_DEFINE= NLS
 
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 38b609ed5cfb..ec9e68dc51c9 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfce-netload-plugin
-# Date created:				3 September 2003
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	1.2.0
@@ -20,8 +16,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intltool intlhack
 USE_XFCE=	configenv libmenu panel
+USES=		pkgconfig
 INSTALLS_ICONS=	yes
-USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index e2582b3da009..8e2382ea176e 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,6 +1,5 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.10.0
@@ -22,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gtk20 desktopfileutils intltool intlhack
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	inputproto x11 xi
-USE_PKGCONFIG=	build
+USEs=		pkgconfig
 
 CONFIGURE_ARGS=	--enable-pluggable-dialogs \
 		--enable-gio-unix