22 files changed, 29 insertions, 65 deletions

diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile
index dbb0b17074cc..add401c08485 100644
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@@ -14,8 +14,7 @@ LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.4+
-USE_PKGCONFIG=	build
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 00ac8d355000..ab546c3ea647 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 USE_LDCONFIG=	yes
 USE_XORG=	xft
 USE_GL=		glu
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-threads \
 		--enable-shared \
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index a5f109a202ee..06a6fc8978ca 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -15,11 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 1e0614f7918f..3033832088a0 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -16,9 +16,8 @@ OPTIONS_DEFINE=	GLADE GLADEUI DOCS EXAMPLES
 GLADE_DESC=	Enable libglade2 support
 GLADEUI_DESC=	Enable glade3 support
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20
-USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir="${PREFIX}/include/${PORTNAME}" \
 		--with-html-dir="${PREFIX}/share/doc"
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index d0c090a993bd..579d4749d5b0 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -11,13 +11,12 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+ 2.0
 
-USES=        pathfix
-USE_GNOME=	gtk20 gnomehack
+USES=		pathfix pkgconfig
+USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 LATEST_LINK=	gtkextra2
 DOCSDIR=	${PREFIX}/share/doc/gtkextra2
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 3c3b7c18df5a..a88cc272983c 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -28,13 +28,12 @@ OPTIONS_DEFINE=	DOCS
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 USE_GL=		glu
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index e08cffa7d82c..f59aa521fb36 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index a8c359122527..7dca5faa5cce 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		t1:${PORTSDIR}/devel/t1lib \
 		gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom
 
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 MAN1=		mathmlviewer.1
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index 6bd0659f3de9..f7bec35f9fa8 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 ltverhack
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 31d88764b0b8..b79c7a096697 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack lthack gtk20 libxml2
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 55f1ace15455..908d69c2c935 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	p5-Gnome2-Canvas
-# Date created:			Apr 1, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	Gnome2-Canvas
 PORTVERSION=	1.002
@@ -26,7 +21,7 @@ RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libgnomecanvas
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 PERL_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index b7f91d15e883..8dc2a0d6c6fe 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	p5-Gnome2-VFS
-# Date created:			Jan 2, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	Gnome2-VFS
 PORTVERSION=	1.081
@@ -25,7 +20,7 @@ RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 USE_GNOME=	gnomevfs2
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 PERL_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index f9360ef3e80b..65128e97a996 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	p5-Gtk2-Html2
-# Date created:			Apr 20, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	Gtk2-Html2
 PORTVERSION=	0.03
@@ -25,7 +20,7 @@ RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libgtkhtml
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 PERL_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 61e842c7d743..06cbf74239db 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 353e112a29b3..e33ab4df2f29 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -11,11 +11,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implements Pango library with a PDF backend for PDF output
 
 USE_GMAKE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	pango
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile
index 53caad09fec3..d922a04bf51c 100644
--- a/x11-toolkits/phat/Makefile
+++ b/x11-toolkits/phat/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Collection of GTK+ widgets geared toward pro-audio apps
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=        pathfix
-USE_GNOME=	gtk20 libgnomecanvas gnomehack
+USES=		pathfix pkgconfig
+USE_GNOME=	gtk20 libgnomecanvas
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 88ab4c9ea318..9b3418f3e9ee 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-ope
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	pygtk2
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 151e5624e1c9..cd94ccf4816c 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-libsexy
-# Date created:		09 December 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sexy
 PORTVERSION=	0.1.9
@@ -21,7 +17,7 @@ LIB_DEPENDS=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index f41160ef3fd7..ad0172f87df2 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_GCC=	any
 HAS_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_LDCONFIG=	${PREFIX}/lib/qt4
 USE_XORG=	xrender xrandr xinerama inputproto xfixes \
 		sm xcursor xext x11 ice xi xt
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 9204151f30ce..a615f41ddc8c 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -17,11 +17,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	rep.16:${PORTSDIR}/lang/librep
 
 USE_XZ=		yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/sakura/Makefile b/x11-toolkits/sakura/Makefile
index d9e60e8c0f2f..4bf03fb1c803 100644
--- a/x11-toolkits/sakura/Makefile
+++ b/x11-toolkits/sakura/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sakura
-# Date created:				2008/06/20
-# Whom:					chinsan
-#
+# Created by: chinsan
 # $FreeBSD$
-#
 
 PORTNAME=	sakura
 PORTVERSION=	2.4.2
@@ -16,9 +12,8 @@ COMMENT=	A terminal emulator based on GTK and VTE
 
 USE_GNOME=	vte
 USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 USE_BZIP2=	yes
-USE_PKGCONFIG=	build
 
 MAN1=		sakura.1
 
diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index c5d39bc25629..77ccecfa5ee6 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		xcb:${PORTSDIR}/x11/libxcb
 
 USE_BZIP2=	yes
-USES=		cmake
-USE_PKGCONFIG=	build
+USES=		cmake pkgconfig
 USE_ICONV=	yes
 USE_LUA=	yes
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \