Add an explicit dependency on pkgconf

svn path=/head/; revision=326122
2013-09-03 06:36:41 +00:00 · 2013-09-03 06:36:41 +00:00 · db7a56d5ed · 2021-03-31 03:12:20 +00:00
commit db7a56d5ed
parent ea1237cf5e
148 changed files with 211 additions and 403 deletions
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@ -15,7 +15,7 @@ COMMENT=	GNOME screen magnifier
 USE_BZIP2=	yes
 USE_XORG=	xfixes xdamage ice xcomposite sm
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
-USES=		gmake gettext
+USES=		gmake gettext pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@ -15,7 +15,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre

-USES=		gmake perl5
+USES=		gmake perl5 pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
--- a/audio/bebocd/Makefile
+++ b/audio/bebocd/Makefile
@ -13,7 +13,7 @@ COMMENT=	GTK2 CD Player
 LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio

 USE_XORG=	x11
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@ -14,6 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bmp-flac
-# Date created:				2005-05-22
-# Whom:					nork@FreeBSD.org
-#
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
-#

 PORTNAME=	flac
 PORTVERSION=	20040316
@ -21,6 +17,7 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \

 PLIST_FILES=	lib/bmp/Input/libbmp-flac.so

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@ -15,7 +15,7 @@ COMMENT=	Monkey's Audio Codec non-win32 port
 LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
 		mac.2:${PORTSDIR}/audio/mac

-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf libtool
 CPPFLAGS+=	"-I${LOCALBASE}/include"
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@ -19,6 +19,7 @@ COMMENT=	ModPlug-based plugin for beep-media-player
 LIB_DEPENDS?=	beep:${PORTSDIR}/multimedia/beep-media-player
 LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug

+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bmp-wma
-# Date created:		2004-07-16
-# Whom:			Roman Bogorodskiy <bogorodskiy@inbox.ru>
-#
+# Created by: Roman Bogorodskiy <bogorodskiy@inbox.ru>
 # $FreeBSD$
-#

 PORTNAME=	bmp-wma
 PORTVERSION=	0.1.1
@ -20,6 +16,7 @@ PLIST_FILES=	lib/bmp/Input/libwma.so \
 		lib/bmp/Input/libwma.la \
 		lib/bmp/Input/libwma.a

+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool

--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@ -20,7 +20,7 @@ MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*

 USE_XZ=		yes
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@ -19,7 +19,7 @@ OPTIONS_DEFAULT=	TAGLIB

 TAGLIB_DESC=	TagLib support

-USES=		iconv
+USES=		iconv pkkgconfig
 USE_GNOME=	libxml2
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi

 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20

 post-patch:
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@ -25,7 +25,7 @@ LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \

 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jackmidi

--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	intltool
 MAKE_JOBS_UNSAFE=	yes
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	glurp
-# Date created:		Jun 9 2004
-# Whom:			Mark Reidel <ports@mark.reidel.info>
-#
+# Created by: Mark Reidel <ports@mark.reidel.info>
 # $FreeBSD$
-#

 PORTNAME=	glurp
 PORTVERSION=	0.12.3
@ -17,6 +13,7 @@ COMMENT=	Nice and clean GTK+-2.x based graphical client for musicpd
 LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd

 GNU_CONFIGURE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20 glib20 libglade2
 MAKE_ARGS+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" \
--- a/audio/gnaural/Makefile
+++ b/audio/gnaural/Makefile
@ -17,6 +17,7 @@ LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio2 \
 		sndfile:${PORTSDIR}/audio/libsndfile

 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_CSTD=	gnu89
 USE_GNOME=	libglade2 desktopfileutils

--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@ -10,7 +10,6 @@ MASTER_SITES=		SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The real-time guitar processor

-USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
@ -21,7 +20,7 @@ CONFIGURE_ARGS+=--with-gtk2 \
 TXT_DOCS=	AUTHORS COPYING FAQ INSTALL NEWS README TODO ChangeLog
 HTML_DOCS=	faq.html index.html install.html readme.html
 PORTDOCS=	${TXT_DOCS} ${HTML_DOCS}
-USES=		gmake
+USES=		gmake pkgconfig

 OPTIONS_DEFINE=	SUID DOCS
 OPTIONS_DEFAULT=	SUID
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	gqmpeg
-# Date Created:		28 Oct 1998
-# Whom:			Vanilla Pooh Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla Pooh Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	gqmpeg
 PORTVERSION=	0.91.1
@ -30,6 +26,7 @@ RUN_DEPENDS+=	xmp:${PORTSDIR}/audio/xmp
 RUN_DEPENDS+=	ogg123:${PORTSDIR}/audio/vorbis-tools
 .endif

+USES=		gmake
 LATEST_LINK=	gqmpeg-devel
 USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 		xfixes xproto
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@ -12,7 +12,7 @@ COMMENT=		Direct streaming generator for Icecast/Shoutcast
 LIB_DEPENDS=		libshout.so:${PORTSDIR}/audio/libshout2

 GNU_CONFIGURE=		yes
-USES=			gmake
+USES=			gmake pkgconfig
 CONFIGURE_ARGS=		--exec-prefix=${PREFIX}

 OPTIONS_DEFINE=		DOCS MYSQL PGSQL
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	shout:${PORTSDIR}/audio/libshout2 \
 OPTIONS_DEFINE=	FLAC FAAD VORBIS PYTHON
 OPTIONS_DEFAULT=	PYTHON

-USES=		gmake perl5
+USES=		gmake perl5 pkgconfig
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	ices0

--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
-USES=		gettext gmake
+USES=		gettext gmake pkgconfig

 LDFLAGS+=	-L${LOCALBASE}/lib

--- a/audio/mangler/Makefile
+++ b/audio/mangler/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	celt0.2:${PORTSDIR}/audio/celt \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gsm.1:${PORTSDIR}/audio/gsm

-USES=		gmake
+USES=		gmake pkgconfig
 USE_GNOME=	librsvg2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-alsa
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@ -1,6 +1,7 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
 #   $MCom: ports/audio/musicbox-tag-editor/Makefile,v 1.5 2007/09/10 05:13:24 mezz Exp $
+
 PORTNAME=	musicbox-tag-editor
 PORTVERSION=	0.2.3
 PORTREVISION=	15
@ -13,7 +14,7 @@ COMMENT=	Simple GTK+ audio tag editor

 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib

-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix libglade2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	cdparanoia:${PORTSDIR}/audio/cdparanoia

 GNU_CONFIGURE=	yes
 CFLAGS+=	-L${LOCALBASE}/lib
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20
 MAN1=		ripperX.1

--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@ -15,7 +15,7 @@ LIB_DEPENDS=	id3-3.8:${PORTSDIR}/audio/id3lib \
 		vorbis:${PORTSDIR}/audio/libvorbis

 USE_BZIP2=	yes
-USES=		pathfix gettext gmake
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	intlhack libglade2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@ -15,7 +15,7 @@ LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123

 USE_GNOME=	gtk20
-USES=		gettext
+USES=		gettext pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk2

--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@ -13,7 +13,7 @@ LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		xmms:${PORTSDIR}/multimedia/xmms

-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@ -12,6 +12,7 @@ COMMENT=	XMMS input plugin to play WavPack files
 LIB_DEPENDS=	wavpack.2:${PORTSDIR}/audio/wavpack \
 		xmms.4:${PORTSDIR}/multimedia/xmms

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@ -21,7 +21,7 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 DATADIR=	${PREFIX}/share/geda

 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR} \
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	transcalc
-# Date created:			Sep 6, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#

 PORTNAME=	transcalc
 PORTVERSION=	0.14
@ -15,6 +10,7 @@ MASTER_SITES=	http://transcalc.sourceforge.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A analysis and synthesis tool for RF and microwave transmission lines

+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes

--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@ -14,8 +14,7 @@ LICENSE=	GPLv2

 USE_XZ=		yes
 USE_GNOME=	gtk20 intlhack
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes

 OPTIONS_DEFINE=	NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@ -17,9 +17,8 @@ COMMENT=	Education software to help people to study English
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gtk20 esound
-USE_GMAKE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"

 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO readme.txt
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@ -12,6 +12,7 @@ COMMENT=	Graphical (GTK+2) frontend for gnokii

 LIB_DEPENDS=	gnokii:${PORTSDIR}/comms/gnokii

+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@ -15,7 +15,7 @@ USE_QT4=	gui moc_build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CPPFLAGS="-I${LOCALBASE}/include" \
 					LDFLAGS="-L${LOCALBASE}/lib"
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_BZIP2=	yes


--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@ -13,7 +13,7 @@ LIB_DEPENDS=	audiofile:${PORTSDIR}/audio/libaudiofile

 CONFIGURE_ARGS=	--disable-alsatest
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 HAS_CONFIGURE=	yes
 USE_GNOME=	gtk20 libxml2
 MAN8=		soundmodem.8 soundmodemconfig.8
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@ -12,6 +12,7 @@ COMMENT=	Amateur Radio logging application

 LICENSE=	GPLv3

+USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mime-update
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgda2
-# Date created:				02 June 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/databases/libgda2/Makefile,v 1.44 2008/03/11 04:21:46 mezz Exp $
-#

 PORTNAME=	libgda2
 PORTVERSION=	1.2.4
@ -28,9 +24,8 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \

 CONFLICTS=	libgda-0*

-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack intlhack
-USES=		gettext
+USES=		gettext gmake pkgconfig
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@ -18,7 +18,7 @@ RUN_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@ -18,7 +18,7 @@ OPTIONS_DEFAULT=	GTKSPELL
 GTKSPELL_DESC=	Enable GtkSpell support

 USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake shared-mime-info
+USES=		desktop-file-utils gettext gmake shared-mime-info pkgconfig
 USE_GNOME=	gconf2 gnomedocutils gnomevfs2 gtksourceview2
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-error-on-warning
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 USE_CSTD=	gnu89
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@ -16,8 +16,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils

 USE_XORG=	xscrnsaver
 USE_GNOME=	gtk20
-USES=		gettext perl5
-USE_GMAKE=	yes
+USES=		gettext perl5 gmake pkgconfig
 GNU_CONFIGURE=	yes

 MAN1=		${PORTNAME}.1
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@ -9,8 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Gtk2 Todo list manager

-USE_GMAKE=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix gnomevfs2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/deskutils/libopensync-plugin-file/Makefile
+++ b/deskutils/libopensync-plugin-file/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	libopensync-plugin-file
-# Date created:				6 November 2008
-# Whom:					Alex Samorukov <samm@os2.kiev.ua>
-#
+# Created by: Alex Samorukov <samm@os2.kiev.ua>
 # $FreeBSD$
-#

 PORTNAME=	libopensync-plugin-file
 PORTVERSION=	0.22
@ -15,6 +11,7 @@ COMMENT=	File-Sync plugin for the opensync framework

 LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes

--- a/deskutils/libopensync-plugin-sunbird/Makefile
+++ b/deskutils/libopensync-plugin-sunbird/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:	libopensync-plugin-sunbird
-# Date created:				07 October 2008
-# Whom:					Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 #

@ -17,7 +14,7 @@ COMMENT=	Sunbird plugin for the OpenSync framework
 LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022 \
 		neon.27:${PORTSDIR}/www/neon29

-
+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 libxml2
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@ -18,8 +18,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack gtk30
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@ -12,7 +12,7 @@ MAINTAINER=	jrm@ftfl.ca
 COMMENT=	A lightweight GTK+ clipboard manager

 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20

 .include <bsd.port.options.mk>
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@ -18,9 +18,8 @@ LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme

 USE_BZIP2=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext gmake pkgconfig
 USE_GNOME=	gconf2 gnomeprefix libglade2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool

 GCONF_SCHEMAS=	rubrica2.schemas
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	superswitcher
-# Date Created:				02 Jan 2006
-# Whom:					Remington Lang <MrL0Lz@gmail.com>
-#
+# Created by: Remington Lang <MrL0Lz@gmail.com>
 # $FreeBSD$
-#

 PORTNAME=	superswitcher
 PORTVERSION=	0.6
@ -18,8 +14,8 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib

+USES=		gmake pkgconfig
 USE_GNOME=	gconf2 libwnck
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@ -22,7 +22,7 @@ RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus

 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	librsvg2
 USE_LDCONFIG=	yes
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@ -17,9 +17,8 @@ RUN_DEPENDS=	git>=1.7.0.2:${PORTSDIR}/devel/git

 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gconf2 gtk20 gtksourceview2 gnomehack
-USES=		gettext
+USES=		gettext gmake pkgconfig

 INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	gitg.schemas
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:	gnome-vfs-monikers
-# Date created:		2006-07-11
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/devel/gnome-vfs-monikers/Makefile,v 1.4 2006/07/18 11:37:57 ahze Exp $

@ -15,7 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-vfs monikers module

 USE_GNOME=	gnomevfs2 libbonobo
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib #-pthread
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:    gnome-vfsmm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
 #   $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.31 2009/03/17 15:22:21 kwm Exp $
-#

 PORTNAME=	gnome-vfsmm
 PORTVERSION=	2.26.0
@ -20,7 +16,7 @@ LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack gnomevfs2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/guiloader-c++/Makefile
+++ b/devel/guiloader-c++/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	guiloader.1:${PORTSDIR}/devel/guiloader \

 PROJECTHOST=	nothing-personal
 USE_BZIP2=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-hidden-visibility
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:    libglademm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
-#

 PORTNAME=	libglademm
 PORTVERSION=	2.1.3
@ -19,7 +15,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

 USE_XORG=	x11 sm
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libglade2
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:    libglademm
-# Date created:         22 May 2003
-# Whom:                 Alexander Nedotsukov <bland@mail.ru>
-#
+# Created by: Alexander Nedotsukov <bland@mail.ru>
 # $FreeBSD$
 #   $MCom: ports/devel/libglademm24/Makefile,v 1.10 2008/09/22 11:42:53 kwm Exp $
-#

 PORTNAME=	libglademm
 PORTVERSION=	2.6.7
@ -23,7 +19,7 @@ LATEST_LINK=	libglademm24

 USE_BZIP2=	yes
 USE_XORG=	x11 ice
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gnomehack libglade2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@ -13,9 +13,8 @@ COMMENT=	An extension of libSigC++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12

-USES=        pathfix
+USES=		pathfix gmake pkgconfig
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
 USE_LDCONFIG=	yes
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@ -16,7 +16,7 @@ BUILD_DEPENDS=	abiword:${PORTSDIR}/editors/abiword
 RUN_DEPENDS=	abiword:${PORTSDIR}/editors/abiword

 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 # Don't give X warnings if DISPLAY is set
 CONFIGURE_ENV=	DISPLAY=""
 MAKE_ENV=	DISPLAY=""
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@ -24,8 +24,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \

 EMACS_VER=	23.4
 GNU_CONFIGURE=	yes
-USES=		ncurses
-USE_GMAKE=	yes
+USES=		ncurses gmake pkgconfig
 USE_BZIP2=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@ -12,7 +12,7 @@ MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	GTK+ based simple text editor

 USE_GNOME=	gtk20 intlhack
-USES=		desktop-file-utils gmake
+USES=		desktop-file-utils gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@ -16,8 +16,8 @@ LIB_DEPENDS=	ticalcs2:${PORTSDIR}/comms/libticalcs2 \
 		ticables2:${PORTSDIR}/comms/libticables2 \
 		tifiles2:${PORTSDIR}/devel/libtifiles2

+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 USE_SDL=	sdl

--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@ -15,7 +15,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	ticalcs2:${PORTSDIR}/comms/libticalcs2

 INSTALLS_ICONS=	yes
-USES=		desktop-file-utils shared-mime-info
+USES=		desktop-file-utils shared-mime-info pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes	# parallel builds (-jX) are broken with BSD make(1)
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@ -14,6 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	flatzebra:${PORTSDIR}/devel/flatzebra

+USES=		pkgconfig
 USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/games/avoision/Makefile
+++ b/games/avoision/Makefile
@ -23,6 +23,7 @@ LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua \
 		physfs.1:${PORTSDIR}/devel/physfs
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip

+USES=		pkgconfig
 USE_SDL=	sdl sound
 USE_GL=		glu
 GNU_CONFIGURE=	yes
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	belooted
-# Date created:				1 August 2007
-# Whom:					Yinghong Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#

 PORTNAME=	belooted
 PORTVERSION=	0.1.4.1
@ -17,8 +13,8 @@ COMMENT=	A popular 32-card trick-taking game played in France

 LICENSE=	GPLv2

