42 files changed, 50 insertions, 97 deletions

diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 152e0b66ede9..da098c6e7187 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	apwal
-# Date created:			Nov 26, 2003
-# Whom:				Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-#
+# Created by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
 # $FreeBSD$
-#
 
 PORTNAME=	apwal
 PORTVERSION=	0.4.5
@@ -16,7 +12,7 @@ COMMENT=	Simple and powerful application launcher
 
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 752a95653209..665892b79e81 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -18,12 +18,11 @@ LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20 gtk20 pygtk2
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index f80b523e2f09..3db5b000fe6e 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -20,8 +20,7 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack
-USE_PKGCONFIG=	build
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-introspection
 
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 23914724a0c4..757c20d3bc3c 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	DeCurs
-# Date created:				19 January 2002
-# Whom:				Miguel Mendez <flynn@energyhq.homeip.net>
-#
+# Created by: Miguel Mendez <flynn@energyhq.homeip.net>
 # $FreeBSD$
-#
 
 PORTNAME=	decurs
 PORTVERSION=	0.55.1
@@ -20,7 +16,7 @@ LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20
 USE_XORG=	x11
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index f36c6b0ed2a2..fee71544fbc7 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -17,9 +17,8 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	Desktop:${PORTSDIR}/x11/deforaos-libdesktop
 
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig gettext
 USE_XORG=	xtst
-USE_GETTEXT=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile
index e537c39266c9..3a9b62e41f77 100644
--- a/x11/deforaos-libdesktop/Makefile
+++ b/x11/deforaos-libdesktop/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem
 
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 670e7c8b852b..5b517d5afc97 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -21,8 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:${PORTSDIR}/x11/deforaos-
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
 USE_GNOME=	gtk20 desktopfileutils
-USE_PKGCONFIG=	build
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${MANPREFIX}/man
 
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index 1bc75345e29d..a451124a1783 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	keyboard:${PORTSDIR}/x11/deforaos-keyboard \
 		sudo:${PORTSDIR}/security/sudo
 
 USE_GNOME=	gtk20 desktopfileutils
-USE_PKGCONFIG=	build
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
index df3cf471bac8..8aa630237491 100644
--- a/x11/ecore-imf/Makefile
+++ b/x11/ecore-imf/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore libtool_hack
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_imf
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
index 68c9cf902a74..029ba4584dfd 100644
--- a/x11/ecore-imf_evas/Makefile
+++ b/x11/ecore-imf_evas/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore evas libtool_hack
 USE_EFL_ECORE=	imf
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_imf_evas
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/x11/ecore-input/Makefile b/x11/ecore-input/Makefile
index fc97ae34048d..b458e1ce9a44 100644
--- a/x11/ecore-input/Makefile
+++ b/x11/ecore-input/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore libtool_hack
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_input
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/x11/ecore-input_evas/Makefile b/x11/ecore-input_evas/Makefile
index 9acd260cc94b..b3b0dc78dcbe 100644
--- a/x11/ecore-input_evas/Makefile
+++ b/x11/ecore-input_evas/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore evas libtool_hack
 USE_EFL_ECORE=	input
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_input_evas
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
index af5f1e5ed036..8ff4b9e32600 100644
--- a/x11/efreet/Makefile
+++ b/x11/efreet/Makefile
@@ -15,10 +15,9 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_EFL=	eet eina ecore libtool_hack librt_hack
 USE_EFL_ECORE=	file
-USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-nls
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 70ce2e052301..d3f545d1788c 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -18,7 +18,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		${PORTNAME}.1
 
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 28d14a792e9f..4f1090533197 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Program that keeps the content of your X clipboard in memory
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	gtk20
 MAKE_JOBS_SAFE=	yes
 
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index ffbe19424391..404447e01d69 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 0415f194f1b8..95149c54da86 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -60,10 +60,9 @@ REINPLACE_ARGS=	-e 's,%%DATADIR%%,${DATADIR},1' \
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTSDIR=${PORTSDIR}
 
-USES=		cmake
+USES+=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gconf2 gnomemenus gtk20 libwnck
-USE_PKGCONFIG=	build
 
 post-patch:
 	${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala \
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 2c6eb2156905..1e9ec372df30 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GRaphics Over Miscellaneous Objects (Gromit)
 
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 DOCS=		AUTHORS ChangeLog README
 
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 8a97fba1473d..f7bca55e05e8 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -13,10 +13,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	xf86-input-synaptics>0:${PORTSDIR}/x11-drivers/xf86-input-synaptics
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gconf2 libglade2 gnomedocutils
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 866226a41ae5..f5e46f0f0fb8 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A simple GTK-2 terminal with tabs
 
 USE_GNOME=	vte
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 
 PORTDOCS=	README
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 003ff531fee5..073723fad28c 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 OPTIONS_DEFINE=	SHAPE SN
 SHAPE_DESC=	Support of XShape extension
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index fbcb2cd27b07..54f191c1d0ae 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -48,8 +48,7 @@ USE_GNOME=	glib20
 USE_ICONV=	yes
 USE_KDE4=	kactivities kdehier kdelibs kdeprefix oxygen pimlibs \
 		akonadi automoc4 ontologies qimageblitz soprano strigi
-USES=		cmake:outsource
-USE_PKGCONFIG=	build
+USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib dbus declarative designer_build gui network \
 		opengl phonon qtestlib script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index cc02d1883436..584fb2d3df4d 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
 USE_XORG=	x11 xext xrender
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PYTHON LUA
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index 4d34d56a41fb..d503fe9a12a3 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Broadcast keystrokes to multiple X windows for Gnome2
 
 USE_XORG=	xmu
 USE_GNOME=	libwnck libglade2 gtk20
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 INSTALLS_ICONS=	yes
 
 post-install:
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index 782855fb48e9..c81193330321 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	X Colour Management Library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	xfixes xmu
 
 MAN3=		Xcm.3 XcmDDC.3 XcmEdidParse.3 XcmEvents.3 XcolorProfile.3 \
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index b6198c368bbb..bf32fcdb4e63 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 877d2fd6c4b1..57926a7f50ed 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_FAM=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index e80669127072..30e674df812e 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libxfce4menu
-# Date created:		7 Oktober 2008
-# Whom:			Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libxfce4menu
 PORTVERSION=	4.10.0
@@ -23,7 +19,7 @@ USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack desktopfileutils
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil xfconf
 INSTALLS_ICONS=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS=	--disable-gtk-doc-html \
 		--with-vendor-info=FreeBSD
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 89a0fe63af0f..932ce83e7920 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libxfce4util
-# Date created:		7 June 2003
-# Whom:			James Earl <jdearl@telus.net>
-#
+# Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	libxfce4util
 PORTVERSION=	4.10.0
@@ -22,7 +18,7 @@ USE_GNOME=	glib20 gnomehack intltool intlhack
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 025652003314..a95138c8f05d 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GNOME=	libglade2 vte
 USE_PYTHON_BUILD=	yes
 USE_GETTEXT=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool:env
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index e9026f933fa4..39da93b7004f 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -12,10 +12,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast and customizable dockbar
 
 GNU_CONFIGURE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix gconf2 libwnck
 USE_WX=		2.8
-USE_PKGCONFIG=	yes
 WX_CONF_ARGS=	absolute
 
 WRKSRC=		${WRKDIR}/trunk
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index ad784dfeaafe..739e6fcf859b 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -22,9 +22,8 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
-USES=		cmake
+USES=		cmake pkgconfig
 USE_XORG=	ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
-USE_PKGCONFIG=	build
 USE_RC_SUBR=	slim
 SUB_FILES=	pkg-message
 
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index c5cf41e35d18..120b7b9bf73f 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wmblob
-# Date created:				Thu Feb  6 12:24:23 MSK 2003
-# Whom:					Denis Shaposhnikov <dsh@vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh@vlink.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	wmblob
 PORTVERSION=	1.0.3
@@ -17,7 +13,7 @@ COMMENT=	Showing moving blobs
 USE_XORG=	xpm
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN1=		wmblob.1
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index dbba3d0e255e..5447c13e0a95 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	wmDrawer
-# Date created:			Apr 6, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	wmdrawer
 PORTVERSION=	0.10.5
@@ -21,7 +16,7 @@ COMMENT=	A dockapp which provides a drawer to launch applications
 
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 CONFIGURE_ENV+=	DOCSDIR=${DOCSDIR}
 MAKE_ENV+=	${CONFIGURE_ENV}
 
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 6f982cfd09c6..9a9ca2c7f0a6 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -23,8 +23,7 @@ DESKTOP_ENTRIES=	"Workrave" "RSI prevention tool" \
 					false
 
 USE_XORG=	x11 xmu recordproto xtst xext
-USES=		pathfix
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GNOME=	gnomeprefix intlhack gconf2 intltool
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index db2bd3f61248..e57cc34d6c5b 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack glib20 desktopfileutils
 USE_XFCE=	configenv libexo libmenu libutil panel xfconf
 USE_XORG=	xtst
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 INSTALLS_ICONS=	yes
 
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 8c3af5b5d309..89e98a1a17dc 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfce4-conf
-# Date created:		28 August 2008
-# Whom:			Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-conf
 PORTVERSION=	4.10.0
@@ -27,7 +23,7 @@ USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
 USE_XFCE=	configenv libutil
 USE_XORG=	x11
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index abe2873d72dd..0faf8e938f68 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -1,6 +1,5 @@
 # Created by: Martin Wilke (miwi@FreeBSD.org)
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-screenshooter-plugin
 PORTVERSION=	1.8.1
@@ -22,7 +21,7 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libexo libmenu libutil panel
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		xfce4-screenshooter.1
 
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 21dbc448131a..9fdeb9e0c27e 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack vte \
 	libxml2 desktopfileutils
 USE_XFCE=	configenv libmenu
 USE_XORG=	x11
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS=	--without-gnome-default-appsdir
 
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 6013f3472a0f..de313a3ecba8 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 intltool intlhack
 USE_XFCE=	configenv panel libexo libgui libutil
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 CONFIGURE_ARGS=	--disable-debug
 
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index cc00e6b9c5bc..f5ddfe14799a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	xpm
 USE_GL=		yes
 USE_GMAKE=	yes
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index fd97d140606c..918086f7ba8f 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	xvattr
-# Date created:			Jan 15, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	xvattr
 PORTVERSION=	1.3
@@ -21,7 +16,7 @@ GTK1_DESC=	GTK1 support (Default is GTK2)
 
 USE_XORG=	x11 xv
 WANT_GNOME=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME} bin/g${PORTNAME}