aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2013-09-03 14:36:41 +0800
committerbapt <bapt@FreeBSD.org>2013-09-03 14:36:41 +0800
commitba924988158be48f52fe628d4fbe1d11f24c3ba4 (patch)
tree49a1c0a19d2528061ed83095e4acf1b3cab87fe5
parentf0ce14b31f1feae1fbe0f8354dfae3db067a6190 (diff)
downloadfreebsd-ports-gnome-ba924988158be48f52fe628d4fbe1d11f24c3ba4.tar.gz
freebsd-ports-gnome-ba924988158be48f52fe628d4fbe1d11f24c3ba4.tar.zst
freebsd-ports-gnome-ba924988158be48f52fe628d4fbe1d11f24c3ba4.zip
Add an explicit dependency on pkgconf
-rw-r--r--accessibility/gnome-mag/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--audio/bebocd/Makefile2
-rw-r--r--audio/bmp-fc/Makefile1
-rw-r--r--audio/bmp-flac/Makefile7
-rw-r--r--audio/bmp-mac/Makefile2
-rw-r--r--audio/bmp-modplug/Makefile1
-rw-r--r--audio/bmp-wma/Makefile7
-rw-r--r--audio/easytag/Makefile2
-rw-r--r--audio/ezstream/Makefile2
-rw-r--r--audio/fluidsynth-dssi/Makefile2
-rw-r--r--audio/ghostess/Makefile2
-rw-r--r--audio/gigedit/Makefile2
-rw-r--r--audio/glurp/Makefile7
-rw-r--r--audio/gnaural/Makefile1
-rw-r--r--audio/gnuitar/Makefile3
-rw-r--r--audio/gqmpeg-devel/Makefile7
-rw-r--r--audio/icegenerator/Makefile2
-rw-r--r--audio/ices0/Makefile2
-rw-r--r--audio/lingot/Makefile2
-rw-r--r--audio/mangler/Makefile2
-rw-r--r--audio/musicbox-tag-editor/Makefile3
-rw-r--r--audio/ripperx/Makefile2
-rw-r--r--audio/tagtool/Makefile2
-rw-r--r--audio/xhippo/Makefile2
-rw-r--r--audio/xmms-mad/Makefile2
-rw-r--r--audio/xmms-wavpack/Makefile1
-rw-r--r--cad/geda-gschem/Makefile2
-rw-r--r--cad/transcalc/Makefile8
-rw-r--r--chinese/pcmanx/Makefile3
-rw-r--r--chinese/reciteword/Makefile3
-rw-r--r--comms/gnocky/Makefile1
-rw-r--r--comms/hamfax/Makefile2
-rw-r--r--comms/soundmodem/Makefile2
-rw-r--r--comms/xlog/Makefile1
-rw-r--r--databases/libgda2/Makefile9
-rw-r--r--deskutils/bmp-docklet/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/genius/Makefile2
-rw-r--r--deskutils/gtimer/Makefile3
-rw-r--r--deskutils/gtodo/Makefile3
-rw-r--r--deskutils/libopensync-plugin-file/Makefile7
-rw-r--r--deskutils/libopensync-plugin-sunbird/Makefile7
-rw-r--r--deskutils/notification-daemon/Makefile3
-rw-r--r--deskutils/parcellite/Makefile2
-rw-r--r--deskutils/rubrica/Makefile3
-rw-r--r--deskutils/superswitcher/Makefile8
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile2
-rw-r--r--devel/gitg/Makefile3
-rw-r--r--devel/gnome-vfs-monikers/Makefile7
-rw-r--r--devel/gnome-vfsmm/Makefile8
-rw-r--r--devel/guiloader-c++/Makefile2
-rw-r--r--devel/libglademm/Makefile8
-rw-r--r--devel/libglademm24/Makefile8
-rw-r--r--devel/libsigcx/Makefile3
-rw-r--r--editors/abiword-docs/Makefile2
-rw-r--r--editors/emacs23/Makefile3
-rw-r--r--editors/leafpad/Makefile2
-rw-r--r--emulators/tiemu3/Makefile2
-rw-r--r--emulators/tilem/Makefile2
-rw-r--r--games/afternoonstalker/Makefile1
-rw-r--r--games/avoision/Makefile1
-rw-r--r--games/belooted/Makefile8
-rw-r--r--games/bygfoot/Makefile7
-rw-r--r--games/crack-attack/Makefile6
-rw-r--r--games/etracer/Makefile8
-rw-r--r--games/lincity-ng/Makefile7
-rw-r--r--games/lucidlife/Makefile8
-rw-r--r--games/mudmagic/Makefile3
-rw-r--r--games/naev/Makefile2
-rw-r--r--games/sopwith/Makefile8
-rw-r--r--games/stepmania-devel/Makefile2
-rw-r--r--graphics/bmp-rootvis/Makefile7
-rw-r--r--graphics/ecore-sdl/Makefile2
-rw-r--r--graphics/entangle/Makefile2
-rw-r--r--graphics/fyre/Makefile7
-rw-r--r--graphics/geomorph/Makefile2
-rw-r--r--graphics/gimageview/Makefile2
-rw-r--r--graphics/kludge3d/Makefile9
-rw-r--r--graphics/kudu/Makefile1
-rw-r--r--graphics/libgnomecanvas/Makefile9
-rw-r--r--graphics/pdf2svg/Makefile1
-rw-r--r--graphics/sodipodi/Makefile8
-rw-r--r--graphics/svg2png/Makefile7
-rw-r--r--graphics/viewnior/Makefile2
-rw-r--r--graphics/xmms-fishmatic/Makefile2
-rw-r--r--lang/lafontaine/Makefile3
-rw-r--r--lang/mdk/Makefile3
-rw-r--r--mail/gnubiff/Makefile8
-rw-r--r--mail/sylpheed/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile3
-rw-r--r--math/galculator/Makefile2
-rw-r--r--math/gkmap/Makefile1
-rw-r--r--misc/gnome-icon-theme-extras/Makefile8
-rw-r--r--misc/lingoteach/Makefile8
-rw-r--r--multimedia/gmimms/Makefile7
-rw-r--r--multimedia/gnome-mplayer/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile3
-rw-r--r--net-im/vqcc-gtk/Makefile2
-rw-r--r--net-p2p/gtorrentviewer/Makefile8
-rw-r--r--net/gnome-nettool/Makefile9
-rw-r--r--net/gq/Makefile3
-rw-r--r--net/grsync/Makefile3
-rw-r--r--net/libgnetwork/Makefile9
-rw-r--r--net/pecl-gupnp/Makefile1
-rw-r--r--net/twitux/Makefile9
-rw-r--r--news/xrn/Makefile3
-rw-r--r--polish/tleenx2/Makefile1
-rw-r--r--print/lyx/Makefile2
-rw-r--r--security/gringotts/Makefile7
-rw-r--r--security/razorback-archiveInflate/Makefile11
-rw-r--r--security/razorback-fsWalk/Makefile11
-rw-r--r--security/razorback-scriptNugget/Makefile11
-rw-r--r--security/razorback-swfScanner/Makefile11
-rw-r--r--security/razorback-syslogNugget/Makefile11
-rw-r--r--security/seahorse/Makefile3
-rw-r--r--sysutils/fusefs-smbnetfs/Makefile2
-rw-r--r--sysutils/gnome-mount/Makefile3
-rw-r--r--sysutils/gnome-system-monitor/Makefile3
-rw-r--r--sysutils/heartbeat/Makefile3
-rw-r--r--sysutils/syslog-ng-devel/Makefile5
-rw-r--r--textproc/diffmark/Makefile1
-rw-r--r--textproc/ots/Makefile8
-rw-r--r--www/bluefish/Makefile2
-rw-r--r--www/cssed/Makefile2
-rw-r--r--www/libepc/Makefile9
-rw-r--r--www/libgtkhtml/Makefile8
-rw-r--r--www/mod_auth_mellon/Makefile1
-rw-r--r--x11-clocks/cairo-clock/Makefile3
-rw-r--r--x11-fm/gentoo/Makefile2
-rw-r--r--x11-fonts/fntsample/Makefile2
-rw-r--r--x11-themes/gtk-aurora-engine/Makefile8
-rw-r--r--x11-themes/gtk-equinox-engine/Makefile1
-rw-r--r--x11-themes/lxappearance/Makefile2
-rw-r--r--x11-themes/rezlooks/Makefile1
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile9
-rw-r--r--x11-toolkits/gtkmm30-reference/Makefile8
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-wm/ede/Makefile2
-rw-r--r--x11-wm/fluxconf/Makefile7
-rw-r--r--x11-wm/metacity/Makefile9
-rw-r--r--x11-wm/mutter/Makefile9
-rw-r--r--x11-wm/obconf/Makefile1
-rw-r--r--x11/gmrun/Makefile2
-rw-r--r--x11/libgnome/Makefile3
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/sbxkb/Makefile1
-rw-r--r--x11/sisctrl/Makefile8
148 files changed, 211 insertions, 403 deletions
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index a7e2fcf97142..e1ea96334486 100644
--- 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
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 71ce40eb059c..f92215e5566e 100644
--- 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
diff --git a/audio/bebocd/Makefile b/audio/bebocd/Makefile
index d0088eecfe61..5cf777d8ce15 100644
--- 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" \
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index 32e6f21184c4..5d9e8cbed4ad 100644
--- 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
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index b3dba44797ce..b055bfe99c61 100644
--- 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}" \
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 4f657a273c0b..f8c43078588c 100644
--- 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"
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 5900fa9ba555..1966555ad396 100644
--- 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
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index c97f49b7368c..7c45519008df 100644
--- 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
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 9393707c14af..95bfa9f8cf20 100644
--- 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
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index a1b8d91dd5a4..3bc12ad6fdf9 100644
--- 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
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index c65dcc98e007..97ed7316078c 100644
--- 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:
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 016441824ab9..87019cfe5c2e 100644
--- 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
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index f6c66a9f6b98..c13052fbb9c8 100644
--- 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
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index eb7988d03f95..23b6c0e9dc09 100644
--- 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" \
diff --git a/audio/gnaural/Makefile b/audio/gnaural/Makefile
index 7d33520adc4d..e29e0bd41ebe 100644
--- 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
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index a0b76ab0f92e..2cfeb2078827 100644
--- 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
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 124e9c222ac0..43bf60bcd36d 100644
--- 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
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index ee779209620a..796829056849 100644
--- 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
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index 6c3e035107cd..eb9abf0c6436 100644
--- 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
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index e860472bdb8e..8d49446fbd4e 100644
--- 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
diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile
index feeabe86b437..09660388edf2 100644
--- 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
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 34bce6451718..95dc6dcf75c5 100644
--- 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
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index b30508ee9187..aee534596a52 100644
--- 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
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index c91e0780dd83..9c52c51a892e 100644
--- 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
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 6169e32ae6bc..4cc549313c48 100644
--- 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
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 0150ce250ebd..248ac2a8f41c 100644
--- 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
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index 411c918e7026..00682de87a79 100644
--- 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
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index c951ca46c11c..49ef0f73f9e0 100644
--- 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} \
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 67e831ddb92f..08abb3fb8d18 100644
--- 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
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 1f260b65ac3f..6a4ee537d998 100644
--- 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
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index a603d90e58d5..45b49ad9fa02 100644
--- 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
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 172be5971e41..3edd112723ca 100644
--- 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
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 488a1e4c9a4d..95aa9fff4fc6 100644
--- 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
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index 8ebc3dc99314..4fa01f921112 100644
--- 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
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 49789775c66d..ce775d12ec1f 100644
--- 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
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 53bd2cd1bfff..d1a6b6676e8a 100644
--- 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
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index d4b77542c144..f9290edb0ae1 100644
--- 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
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 0a9acb8cb2ee..e9e1ded7d6fa 100644
--- 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
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 92200cf17c52..b5111dcc8712 100644
--- 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
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 720295cdb6fb..37fe191448a0 100644
--- 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
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index 056be6c66f46..47ee8d1991a2 100644
--- 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
diff --git a/deskutils/libopensync-plugin-file/Makefile b/deskutils/libopensync-plugin-file/Makefile
index b42f7f8d9cb2..d014b9e0d8ce 100644
--- 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
diff --git a/deskutils/libopensync-plugin-sunbird/Makefile b/deskutils/libopensync-plugin-sunbird/Makefile
index 8e7b8bba3467..4ab0df27703f 100644
--- 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
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index a0d269cec6c1..8da8e41900d9 100644
--- 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
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index 5c304ecb1cca..3b46c4ba1a11 100644
--- 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>
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index 555ae24a8cbc..3e51f5b9788e 100644
--- 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
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index e01424cece60..f00e962c97fb 100644
--- 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
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 6a1b910a5717..7336ab81effe 100644
--- 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
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 32d85acca714..55405380fa50 100644
--- 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
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index f0039e617f0e..9d73570a5355 100644
--- 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
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index bc0fb36f9cc7..e8bb36a32454 100644
--- 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
diff --git a/devel/guiloader-c++/Makefile b/devel/guiloader-c++/Makefile
index ebb2b55eb945..5ffecc2ab7c0 100644
--- 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
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 52ea2fec021d..2c884f97d1fc 100644
--- 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
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 1c85d5eeeb60..e5f7a292a8c8 100644
--- 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
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 0082d2b59994..457d6de13ccd 100644
--- 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
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index b03d6480f530..d6b2580e49d4 100644
--- 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=""
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 923f178aa252..e932c7887ecb 100644
--- 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
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 019f41c4b0ea..87d644c0030c 100644
--- 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
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index 4bfe9de612e7..bc644cb906f6 100644
--- 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
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index c78ff7121cea..d0db61565df8 100644
--- 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)
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 1bf374f0bfe2..4c1c8db9e903 100644
--- 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
diff --git a/games/avoision/Makefile b/games/avoision/Makefile
index 0e8882c9011a..c942a68c75c7 100644
--- 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
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index 5f3f7ab9a3e9..d999dae851b5 100644
--- 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
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 96508f7f8774..dcaafed51310 100644
--- 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
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index e662f5954bdb..0dc0f045da13 100644
--- 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
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 14f871edf143..63dd770f0f8f 100644
--- 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+
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 2f2435a41fce..63f60ad061c4 100644
--- 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
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index 32eb8fbfee0a..f9800c261a86 100644
--- 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
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 794cdde1c6a5..be3c247adc8d 100644
--- 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
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 3d199cc6660e..42816c2e169a 100644
--- 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
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index 18e9435478d3..088aeace1c66 100644
--- 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
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 138ed2692adf..95bafeeed97f 100644
--- 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
diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 8e47515306ae..273993db8c36 100644
--- 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
diff --git a/graphics/ecore-sdl/Makefile b/graphics/ecore-sdl/Makefile
index a5dcb520051e..019f0acaa589 100644
--- 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
diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile
index f6c60d864727..09bc9c2e53e8 100644
--- 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
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 10dc0cfbad99..afbb09ef1b31 100644
--- 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
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 0e068a40c4a3..74c3fd77607b 100644
--- 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}"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index cb36c42d2002..5fe561d677d4 100644
--- 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"
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index f499d8d6f784..6cc8b4d4cf09 100644
--- 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
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index c03e8826e817..7b7b0de05fde 100644
--- 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
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index edd2e89084c9..04f46a7ad110 100644
--- 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
diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile
index f376766268d7..1659844e93e6 100644
--- 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
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index b28e7290f365..5a3976921069 100644
--- 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
diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile
index a7e95a63b18e..8a3eac888465 100644
--- 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
diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index e99fab4e0d2d..142f98a6e14f 100644
--- 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
diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index 5ead5917edd3..69e3f79c5a5c 100644
--- 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
diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile
index 204debf9da64..78ee7705e329 100644
--- 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
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 95cf0eaa8473..372e553943f0 100644
--- 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
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 83b6bd7cebcb..28fca16260a6 100644
--- 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
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 898bbb669064..35a4b31461f8 100644
--- 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
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index d75a8855b3cf..d851f687fd55 100644
--- 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
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 71ef8dbf68cb..3d19ac756599 100644
--- 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
diff --git a/math/gkmap/Makefile b/math/gkmap/Makefile
index 52279370bc92..8cf3f5b79e0a 100644
--- 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>
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index 14af01530cbd..4003342a05d8 100644
--- 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
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index ab50cdef598a..04c2c954cd76 100644
--- 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
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index fb668754582e..68d57387b9e1 100644
--- 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
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 5c385230fb05..40a98c0be6ea 100644
--- 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
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 8e119cc1033d..1029c4ae0295 100644
--- 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
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index 45124ca3a884..a99e1ce94a08 100644
--- 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
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 2a09ed82d5d9..4012485a37f9 100644
--- 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
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index b68fafd716a5..bc6c93841409 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gnomenetwork
-# Date Created: 03 June 2003
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/net/gnome-nettool/Makefile,v 1.58 2010/09/28 09:03:44 kwm Exp $
-#
PORTNAME= gnome-nettool
PORTVERSION= 2.32.0
@@ -22,8 +18,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
GNOME_DESKTOP_VERSION=2
-USE_GMAKE= yes
-USES= gettext
+USES= gettext gmake pkgconfig
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/net/gq/Makefile b/net/gq/Makefile
index ed9e74d930da..7a8bf1172882 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -21,8 +21,7 @@ CACHE_DESC= Support the OpenLDAP experimental client cache
USE_GNOME= libglade2 gnomedocutils
USE_OPENSSL= yes
USE_OPENLDAP= yes
-USES= gettext
-USE_GMAKE= yes
+USES= gettext gmake pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE}
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 1816b022b833..119d18cfbddc 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -16,10 +16,9 @@ RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync \
bash:${PORTSDIR}/shells/bash
USE_GNOME= gtk20
-USES= desktop-file-utils shared-mime-info
+USES= desktop-file-utils gmake shared-mime-info pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-unity
-USE_GMAKE= yes
INSTALLS_ICONS= yes
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 7865ac3946cf..0851f80b878a 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libgnetwork
-# Date created: 11 December 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libgnetwork
PORTVERSION= 0.0.9
@@ -17,11 +13,10 @@ COMMENT= A GLib-based networking wrapper
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
-USES= gettext
+USES= gettext gmake pkgconfig
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/pecl-gupnp/Makefile b/net/pecl-gupnp/Makefile
index a06ef4d76a61..33960b2df9df 100644
--- a/net/pecl-gupnp/Makefile
+++ b/net/pecl-gupnp/Makefile
@@ -14,6 +14,7 @@ COMMENT= GUPnP wrapper extension
LIB_DEPENDS= gupnp-1.0:${PORTSDIR}/net/gupnp
+USES= pkgconfig
USE_PHP= yes
USE_PHPEXT= yes
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index c161a783d37d..127978af9a59 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: twitux
-# Date created: 25 August 2008
-# Whom: Arnaud Berthomier
-#
+# Created by: Arnaud Berthomier
# $FreeBSD$
-#
PORTNAME= twitux
PORTVERSION= 0.69
@@ -24,8 +20,7 @@ USE_GNOME= glib20 gtk20 gconf2 libxml2 gnomedocutils
INSTALLS_OMF= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USES= gettext
+USES= gettext gmake pkgconfig
CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt"
GCONF_SCHEMAS= twitux.schemas
INSTALLS_ICONS= yes
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index a6a57545a06e..575179abd0a1 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -13,8 +13,7 @@ COMMENT= Usenet News reader for the X Window System
MAN1= xrn.1
MANCOMPRESSED= no
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USES= bison
+USES= bison gmake pkgconfig
USE_XORG= ice sm x11 xaw xext xmu xpm xt
DOCS= COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index e3289ddec004..68cdb52185d9 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -13,6 +13,7 @@ COMMENT= Client for polish IM service called Tlen.pl
LIB_DEPENDS= tlen.1:${PORTSDIR}/polish/libtlen
+USES= pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_XORG= xscrnsaver
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 80d92b7562ab..3dc1e04612a8 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -23,8 +23,8 @@ CONFLICTS= lyx-1.[0-9]*
MAJOR_VERSION= 2.0
MINOR_VERSION= 6
+USES= gmake pkgconfig
USE_XZ= yes
-USE_GMAKE= yes
USE_QT4= corelib gui moc_build uic_build rcc_build
USE_GNOME= desktopfileutils
USE_PYTHON= -2.7
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 5f19ce3ea5c5..e4cbfa4bedcf 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gringotts
-# Date created: 02 July 2002
-# Whom: Anders Nordby <anders@FreeBSD.org>
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gringotts
PORTVERSION= 1.2.10
@@ -17,6 +13,7 @@ COMMENT= GTK application to securely store sensitive data
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gringotts.2:${PORTSDIR}/security/libgringotts
+USES= pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/security/razorback-archiveInflate/Makefile b/security/razorback-archiveInflate/Makefile
index 1002b883aa09..0fc8c2be7293 100644
--- a/security/razorback-archiveInflate/Makefile
+++ b/security/razorback-archiveInflate/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: razorback-archiveInflate
-# Date created: 2011/06/8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= archiveInflate
PORTVERSION= 0.5.0
@@ -25,15 +21,16 @@ RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
OPTIONS_DEFINE= DEBUG ASSERT
ASSERT_DESC= Enable Asserts
-.include <bsd.port.options.mk>
-
RB_LIBDIR?= ${PREFIX}/lib/razorback
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${RB_LIBDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
diff --git a/security/razorback-fsWalk/Makefile b/security/razorback-fsWalk/Makefile
index 666b2c20d3a9..d3cb2ec61204 100644
--- a/security/razorback-fsWalk/Makefile
+++ b/security/razorback-fsWalk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: razorback-fsWalk
-# Date created: 2011/06/8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= fsWalk
PORTVERSION= 0.5.0
@@ -22,13 +18,14 @@ LIB_DEPENDS= razorback_api.2:${PORTSDIR}/security/razorback-api
OPTIONS_DEFINE= DEBUG ASSERT
-.include <bsd.port.options.mk>
-
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
.if !empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ARGS+=--enable-debug
.endif
diff --git a/security/razorback-scriptNugget/Makefile b/security/razorback-scriptNugget/Makefile
index a2121c36cabd..27681e25d2ab 100644
--- a/security/razorback-scriptNugget/Makefile
+++ b/security/razorback-scriptNugget/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: razorback-scriptNugget
-# Date created: 2011/06/8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= scriptNugget
PORTVERSION= 0.5.0
@@ -26,9 +22,8 @@ RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
OPTIONS_DEFINE= DEBUG ASSERT
ASSERT_DESC= Enable Asserts
-.include <bsd.port.options.mk>
-
RB_LIBDIR?= ${PREFIX}/lib/razorback
+USES= pkgconfig
USE_GNOME= libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-ruby
@@ -37,6 +32,8 @@ USE_LDCONFIG= ${RB_LIBDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
diff --git a/security/razorback-swfScanner/Makefile b/security/razorback-swfScanner/Makefile
index e39a6d1f1bb9..d074f0cb4f4f 100644
--- a/security/razorback-swfScanner/Makefile
+++ b/security/razorback-swfScanner/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: razorback-swfScanner
-# Date created: 2011/06/8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= swfScanner
PORTVERSION= 0.5.0
@@ -25,15 +21,16 @@ RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
OPTIONS_DEFINE= DEBUG ASSERT
ASSERT_DESC= Enable Asserts
-.include <bsd.port.options.mk>
-
RB_LIBDIR?= ${PREFIX}/lib/razorback
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${RB_LIBDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
diff --git a/security/razorback-syslogNugget/Makefile b/security/razorback-syslogNugget/Makefile
index d2fe526b4855..d49e18b35e41 100644
--- a/security/razorback-syslogNugget/Makefile
+++ b/security/razorback-syslogNugget/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: razorback-archiveInflate
-# Date created: 2011/06/8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= syslogNugget
PORTVERSION= 0.5.0
@@ -25,8 +21,7 @@ RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-master
OPTIONS_DEFINE= DEBUG ASSERT
ASSERT_DESC= Enable Asserts
-.include <bsd.port.options.mk>
-
+USES= pkgconfig
RB_LIBDIR?= ${PREFIX}/lib/razorback
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
@@ -34,6 +29,8 @@ USE_LDCONFIG= ${RB_LIBDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 907b938c9cca..162008ee6995 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -25,8 +25,7 @@ CONFLICTS= libcryptui-3.[0-9]* seahorse-3.[0-9]*
USE_XORG= sm
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_GMAKE= yes
-USES= pathfix gettext
+USES= pathfix gettext gmake pkgconfig
USE_GNOME= intlhack gnomeprefix gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index b7b3975b2c12..2eacf878d5f1 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
DOCSDIR+= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
-USES= fuse
+USES= fuse pkgconfig
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 2b894fbe4cc3..913eb0e4957f 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20
-USE_GMAKE= yes
-USES= gettext
+USES= gettext gmake pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nautilus-extension
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 51737bee7a67..a12bd7f34e0b 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -20,9 +20,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
CONFLICTS= gnome-system-monitor-3.[0-9]*
USE_BZIP2= yes
-USES= gettext
+USES= gettext gmake pkgconfig
INSTALLS_OMF= yes
-USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
librsvg2
GNU_CONFIGURE= yes
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 02f5a122ba17..225673bdb307 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -25,8 +25,7 @@ AUTOMAKE_ARGS+= --add-missing --include-deps --copy
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
USE_BZIP2= yes
-USES= gettext
-USE_GMAKE= yes
+USES= gettext gmake pkgconfig
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_PYTHON= yes
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 825fe6cb7a49..b7e3c5688bcf 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -32,7 +32,6 @@ SMTP_DESC= Build with SMTP support
JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
-.include <bsd.port.options.mk>
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
@@ -40,10 +39,10 @@ MAN1= loggen.1 pdbtool.1 syslog-ng-ctl.1
MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8
+USES= gmake pkgconfig
USE_LDCONFIG= yes
USE_RC_SUBR= syslog-ng
GNU_CONFIGURE= yes
-USE_GMAKE= yes
USE_GNOME= glib20 gnomehack
SUB_FILES= pkg-message
@@ -51,6 +50,8 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking \
--enable-debug
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl
diff --git a/textproc/diffmark/Makefile b/textproc/diffmark/Makefile
index 1a177d3cb377..059148b476df 100644
--- a/textproc/diffmark/Makefile
+++ b/textproc/diffmark/Makefile
@@ -11,6 +11,7 @@ COMMENT= XML diff and merge package
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
+USES= pkgconfig
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-libxml2-incldir=${LOCALBASE}/include/libxml2
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index d704753cce33..8eacb73318f6 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ots
-# Date created: 9 June 2007
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= ots
PORTVERSION= 0.5.0
@@ -18,7 +14,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GNOME= glib20 libxml2
USE_LDCONFIG= yes
-USES= gettext
+USES= gettext pkgconfig
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 5ceb410d2510..b8dc269b408a 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -19,7 +19,7 @@ INSTALLS_ICONS= yes
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_GMAKE= yes
+USES= gmake pkgconfig
USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index f67c5bddd358..f2c4706aa389 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An application to help CSS style sheets creation and maintenance
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 8977fcb8985c..7152628e2cb6 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libepc
-# Date created: 24 Mar 2008
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libepc
PORTVERSION= 0.3.11
@@ -19,8 +15,7 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
avahi-ui.0:${PORTSDIR}/net/avahi-gtk
USE_BZIP2= yes
-USE_GMAKE= yes
-USES= gettext
+USES= gettext gmake pkgconfig
USE_GNOME= gnomeprefix gnomehack gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 6885382bb582..79ccca466dd6 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: libgtkhtml
-# Date created: 2nd June 2000
-# Whom: Ade Lovett <ade@FreeBSD.org>
-#
+# Created by: Ade Lovett <ade@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/www/libgtkhtml/Makefile,v 1.41 2008/08/23 18:23:00 mezz Exp $
-#
PORTNAME= libgtkhtml
PORTVERSION= 2.11.1
@@ -17,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight HTML rendering/printing/editing engine
USE_BZIP2= yes
-USE_GMAKE= yes
+USES= gmake pkgconfig
USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index b22cff119952..42cbc59d6773 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -14,6 +14,7 @@ COMMENT= Apache auth module for identifying SSO users
LIB_DEPENDS= lasso.8:${PORTSDIR}/security/lasso \
curl:${PORTSDIR}/ftp/curl
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs2=${APXS}
CONFIGURE_ENV+= OPENSSL_CFLAGS="-Wall" OPENSSL_LIBS="-lssl"
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index 9e3ceeba7324..6ea4f8a9df50 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -11,8 +11,7 @@ MAINTAINER= daichi@FreeBSD.org
COMMENT= MacSlow's Cairo-Clock
USE_GNOME= gtk20 intlhack libglade2 librsvg2
-USE_GMAKE= yes
-USES= pathfix iconv
+USES= pathfix iconv gmake pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAN1= cairo-clock.1
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index 91a9cba08aea..c3c2cadc0594 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -14,7 +14,7 @@ COMMENT= Gtk+ based, file manager inspired by DirectoryOpus
OPTIONS_DEFINE= FAM DOCS
USE_GNOME= gnomehack gtk20
-USES= gettext
+USES= gettext gmake pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= MKDIR_P="${MKDIR}"
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index 6101829a3a58..9c353e744b55 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -16,7 +16,7 @@ COMMENT?= Show Unicode coverage of a font
LICENSE= GPLv3
USE_PERL5= run
-USES= perl5
+USES= perl5 pkgconfig
MAN1= ${PORTNAME}.1
diff --git a/x11-themes/gtk-aurora-engine/Makefile b/x11-themes/gtk-aurora-engine/Makefile
index c0ce79b5b64d..86ae3e252783 100644
--- a/x11-themes/gtk-aurora-engine/Makefile
+++ b/x11-themes/gtk-aurora-engine/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gtk-aurora-engine
-# Date created: 2009-12-03
-# Whom: okeeblow <root@cooltrainer.org>
-#
+# Created by: okeeblow <root@cooltrainer.org>
# $FreeBSD$
-#
PORTNAME= aurora
PORTVERSION= 1.5.1
@@ -20,8 +16,8 @@ COMMENT= Aurora GTK+ 2.x engine and "Aurora" theme
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+USES= gmake pkgconfig
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 9d2699b95d41..297be9f43d33 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-t
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 \
${LOCALBASE}/share/icons/Faenza/index.theme:${PORTSDIR}/x11-themes/gnome-icons-faenza
+USES= pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/equinox-${PORTVERSION}
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 32f1eefb7bf1..dee4074302b6 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -13,7 +13,7 @@ COMMENT= Desktop-independent theme switcher for GTK+
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake pkgconfig
USE_GNOME= gnomehack gtk20 intlhack
MAN1= lxappearance.1
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index 215370d66e3b..e3f625027fa2 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -14,6 +14,7 @@ COMMENT= GTK+ 2.x engine based on Clearlooks
WRKSRC= ${WRKDIR}/rezlooks-${PORTVERSION}
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= gtk20
OPTIONS_DEFINE= ANIMATION
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index cd4e84af9e47..fdf1a086ab94 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gtk-sharp
-# Date created: 2003-01-01
-# Whom: Juli Mallett
-#
+# Created by: Juli Mallett
# $FreeBSD$
# $Id: Makefile,v 1.27 2007/10/03 00:48:49 killfill Exp $
-#
PORTNAME= gtk-sharp
PORTVERSION= 2.12.10
@@ -23,8 +19,7 @@ LATEST_LINK= gtk-sharp20
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_GMAKE= yes
-USES= perl5
+USES= perl5 gmake pkgconfig
USE_PERL5= run
USE_GNOME= gnomehack gtk20 libglade2
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 32e503a514bc..f5a4810de729 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: gtkmm20-reference
-# Date created: 09 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
# $FreeBSD$
-#
PORTREVISION= 1
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:${PORTSDIR}/x11-toolkits/gtkmm30 \
glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
-USE_GMAKE= yes
+USES= gmake pkgconfig
GNU_CONFIGURE= yes
DOCSDIR= ${PREFIX}/share/doc/gtkmm-3.0
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 5254ac05535c..8473c9c9f8d3 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cair
LATEST_LINK= py-gtk2
USE_BZIP2= yes
-USE_GMAKE= yes
-USES= pathfix gettext
+USES= pathfix gettext gmake pkgconfig
USE_GNOME= libglade2 pygobject
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 8fea072fb3a5..62dbddf6f639 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE= HAL
HAL_DESC= Enable HAL support
USE_XORG= xcomposite xft xinerama xpm xrandr
-USES= pathfix gettext
+USES= pathfix gettext pkgconfig
USE_PYTHON= yes
USE_FAM= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index d6ba2cb84d82..ce73f36a37cc 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -1,9 +1,5 @@
-# Ports collection Makefile for: fluxconf
-# Date created: 29/04/2002
-# Whom: hendrik@scholz.net
-#
+# Created by: hendrik@scholz.net
# $FreeBSD$
-#
PORTNAME= fluxconf
PORTVERSION= 0.9.9
@@ -14,6 +10,7 @@ MASTER_SITES= http://devaux.fabien.free.fr/flux/
MAINTAINER= alfredoj69@gmail.com
COMMENT= A configuration program for the fluxbox window manager
+USES= pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index f1d9a3d37010..0377e949f081 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: metacity
-# Date created: 21 May 2002
-# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
-#
+# Created by: Garrett Rooney <rooneg@electricjellyfish.net>
# $FreeBSD$
# $MCom: ports/x11-wm/metacity/Makefile,v 1.158 2010/09/30 07:04:02 kwm Exp $
-#
PORTNAME= metacity
PORTVERSION= 2.30.3
@@ -23,8 +19,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_XORG= x11 xcomposite xdamage
-USES= gettext
-USE_GMAKE= yes
+USES= gettext gmake pkgconfig
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
USE_LDCONFIG= yes
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 8a26f620844d..5d8cfa6b89b5 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: mutter
-# Date created: 14 Aug 2009
-# Whom: Pawel Worach <pawel.worach@gmail.com>
-#
+# Created by: Pawel Worach <pawel.worach@gmail.com>
# $FreeBSD$
# $MCom: ports/x11-wm/mutter/Makefile,v 1.14 2010/06/29 21:14:07 kwm Exp $
-#
PORTNAME= mutter
PORTVERSION= 2.31.2
@@ -24,8 +20,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
-USES= gettext
-USE_GMAKE= yes
+USES= gettext gmake pkgconfig
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
USE_LDCONFIG= yes
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 7a8966d37358..7f1a17e1d22d 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -13,6 +13,7 @@ COMMENT= Preferences manager for the Openbox window manager
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
obrender.27:${PORTSDIR}/x11-wm/openbox
+USES= pkgconfig
USE_GNOME= gnomehier libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV= OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index f455175b9fe6..16007e00b013 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
OPTIONS_DEFINE= DOCS
-USES= gmake
+USES= gmake pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index bb9e60028193..0116ece6918e 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
-USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack esound libbonobo \
gnomevfs2 ltverhack referencehack
-USES= bison pathfix gettext
+USES= bison pathfix gettext gmake pkgconfig
USE_XORG= xpm
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index c91f5a1a488b..702990d9e6c4 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -16,7 +16,7 @@ USE_GNOME= gtk20 lthack vte
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure kiklib/configure mkf/configure
USE_PERL5_BUILD=yes
-USES= gettext
+USES= gettext pkgconfig
CONFIGURE_ARGS= --with-imagelib=gdk-pixbuf2 --enable-utmp \
--enable-optimize-redrawing \
--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader" \
diff --git a/x11/sbxkb/Makefile b/x11/sbxkb/Makefile
index a0e1f63d4e6b..5952faf62d73 100644
--- a/x11/sbxkb/Makefile
+++ b/x11/sbxkb/Makefile
@@ -14,6 +14,7 @@ LICENSE= GPLv3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
USE_GNOME= gtk20
+USES= pkgconfig
post-patch:
# Remove debug flag (-g) from CFLAGS
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 2aefc3f073ff..a984dc379c59 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: sisctrl
-# Date created: 14 Aug 2004
-# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= sisctrl
PORTVERSION= 0.0.20051202
@@ -14,9 +10,9 @@ MASTER_SITES= http://www.winischhofer.net/sis/
MAINTAINER= bland@FreeBSD.org
COMMENT= Display Control Panel for XFree86/X.org SiS driver
+USES= gmake pkgconfig
USE_XORG= x11 ice xxf86vm xinerama xv xrandr xext sm
USE_GNOME= gtk20
-USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include