18 files changed, 21 insertions, 42 deletions

diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 9bb68e146730..681eb755148b 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
 OPTIONS_DEFINE=	READLINE DOCS
 OPTIONS_DEFAULT=READLINE
 
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa-midi
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 7d539f2d8f5b..37c012fe6af8 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gmake pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-update-mime-database \
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 7fe7dabf181b..465966c885a0 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 3b6a07d197f8..d8f4537a789e 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -24,8 +24,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf
 USE_LDCONFIG=	yes
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 12133b1282ff..a4b4e92c8932 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -20,10 +20,9 @@ USE_BZIP2=	yes
 
 RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USES=		pathfix
-USE_GNOME=	libxml2 gtk20 referencehack
+USE_GNOME=	libxml2 gtk20 referencehack gmake pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index c9c7b2151747..9a5fc0de7a64 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
 
 EMACS_VER=	22.3
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 .if !defined(WITHOUT_X11)
 .if !defined(WITHOUT_GTK)
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 022432906206..3fa5e74aaf14 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -14,9 +14,8 @@ COMMENT=	GTK+ Integration library for Clutter
 LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GL=		gl
-USES=		gettext pathfix
+USES=		gettext pathfix gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 ltverhack gnomeprefix
 USE_XORG=	xp x11
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b61a6d9a8eea..c8d294f3e8fb 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -43,6 +43,7 @@ MANCOMPRESSED=	no
 SUB_FILES=	pkg-message
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
+USES=		pkgconfig
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 533d4bf36062..90bf64397655 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gtkspell2
-# Date created:				19 Aug 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/textproc/gtkspell/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
-#
 
 PORTNAME=	gtkspell
 PORTVERSION=	2.0.16
@@ -20,9 +16,8 @@ COMMENT=	A GTK+ 2 spell checking component
 
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
 
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 intlhack
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 8f58536e4291..1a51c10641cf 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -29,7 +29,7 @@ WANT_PERL=	yes
 ALL_TARGET=	default
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		pkgconfig gmake
 USE_GL=		gl
 MAKE_ENV=	SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA}
 LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 53855b25d708..d01d91cf2acf 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -16,10 +16,9 @@ COMMENT=	Theme engine for the GTK+-2.0 toolkit
 
 CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 
-USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20 intlhack ltasneededhack
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index cc6255a0e654..e2b20ebadcf9 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gdl
-# Date created:				24 July 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/gdl/Makefile,v 1.40 2010/09/29 08:07:46 kwm Exp $
-#
 
 PORTNAME=	gdl
 PORTVERSION=	2.30.1
@@ -16,9 +12,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Components intended to be shared between GNOME development tools
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USES=		gettext
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/gtkimageview/Makefile b/x11-toolkits/gtkimageview/Makefile
index 8d82ed0b8f57..e073cab2f952 100644
--- a/x11-toolkits/gtkimageview/Makefile
+++ b/x11-toolkits/gtkimageview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gtkimageview
-# Date created:		1 August 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gtkimageview
 PORTVERSION=	1.6.4
@@ -17,6 +13,7 @@ COMMENT=	Simple image viewer widget
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
+USES=		pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 298f7748c4cd..9ee049debce0 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -19,7 +19,7 @@ LATEST_LINK=	gtkmm24
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index f879d683a865..4ed3e49ffadc 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -20,8 +20,7 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_XORG=	xres
-USE_GMAKE=	yes
-USES=		bison pathfix gettext
+USES=		bison pathfix gettext gmake pkgconfig
 USE_GNOME=	gtk20 ltverhack referencehack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index d63c75655d3a..82ce0a262af2 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 USE_XORG=	ice
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 gnomeprefix introspection:build ltverhack:2
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index fbda9c2a3fa1..ec62157a30ad 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
-USES=		bison pathfix gettext
+USES=		bison pathfix gettext pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME?=	gnomeprefix gtk20 ltverhack referencehack
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 277135a2864f..00877830efa7 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Display GNOME dialogs from the command line
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes