Finish converting the whole ports tree to USES=pkgconfig

14 files changed, 15 insertions, 29 deletions

diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index a0f1c747509f..2d917d09eb10 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -17,10 +17,9 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20 gconf2
 
 post-patch:
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 220060ba37c8..ecc8f88c55b2 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	-2.7
-USE_PKGCONFIG=	build
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
 USE_AUTOTOOLS=	libtool
 
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 9704c7dd5d27..b66f14418ccf 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Devil's Pie
-# Date created:			08 Jun 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	devilspie
 PORTVERSION=	0.22
@@ -18,7 +14,7 @@ USE_GNOME=	libwnck
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 3201f75390bc..8071a10e6190 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Standalone menu and keybinding editors for enlightenment 0.16
 LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
 USE_GNOME=	imlib gtk20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 SUB_STUBS=	e16menuedit-0.1 e16keyedit-0.7
 
diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile
index 2067a00d770b..150d96c20e1c 100644
--- a/x11-wm/echinus/Makefile
+++ b/x11-wm/echinus/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
 
 MAN1=		echinus.1
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 8a5250c10420..989f0850abf7 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -17,12 +17,11 @@ GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20 libwnck pango
 USE_XORG=	xrender
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 
 MAN1=		emerald.1 \
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index a5f9b95aa876..3472df704020 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -16,10 +16,9 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	intltool libxml2
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 4f9dfdf18e3e..c6c5d1f946fd 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 USE_XZ=		yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/sawfish/sawfishpager \
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 24ae9b0eeab5..4e03941760ee 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -30,7 +30,7 @@ PLIST_DIRS=	%%ETCDIR%%
 
 .if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 MAKE_ENV+=	EXTRA_INC="$$(pkg-config --cflags xft)" \
 		EXTRA_LIBS="$$(pkg-config --libs xft)"
 CFLAGS+=	-DXFT
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d5aa63ca8cbf..2dcd9d351484 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -27,8 +27,7 @@ OPTIONS_DEFINE=	NLS XRANDR
 
 USE_GCC=	any
 USE_XORG=	xft xinerama xmu xpm
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 87daa5ce8107..36d9cc87edd1 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_XORG=	x11 xft xpm
 HAS_CONFIGURE=	yes
 
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 6e500bfd722a..dd9bf8c7b7c4 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -1,6 +1,5 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.10.2
@@ -24,8 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack desktopfileutils
 USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
-USE_PKGCONFIG=	build
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_XORG=	x11 sm
 
 CONFIGURE_ARGS+=--enable-gio-unix \
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 3dea4e9ee4d7..0c524e6436fd 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -1,6 +1,5 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.10.0
@@ -16,7 +15,7 @@ LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
 		cairo:${PORTSDIR}/graphics/cairo \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
@@ -26,7 +25,6 @@ USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
-USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS+=--enable-gio-unix \
 		--disable-gtk-doc-html
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index d666907d25a0..c924ed11c2a9 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -1,6 +1,5 @@
 # Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.10.0
@@ -26,7 +25,7 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_XORG=	x11 sm ice