29 files changed, 38 insertions, 75 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index e95181a3d29b..43e32ef83d64 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -23,7 +23,7 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix gettext gmake
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index a36c7522fc88..6f557fda31f7 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	plist:${PORTSDIR}/devel/libplist \
 
 USE_GNOME=	gtk20
 USE_SQLITE=	3
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 46505e6537af..557003dd98d4 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	bugbuddy2
-# Date created:				14 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/bug-buddy/Makefile,v 1.86 2010/11/16 18:17:55 kwm Exp $
-#
 
 PORTNAME=	bug-buddy
 PORTVERSION=	2.32.0
@@ -20,9 +16,8 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libbonobo \
 		gnomedocutils evolutiondataserver
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 77bbd86ea971..ab9a711d808d 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 
 EMACS_VER=	24.3
 GNU_CONFIGURE=	yes
-USES=		ncurses gmake
+USES=		ncurses gmake pkgconfig
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 71857c9965a6..a5f9d6f90e43 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -35,6 +35,7 @@ RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 FETCH_ARGS=	-pRr
+USES=		pkgconfig
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 561ec26fa0c4..c32da908feaa 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -34,6 +34,7 @@ RUN_DEPENDS=	${KMODDIR}/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod \
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 FETCH_ARGS=	-pRr
+USES=		pkgconfig
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 734ee1701705..9121a4b7e4fd 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \
 		glademm-2.4:${PORTSDIR}/devel/libglademm24
 
 USE_BZIP2=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack libgnome esound
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lesd
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index d73c0687cc23..0a32791e7338 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -13,7 +13,6 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_GNOME=	gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
 		--htmldir="${DOCSDIR}/html" \
 		--with-htmldir="${DOCSDIR}/html" \
@@ -25,7 +24,7 @@ MAKE_ARGS+=	top_builddir="${WRKSRC}"
 
 PORTDOCS=	*
 MAN1=		geeqie.1
-USES=		gettext
+USES=		gettext gmake pkgconfig
 
 OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS DOCS
 OPTIONS_DEFAULT=EXIV2 LCMS
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 05f678eed632..09fa04397e5b 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:	gpaint
-# Date created:				18 October 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -16,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small-scale painting program for GNOME
 
+USES=		pkgconfig
 USE_GNOME=	libgnomeprint libgnomeprintui
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 4f263dd3da9b..bf927b78b1c6 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,8 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:	swfdec
-# Date created:			Apr 5, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
 #   $MCom: ports/graphics/swfdec/Makefile,v 1.28 2009/01/01 13:38:17 kwm Exp $
 
@@ -18,6 +14,7 @@ COMMENT=	Flash Rendering Library
 LIB_DEPENDS=	oil-0.3.0:${PORTSDIR}/devel/liboil \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gtk20 ltverhack
 USE_GSTREAMER=	core good mp3 ffmpeg
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 0dfa6e4b3ec3..1f8a4be59e15 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -15,9 +15,8 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_LDCONFIG=	yes
-USES=		gettext iconv pathfix
+USES=		gettext iconv pathfix gmake pkgconfig
 USE_GNOME=	lthack
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 0f2505acc246..1323fd707034 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_EFL=	ecore edje eet eio embryo evas libtool_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	png jpeg
 USE_LDCONFIG=	yes
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 2de3ef5c27e4..ba022ba4ec20 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gstreamer-plugins-gnonlin
-# Date created:		2006-04-25
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.7 2006/07/21 16:39:31 ahze Exp $
-#
 
 PORTNAME=	gstreamer-plugins-gnonlin
 PORTVERSION=	0.10.17
@@ -16,6 +12,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Gstreamer lib for writing non-linear audio and video
 
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 6fb57d4886c2..81b633ed3b25 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -62,8 +62,7 @@ UNSAFE_PLUGINS_DESC=	Install unsafe, unsupported plugins
 NO_DVD_DESC=	disable DVD specific features
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		iconv perl5
+USES=		iconv perl5 gmake pkgconfig
 USE_PERL5=	build
 USE_GL=yes
 USE_CSTD=	gnu99
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 6da0bc7d5629..c2faaf30e350 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -29,7 +29,7 @@ WIN32_CODECS_DESC=	Enable win32 codecs
 
 USE_XZ=		yes
 USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
 		--disable-nvtvsimple
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 0d0a275f277b..f489d61dc8e0 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -13,7 +13,7 @@ MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME?=	gnomeprefix gnomehack intlhack glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
@@ -29,7 +29,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
-USES=		gettext iconv
+USES+=		gettext iconv
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_PYTHON=	yes
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 0f7f5c8c8299..6c34f4936181 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gstfarsight-0.10:${PORTSDIR}/net-im/farsight2
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index cfe3513fc204..65b7862955c0 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -39,8 +39,7 @@ INFO=		lilypond-notation \
 		music-glossary \
 		internals
 
-USES=		bison:build gettext
-USE_GMAKE=	yes
+USES=		bison:build gettext gmake pkgconfig
 USE_GHOSTSCRIPT=9
 USE_TEX=	latex
 USE_PYTHON=	yes
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index bdfcc0255aa2..4d2773c72a27 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	gnome-settings-daemon-3.[0-9]*
 
 USE_XORG=	xxf86misc
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libgnomekbd
 USE_GSTREAMER=	good
 USE_LDCONFIG=	yes
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 72e7f5e9cdc8..979f5654b838 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -35,8 +35,7 @@ USE_FAM=	yes
 WANT_FAM_SYSTEM=gamin
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehack gnomeprefix ltasneededhack intltool ltverhack
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index b322f2fc756c..c1bd4715d316 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    scim-table-imengine
-# Date created:		01 March 2005
-# Whom:			Jie Gao	<gaoj@cpsc.ucalgary.ca>
-#
+# Created by: Jie Gao <gaoj@cpsc.ucalgary.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.10
@@ -19,10 +15,9 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
-USES=		gettext
+USES=		gettext gmake pkgconfig
 
 MAN1=		scim-make-table.1
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 84c7ed2800e8..fd06a87a0c40 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -29,10 +29,9 @@ USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		desktop-file-utils gettext pathfix
+USES=		desktop-file-utils gettext pathfix gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedesktop
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS+=--enable-introspection \
 		--enable-compile-warnings=no \
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index a87752a06e8b..bf220ce71673 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	webkit-sharp
-# Date created:		2008-09-01
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
+# Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	webkit-sharp
 PORTVERSION=	0.3
@@ -21,7 +17,7 @@ PLIST_SUB+=	ASSEMBLY_VERSION=1.1.15
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gtksharp20
 
 .include <bsd.port.mk>
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index 64bbebfe326b..204f4ab8b764 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libexec/icon-name-mapping:${PORTSDIR}/x11-themes/ico
 		Magick-config:${PORTSDIR}/graphics/ImageMagick
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intlhack
-USES+=		pathfix
+USES+=		pathfix gmake pkgconfig
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index e66bbeffe738..5a11103d7de8 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png\
 		tiff.4:${PORTSDIR}/graphics/tiff\
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USES=		iconv
+USES=		iconv gmake pkgconfig
 USE_BZIP2=	yes
-USE_XORG=	x11 sm xxf86vm xinerama 
+USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 pangox-compat
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 595ccc5fd615..b8c18480583c 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -19,12 +19,11 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png\
 		inotify.0:${PORTSDIR}/devel/libinotify\
 		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 
-USES+=		iconv
+USES+=		iconv gmake pkgconfig
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 591923fe8431..2e28a4b444e0 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix iconv
-USE_GMAKE=	yes
+USES=		pathfix iconv gmake pkgconfig
 USE_EFL=	eina eet evas ecore eio edbus efreet edje \
 		libtool_hack librt_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	eet jpeg png
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 37756a95d5ed..d5ccafed2fb5 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomepanel
-# Date created:				27 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-panel/Makefile,v 1.237 2012/10/25 09:21:00 kwm Exp $
-#
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
@@ -31,10 +27,9 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 1188379b5d3f..eaded353e478 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -20,10 +20,9 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS=	yelp-3.[0-9]*
 
-USES=		desktop-file-utils gettext
+USES=		desktop-file-utils gettext gmake pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	ice
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes