Add an explicit dependency on pkgconf

23 files changed, 32 insertions, 76 deletions

diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 2759643..6fbd43e 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
 LATEST_LINK=	gnome-orca
 
 USE_BZIP2=	yes
-USES=		gmake gettext
+USES=		gmake gettext pkgconfig
 USE_PYTHON=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 08e6faa..9c04254 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 		brasero-media.3:${PORTSDIR}/sysutils/brasero
 
 USE_BZIP2=	yes
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 USE_GNOME=	intlhack gnomeprefix gconf2 libglade2 gnomedocutils
 USE_GSTREAMER=	cdparanoia vorbis flac gconf good gio
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index aaf6e15..d147a52 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	menueditor
-# Date created:				22 March 2005
-# Whom:					FreeBSD GNOME Team
-#
+# Created by: FreeBSD GNOME Team
 # $FreeBSD$
 #    $MCom: ports/deskutils/alacarte/Makefile,v 1.25 2010/03/29 13:19:00 avl Exp $
-#
 
 PORTNAME=	alacarte
 PORTVERSION=	0.13.2
@@ -18,8 +14,7 @@ COMMENT=	An editor for the freedesktop.org menu specification
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop intlhack
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 994bc5d..9f74c56 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
 USE_BZIP2=	yes
-USES=		pathfix gettext gmake
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix pygnomedesktop intlhack
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 84e0da1..e21db4d 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	hamster-applet
-# Date created:				06 August 2008
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.42 2010/06/06 11:27:47 kwm Exp $
-#
 
 PORTNAME=	hamster-applet
 PORTVERSION=	2.32.1
@@ -22,8 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 USE_PYTHON=	yes
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix intlhack gnomehack pygnomedesktop \
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 33e5b6e..e5de088 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -15,8 +15,7 @@ MAN1=		nautilus-sendto.1
 GLIB_SCHEMAS=	org.gnome.Nautilus.Sendto.gschema.xml
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	intlhack gnomeprefix nautilus2 gnomehack evolutiondataserver
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 34e14d5..9091fdd 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	guikachu
-# Date created:		7 Nov 2004
-# Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	guikachu
 PORTVERSION=	1.5.10
@@ -18,7 +14,7 @@ COMMENT=	Resource editor for PalmOS(tm) systems
 LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
 		gnomevfsmm-2.6.1:${PORTSDIR}/devel/gnome-vfsmm
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d45af14..bf7ac957 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -24,9 +24,8 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GL=		gl
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack librsvg2 desktopfileutils \
 		pygnomedesktop gnomedocutils
 USE_GSTREAMER=	vorbis ogg
diff --git a/games/gweled/Makefile b/games/gweled/Makefile
index 9034ed6..44eb5fa 100644
--- a/games/gweled/Makefile
+++ b/games/gweled/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNOME version of the game called "Bejeweled" or "Diamond Mine"
 
 LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
 
-USE=		gmake pkgconfig
+USES=		gmake pkgconfig
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui librsvg2
 GNU_CONFIGURE=	yes
 
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c778fae..f59bbf9 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-exchange
-# Date created:				28 April, 2005
-# Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
-#
+# Created by: Adam Weinberger, based off kiesel's ximian-exchange port
 # $FreeBSD$
 #   $MCom: ports/mail/evolution-exchange/Makefile,v 1.172 2012/09/20 23:06:27 kwm Exp $
-#
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.32.1
@@ -23,9 +19,8 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
 CONFLICTS=	evolution-exchange-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 4054931..8ce0b2c 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -11,10 +11,9 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-Screen-Display infrastructure using Pango text rendering
 
-USES=        pathfix
+USES=        pathfix gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack pygnome2
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 GCONF_SCHEMAS=	gnome-osd.schemas
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index ac0fb81..36f38ab 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	cheese
-# Date created:				13 January 2008
-# Whom:					FreeBSD GNOME Team <gnome@FreeBSD.org>
-#
+# Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/multimedia/cheese/Makefile,v 1.63 2010/09/28 08:21:02 kwm Exp $
-#
 
 PORTNAME=	cheese
 PORTVERSION=	2.32.0
@@ -22,10 +18,9 @@ LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 
 USE_XORG=	xxf86vm
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \
 		gnomedocutils gnomedesktop
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GSTREAMER=	gconf good ogg theora v4l2 vorbis
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ce94d76..9f92e7d 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -24,7 +24,7 @@ CONFLICTS=	totem-3.[0-9]*
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-USES=		pathfix gettext desktop-file-utils
+USES=		pathfix gettext desktop-file-utils pkgconfig
 USE_GNOME=	gnomeprefix intlhack nautilus2 \
 		ltverhack pygtk2 gnomehier
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index fbffa19..f28aeb7 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -30,9 +30,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 
 CONFLICTS=	empathy-3.[0-9]*
 
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack
 USE_GSTREAMER=	yes
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 18b1127..7a33c3a 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-cups-manager
-# Date created:				14 Jul 2003
-# Whom:					Glenn Johnson <glennpj@charter.net>
-#
+# Created by: Glenn Johnson <glennpj@charter.net>
 # $FreeBSD$
 #   $MCom: ports/print/gnome-cups-manager/Makefile,v 1.8 2007/07/20 01:11:31 mezz Exp $
-#
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
@@ -22,10 +18,9 @@ RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
 		desktopfileutils
-USES=		gettext
+USES=		gettext gmake pkgconfig
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 9f50b71..782c9d0 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	cryptui:${PORTSDIR}/security/seahorse \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 9cb9359..053e507 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomecontrolcenter2
-# Date created:				04 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.214 2010/11/18 11:46:09 kwm Exp $
-#
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.32.1
@@ -25,8 +21,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 81151c7..955036d 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Webcal(endar) handler for gnome
 
 USE_BZIP2=	yes
-USES=		gettext gmake pathfix perl5
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_PERL5=	build
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver libgnomeui
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 000c562..dafb766 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 RUN_DEPENDS=	bug-buddy:${PORTSDIR}/devel/bug-buddy
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui gnomepanel gnomedesktop \
 		gtksourceview libwnck nautilus2 pygnome2 metacity \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 24ce6bd..ddff410 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -36,8 +36,7 @@ USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 36f8261..52f6aed 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -23,11 +23,10 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomepanel gnomedocutils libgnomekbd
 WANT_GNOME=	yes
 USE_GSTREAMER=	yes
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index e2c88c8..5220159 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomesession
-# Date created:				08 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-session/Makefile,v 1.187 2010/11/17 12:00:11 kwm Exp $
-#
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.32.1
@@ -29,12 +25,11 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	ice sm xau xrandr
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
 GNOME_DESKTOP_VERSION=2
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 01abebb..640904beb 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -27,6 +27,8 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES NLS
+
+USES=		pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}