+USES=		gmake pkgconfig
 USE_GNOME=	gtk20 desktopfileutils
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bygfoot
-# Date created:				6th July 2004
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	bygfoot
 PORTVERSION=	2.2.1
@ -19,6 +15,7 @@ COMMENT=	Football (soccer) management game
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip

+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:	crack-attack
-# Date created:				21 December 2003
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$

 PORTNAME=	crack-attack
@ -14,6 +11,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL game based on Super Nintendo classic Tetris Attack

+USES=		pkgconfig
 USE_XORG=	x11 xi xmu sm ice
 USE_GL=		glut
 USE_GNOME=	gtk20
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:   extreme tux racer
-# Date created:        22 February 2008
-# Whom:                Peter Dunning
-#
+# Created by: Peter Dunning
 # $FreeBSD$
-#

 PORTNAME=		etracer
 PORTVERSION=		0.4
@ -21,7 +17,7 @@ LIB_DEPENDS=		png15:${PORTSDIR}/graphics/png \
 USE_SDL=		mixer sdl
 USE_XORG=		x11 xi xext xmu xt
 USE_GL=			gl glu glut
-USE_GMAKE=		yes
+USES=			gmake pkgconfig
 GNU_CONFIGURE=		yes

 USE_TCL=		84+
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	lincity-ng
-# Date created:		25 June 2005
-# Whom:			Andrej Zverev
-#
+# Created by: Andrej Zverev
 # $FreeBSD$
-#

 PORTNAME=	lincity-ng
 PORTVERSION=	2.0
@ -18,6 +14,7 @@ COMMENT=	Improved rich city simulation game for X
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs

+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_SDL=	sdl mixer image ttf gfx
 USE_GL=		yes
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	lucidlife
-# Date created:		18 Aug 2005
-# Whom:			Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
-#
+# Created by: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
 # $FreeBSD$
-#

 PORTNAME=	lucidlife
 PORTVERSION=	0.9.2
@ -14,7 +10,7 @@ MASTER_SITES=	http://offload1.icculus.org:9090/~jcspray/LucidLife/
 MAINTAINER=	mwisnicki+freebsd@gmail.com
 COMMENT=	A GTK2 implementation of Conway's Game of Life

-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20 gnomevfs2 intlhack
 GNU_CONFIGURE=	yes

--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@ -16,10 +16,9 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		expat:${PORTSDIR}/textproc/expat2 \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3

-USES=		pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20 libglade2 libxml2
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data

-USES=		gmake
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	automake:env aclocal:env autoconf:env
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	sopwith
-# Date created:			1 July 2002
-# Whom:				Edwin Groothuis <edwin@mavetju.org>
-#
+# Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
-#

 PORTNAME=	sopwith
 PORTVERSION=	1.7.4
@ -14,8 +10,8 @@ MASTER_SITES=	SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	A classic WW1 biplane game

+USES=		gmake pkgconfig
 USE_SDL=	sdl
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes

--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@ -28,7 +28,7 @@ PROJECTHOST=	sm-ssc
 USE_BZIP2=	yes
 USE_XORG=	x11 xau xdmcp xext xrandr xrender xtst
 USE_GL=		gl glu
-USES=		pathfix iconv shebangfix perl5
+USES=		pathfix iconv shebangfix perl5 pkgconfig
 USE_GNOME=	gtk20
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bmp-rootvis
-# Date created:		2004-10-15
-# Whom:			Roman Bogorodskiy <bogorodskiy@inbox.ru>
-#
+# Created by: Roman Bogorodskiy <bogorodskiy@inbox.ru>
 # $FreeBSD$
-#

 PORTNAME=	bmp-rootvis
 PORTVERSION=	0.0.1
@ -21,6 +17,7 @@ PLIST_FILES=	lib/bmp/Visualization/librootvis.so \
 		lib/bmp/Visualization/librootvis.la \
 		lib/bmp/Visualization/librootvis.a

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
--- a/graphics/ecore-sdl/Makefile
+++ b/graphics/ecore-sdl/Makefile
@ -17,7 +17,7 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	ecore libtool_hack
 USE_EFL_ECORE=	input
 USE_SDL=	sdl
--- a/graphics/entangle/Makefile
+++ b/graphics/entangle/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
 		libraw_r.so:${PORTSDIR}/graphics/libraw \
 		libpeas-1.0.so:${PORTSDIR}/devel/libpeas

-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30

--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	fyre
-# Date created:				2004 11 July
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	fyre
 PORTVERSION=	1.0.1
@ -22,6 +18,7 @@ GNET_DESC=	Enable GNet support
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual

+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	desktopfileutils libglade2
 USE_GMAKE=	yes
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@ -14,8 +14,8 @@ COMMENT=	Height field generator and editor
 LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		png15:${PORTSDIR}/graphics/png

+USES=		gmake pkgconfig
 USE_GL=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix="${LOCALBASE}"

--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@ -13,7 +13,7 @@ COMMENT=	Yet another GTK+ based image viewer
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png

-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	kludge3d
-# Date created:			May 7, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#

 PORTNAME=	kludge3d
 PORTVERSION=	20040822
@ -19,9 +14,9 @@ LIB_DEPENDS=	3ds-1.3:${PORTSDIR}/graphics/lib3ds \
 		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext

 USE_PYTHON=	yes
+USES=		gmake pkgconfig
 USE_GL=		gl
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lib-GL

--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@ -14,6 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext

+USES=		pkgconfig
 USE_GL=		gl
 USE_PYTHON=	yes
 USE_BZIP2=	yes
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomecanvas
-# Date created:				18 May 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.79 2010/09/28 07:31:27 kwm Exp $
-#

 PORTNAME=	libgnomecanvas
 PORTVERSION=	2.30.3
@ -20,8 +16,7 @@ USE_BZIP2=	yes

 .if !defined(REFERENCE_PORT)

-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack
--- a/graphics/pdf2svg/Makefile
+++ b/graphics/pdf2svg/Makefile
@ -13,6 +13,7 @@ LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
 		cairo:${PORTSDIR}/graphics/cairo \
 		gtk:${PORTSDIR}/x11-toolkits/gtk20

+USES=		pkgconfig
 GNU_CONFIGURE=	yes

 PLIST_FILES=	bin/pdf2svg
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@ -1,7 +1,4 @@
-# New ports collection makefile for:   sodipodi
-# Date created:        28 January 2000
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
+# Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/graphics/sodipodi/Makefile,v 1.3 2007/05/30 03:21:43 mezz Exp $

@ -17,9 +14,8 @@ COMMENT=	A small vector based drawing program with GNOME libraries
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		png15:${PORTSDIR}/graphics/png

-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
-USES=		gettext
+USES=		gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-gnome-print \
 		--with-popt
--- a/graphics/svg2png/Makefile
+++ b/graphics/svg2png/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:	svg2png
-# Date created:		2005-03-10
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/graphics/svg2png/Makefile,v 1.3 2005/08/06 02:21:48 marcus Exp $
-#

 PORTNAME=	svg2png
 PORTVERSION=	0.1.3
@ -18,6 +14,7 @@ COMMENT=	Render an SVG image to a PNG image (using cairo)
 LIB_DEPENDS=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo

 GNU_CONFIGURE=	yes
+USES=		pkgconfig

 MAN1=		svg2png.1
 PLIST_FILES=	bin/svg2png
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@ -16,8 +16,8 @@ BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info

 GNU_CONFIGURE=	yes
+USES=		gmake pkgconfig
 USE_AUTOTOOLS=	autoconf
-USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20
 INSTALLS_ICONS=	yes

--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms

 PLIST_FILES=	lib/xmms/Visualization/libfishmatic.so
 USE_GNOME=      gtk12
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=  yes
 USE_GL=		glut
 USE_XORG=	xext
--- a/lang/lafontaine/Makefile
+++ b/lang/lafontaine/Makefile
@ -13,9 +13,8 @@ COMMENT=	Graphical logo interpreter

 WRKSRC=		${WRKDIR}/${PORTNAME}-0.4

-USES=        pathfix
+USES=		pathfix gmake pkgconfig
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89

--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@ -15,8 +15,7 @@ OPTIONS_DEFINE=	GLADE GUILE
 OPTIONS_DEFAULT=GLADE GUILE

 USE_GNOME=	glib20 intltool
-USES=		gettext ncurses readline
-USE_GMAKE=	yes
+USES=		gettext ncurses readline gmake pkgconfig
 GNU_CONFIGURE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnubiff
-# Date created:		3 May 2004
-# Whom:			Tim Bishop <tim@bishnet.net>
-#
+# Created by: Tim Bishop <tim@bishnet.net>
 # $FreeBSD$
-#

 PORTNAME=	gnubiff
 PORTVERSION=	2.2.13
@ -17,7 +13,7 @@ COMMENT=	A mail notification program for Gnome
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt

 USE_GNOME=	intlhack libglade2 esound
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_FAM=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@ -13,7 +13,7 @@ COMMENT=	Lightweight, featureful, and fast GTK+ based e-mail client

 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support

-USES=		gettext iconv gmake
+USES=		gettext iconv gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@ -16,9 +16,8 @@ LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
 		gcrypt:${PORTSDIR}/security/libgcrypt

 USE_BZIP2=	yes
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix
+USES=		gettext pathfix gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libgui libutil panel
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@ -8,7 +8,7 @@ MASTER_SITES=	SF
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	GTK-based scientific calculator

-USES=		gmake
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
--- a/math/gkmap/Makefile
+++ b/math/gkmap/Makefile
@ -13,6 +13,7 @@ LICENSE=	GPLv2

 GNU_CONFIGURE=	yes

+USES=		pkgconfig
 USE_GNOME=	gtk20 libglade2 libxml2

 .include <bsd.port.mk>
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-icon-theme-extras
-# Date Created:				27 March 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/misc/gnome-icon-theme-extras/Makefile,v 1.3 2010/04/20 20:56:39 kwm Exp $
-#

 PORTNAME=	gnome-icon-theme-extras
 PORTVERSION=	2.30.1
@ -20,8 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hic
 		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme

+USES=		gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intlhack gtk20
 INSTALLS_ICONS=	yes
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:   lingoteach
-# Date created:        01 September 2002
-# Whom:                Marcus von Appen
-#
+# Created by: Marcus von Appen
 # $FreeBSD$
-#

 PORTNAME=	lingoteach
 PORTVERSION=	0.3.9
@ -24,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-ui-${PORTVERSION}

 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig

 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	gmimms
-# Date created:		3 Jul 2007
-# Whom:                	Yinghong.Liu <liu_yinghong@yahoo.com.cn>
-#
+# Created by: Yinghong.Liu <liu_yinghong@yahoo.com.cn>
 # $FreeBSD$
-#

 PORTNAME=	gmimms
 DISTVERSION=	0.0.9
@ -16,6 +12,7 @@ COMMENT=	Frontend to MiMMS (Multimedia Stream ripper)

 RUN_DEPENDS=	mimms:${PORTSDIR}/multimedia/mimms

+USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@ -22,7 +22,7 @@ GIO_DESC=	Use GIO for file I/O
 GPOD_DESC=	Add support for libgpod
 NAUPLUG_DESC=	Enable Nautilus plugin

-USES=		gmake
+USES=		gmake pkgconfig pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_XORG=	x11 xscrnsaver
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@ -14,8 +14,7 @@ COMMENT=	Xfce4 XMMS control plugin for xfce4-panel

 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext pathfix gmake pkgconfig
 USE_GNOME=	gtk20 intltool intlhack pango
 USE_XFCE=	configenv libgui libutil panel

--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@ -12,7 +12,7 @@ COMMENT=	LAN chat client compatible with quickChat and Vypress Chat (TM)

 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification

-USES=		pathfix gmake gettext
+USES=		pathfix gmake gettext pkgconfig
 USE_GNOME=	gnomeprefix gtk20
 GNU_CONFIGURE=	yes

--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@ -1,10 +1,6 @@
-# New ports collection makefile for:	gtorrentviewer
-# Date created:		2004-10-16
-# Whom:			Michael Johnson <ahze@ahze.net>
-#
+# Created by: Michael Johnson <ahze@ahze.net>
 # $FreeBSD$
 #   $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.4 2007/08/06 17:16:29 mezz Exp $
-#

 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
@ -21,7 +17,7 @@ PORTSCOUT=	skipv:0.2	# older than current version
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 USE_GNOME=	gtk20 gnomehier intlhack
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/Show More
+++ b/Show More