From 992586fa0863f8346a19cbcdfbba376c5c4dfd43 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 23 Apr 2013 14:20:25 +0000
Subject: Finish converting the whole ports tree to USES=pkgconfig
---
archivers/libcomprex/Makefile | 10 ++--------
archivers/liborange/Makefile | 3 +--
archivers/libpar2/Makefile | 2 +-
archivers/py-liblzma/Makefile | 2 +-
archivers/squeeze/Makefile | 2 +-
astro/viking/Makefile | 2 +-
audio/xfce4-mixer/Makefile | 2 +-
audio/xfce4-mpc-plugin/Makefile | 3 +--
biology/xmolwt/Makefile | 2 +-
databases/mydumper/Makefile | 3 +--
databases/mysqlcppapi/Makefile | 9 ++-------
databases/rrdtool10/Makefile | 2 +-
databases/sqlite2/Makefile | 2 +-
databases/sqlite3/Makefile | 2 +-
databases/tdb/Makefile | 2 +-
korean/scim-hangul/Makefile | 2 +-
korean/scim-tables/Makefile | 2 +-
lang/embryo/Makefile | 3 +--
lang/fsharp/Makefile | 2 +-
lang/gjs/Makefile | 2 +-
lang/gnustep-base/Makefile | 2 +-
lang/lua/Makefile | 2 +-
lang/vala/Makefile | 3 +--
mail/claws-mail/Makefile | 2 +-
mail/deforaos-mailer/Makefile | 2 +-
mail/gmime2/Makefile | 8 ++------
mail/gmime24/Makefile | 8 ++------
mail/libmapi/Makefile | 2 +-
mail/masqmail/Makefile | 8 ++------
mail/notmuch/Makefile | 2 +-
mail/spmfilter-clamav/Makefile | 2 +-
mail/spmfilter-spamassassin/Makefile | 2 +-
mail/spmfilter/Makefile | 9 ++-------
math/calcoo/Makefile | 2 +-
math/fftw3/Makefile | 3 +--
math/freemat/Makefile | 9 ++-------
math/libqalculate/Makefile | 2 +-
math/py-matplotlib/Makefile | 2 +-
math/wfmath/Makefile | 3 +--
misc/gkx86info2/Makefile | 2 +-
misc/gnome-user-docs/Makefile | 8 ++------
misc/linm/Makefile | 2 +-
misc/mc-light/Makefile | 2 +-
misc/mc/Makefile | 8 ++------
misc/metalink-tools/Makefile | 8 ++------
misc/salias/Makefile | 2 +-
misc/shared-mime-info/Makefile | 3 +--
misc/xdelta/Makefile | 2 +-
misc/xfce4-weather-plugin/Makefile | 2 +-
multimedia/aegisub/Makefile | 2 +-
multimedia/assimp/Makefile | 3 +--
multimedia/avidemux2/Makefile.common | 3 +--
multimedia/beep-media-player/Makefile | 2 +-
multimedia/bino/Makefile | 8 ++------
multimedia/bombono/Makefile | 2 +-
multimedia/cclive/Makefile | 2 +-
multimedia/deforaos-player/Makefile | 3 +--
multimedia/dvdauthor/Makefile | 2 +-
multimedia/dvdstyler/Makefile | 3 +--
multimedia/ffmpeg-devel/Makefile | 8 ++------
multimedia/ffmpeg/Makefile | 7 ++-----
multimedia/ffmpeg1/Makefile | 8 ++------
multimedia/ffmpegthumbnailer/Makefile | 2 +-
multimedia/freetuxtv/Makefile | 2 +-
multimedia/gavl/Makefile | 3 +--
multimedia/gmerlin-avdecoder/Makefile | 9 ++-------
multimedia/gmtk/Makefile | 3 +--
multimedia/gstreamer-plugins-all/Makefile | 2 +-
multimedia/gstreamer-plugins/Makefile | 2 +-
multimedia/gstreamer/Makefile | 3 +--
multimedia/gstreamermm/Makefile | 2 +-
multimedia/libcec/Makefile | 2 +-
multimedia/libkate/Makefile | 2 +-
multimedia/libquicktime/Makefile | 4 +---
multimedia/libquvi/Makefile | 3 +--
multimedia/libxine/Makefile | 2 +-
multimedia/lives/Makefile | 2 +-
multimedia/mlt/Makefile | 2 +-
multimedia/mythtv/Makefile | 2 +-
multimedia/oggvideotools/Makefile | 3 +--
multimedia/py-gstreamer/Makefile | 2 +-
multimedia/qmmp-plugin-pack/Makefile | 9 ++-------
multimedia/qmmp/Makefile | 9 ++-------
multimedia/quvi/Makefile | 2 +-
multimedia/sabbu/Makefile | 2 +-
multimedia/vcdimager/Makefile | 1 -
multimedia/vdr-plugin-softdevice/Makefile | 8 ++------
multimedia/vdr-plugin-softhddevice/Makefile | 8 ++------
multimedia/vdr-plugin-xineliboutput/Makefile | 8 ++------
multimedia/vdr/Makefile | 2 +-
multimedia/xbmc-pvr/Makefile | 2 +-
multimedia/xbmc/Makefile | 2 +-
multimedia/xfce4-media/Makefile | 3 +--
multimedia/xfce4-parole/Makefile | 3 +--
net-im/climm/Makefile | 9 ++-------
net-im/farsight2/Makefile | 2 +-
net-im/libjingle/Makefile | 2 +-
net-im/libnice/Makefile | 2 +-
net-im/mcabber/Makefile | 2 +-
net-im/meanwhile/Makefile | 8 ++------
net-im/mu-conference/Makefile | 7 ++-----
net-im/psi/Makefile | 2 +-
net-im/telepathy-idle/Makefile | 2 +-
net-im/telepathy-logger/Makefile | 2 +-
net-im/telepathy-qt4/Makefile | 2 +-
net-im/telepathy-salut/Makefile | 2 +-
net-mgmt/bwm-ng/Makefile | 8 ++------
net-mgmt/collectd/Makefile | 2 +-
net-mgmt/collectd5/Makefile | 4 ++--
net-mgmt/gsnmp/Makefile | 8 ++------
net-mgmt/jnettop/Makefile | 8 ++------
net-mgmt/tork/Makefile | 6 +-----
net-mgmt/yaf/Makefile | 2 +-
net-mgmt/zabbix2-server/Makefile | 8 ++------
net-p2p/amule-devel/Makefile | 3 +--
net-p2p/amule/Makefile | 3 +--
net-p2p/gkremldk/Makefile | 8 ++------
net-p2p/libtorrent-devel/Makefile | 3 +--
net-p2p/libtorrent-rasterbar-16/Makefile | 3 +--
net-p2p/libtorrent/Makefile | 3 +--
net-p2p/ncdc/Makefile | 2 +-
net-p2p/qbittorrent/Makefile | 2 +-
net-p2p/rtorrent-devel/Makefile | 2 +-
net-p2p/rtorrent/Makefile | 2 +-
net-p2p/transmission-cli/Makefile | 2 +-
net/coda6_server/Makefile | 7 ++-----
net/ecore-con/Makefile | 2 +-
net/freerdp/Makefile | 3 +--
net/freeswitch-core-devel/Makefile | 3 +--
net/freeswitch-core/Makefile | 3 +--
net/g2ipmsg/Makefile | 3 +--
net/gnet2/Makefile | 2 +-
net/gsk/Makefile | 3 +--
net/gssdp/Makefile | 3 +--
net/gupnp-av/Makefile | 3 +--
net/gupnp-igd/Makefile | 3 +--
net/gupnp-ui/Makefile | 3 +--
net/gupnp/Makefile | 3 +--
net/libcmis/Makefile | 3 +--
net/libfixbuf/Makefile | 8 ++------
net/libnfs/Makefile | 2 +-
net/libnids/Makefile | 2 +-
net/linc/Makefile | 8 ++------
net/mosh/Makefile | 2 +-
net/mtr/Makefile | 2 +-
net/nbd-server/Makefile | 2 +-
net/net6/Makefile | 9 ++-------
net/netembryo/Makefile | 3 +--
net/packter-agent/Makefile | 8 ++------
net/radvd/Makefile | 8 ++------
net/samba34/Makefile | 8 ++------
net/samba36/Makefile | 2 +-
net/samba4/Makefile | 2 +-
net/silc-client/Makefile | 8 ++------
net/skstream/Makefile | 3 +--
net/tapidbus/Makefile | 3 +--
net/tigervnc/Makefile | 3 +--
net/wireshark/Makefile | 2 +-
net/yaz/Makefile | 2 +-
palm/barry/Makefile | 2 +-
palm/gnome-pilot/Makefile | 3 +--
palm/jpilot/Makefile | 2 +-
palm/pilot-link/Makefile | 3 +--
polish/ekg/Makefile | 3 +--
polish/kadu/Makefile | 3 +--
print/cups-base/Makefile | 2 +-
print/deforaos-pdfviewer/Makefile | 2 +-
print/harfbuzz/Makefile | 3 +--
print/hplip/Makefile | 2 +-
print/libgnomecups/Makefile | 2 +-
print/libijs/Makefile | 7 +------
print/libmspub/Makefile | 3 +--
print/p5-Font-FreeType/Makefile | 8 ++------
print/panda/Makefile | 9 ++-------
print/pslib/Makefile | 3 +--
print/scribus-devel/Makefile | 3 +--
print/ttf2pt1/Makefile | 2 +-
science/ghemical/Makefile | 2 +-
science/gnudatalanguage/Makefile | 2 +-
science/gromacs/Makefile | 3 +--
science/libghemical/Makefile | 3 +--
security/gnutls/Makefile | 8 ++------
security/gpa/Makefile | 8 ++------
security/gtkportscan/Makefile | 2 +-
security/kopete-otr/Makefile | 8 ++------
security/libntlm/Makefile | 3 +--
security/libprelude/Makefile | 3 +--
security/oath-toolkit/Makefile | 3 +--
security/openconnect/Makefile | 3 +--
security/opensc/Makefile | 2 +-
security/openvas-libraries/Makefile | 8 ++------
security/pam_yubico/Makefile | 2 +-
security/prelude-lml/Makefile | 2 +-
security/prelude-manager/Makefile | 7 ++-----
security/py-otr/Makefile | 2 +-
security/revelation/Makefile | 3 +--
security/rifiuti2/Makefile | 2 +-
security/suricata/Makefile | 2 +-
security/trousers/Makefile | 2 +-
security/xmlsec1/Makefile | 2 +-
security/ykpers/Makefile | 2 +-
sysutils/archivemount/Makefile | 3 +--
sysutils/conky/Makefile | 2 +-
sysutils/eiciel/Makefile | 3 +--
sysutils/flashrom/Makefile | 8 ++------
sysutils/fusefs-afuse/Makefile | 3 +--
sysutils/fusefs-cryptofs/Makefile | 3 +--
sysutils/fusefs-curlftpfs/Makefile | 3 +--
sysutils/fusefs-fur/Makefile | 3 +--
sysutils/fusefs-gnome-vfs/Makefile | 3 +--
sysutils/fusefs-httpfs/Makefile | 3 +--
sysutils/fusefs-libs/Makefile | 2 +-
sysutils/fusefs-mhddfs/Makefile | 3 +--
sysutils/fusefs-ntfs/Makefile | 3 +--
sysutils/fusefs-sshfs/Makefile | 3 +--
sysutils/fusefs-wdfs/Makefile | 3 +--
sysutils/fusefs-zip/Makefile | 3 +--
sysutils/gapcmon/Makefile | 2 +-
sysutils/garcon/Makefile | 8 ++------
sysutils/gkleds2/Makefile | 8 ++------
sysutils/gksu/Makefile | 3 +--
sysutils/goaccess/Makefile | 8 ++------
sysutils/graveman/Makefile | 3 +--
sysutils/gsmartcontrol/Makefile | 8 ++------
sysutils/gtk-imonc/Makefile | 2 +-
sysutils/hardlink/Makefile | 8 ++------
sysutils/hdup/Makefile | 2 +-
sysutils/iextract/Makefile | 8 ++------
sysutils/kcm-polkit-kde/Makefile | 3 +--
sysutils/lcdproc/Makefile | 2 +-
sysutils/libgksu/Makefile | 2 +-
sysutils/libzeitgeist/Makefile | 3 +--
sysutils/moosefs-client/Makefile | 3 +--
sysutils/ntfsprogs/Makefile | 3 +--
sysutils/nut22/Makefile | 2 +-
sysutils/p5-Fuse/Makefile | 3 +--
sysutils/polkit/Makefile | 2 +-
sysutils/pyrenamer/Makefile | 4 ++--
sysutils/quicksynergy/Makefile | 3 +--
sysutils/rdup/Makefile | 2 +-
sysutils/rsyslog5-relp/Makefile | 8 ++------
sysutils/rsyslog5-rfc3195/Makefile | 8 ++------
sysutils/rsyslog5/Makefile | 8 ++------
sysutils/rsyslog6-devel-gnutls/Makefile | 8 ++------
sysutils/rsyslog6-devel-relp/Makefile | 8 ++------
sysutils/rsyslog6-devel-rfc3195/Makefile | 8 ++------
sysutils/rsyslog6-gnutls/Makefile | 8 ++------
sysutils/rsyslog6-relp/Makefile | 8 ++------
sysutils/rsyslog6-rfc3195/Makefile | 6 ++----
sysutils/rsyslog7/Makefile | 8 ++++----
sysutils/sensors-applet/Makefile | 3 +--
sysutils/serpentine/Makefile | 7 ++-----
sysutils/tmux/Makefile | 2 +-
sysutils/unieject/Makefile | 3 +--
sysutils/wmfire/Makefile | 8 ++------
sysutils/xfburn/Makefile | 3 +--
sysutils/xfce4-fsguard-plugin/Makefile | 8 ++------
sysutils/xfce4-netload-plugin/Makefile | 8 ++------
sysutils/xfce4-settings/Makefile | 3 +--
textproc/ctpl/Makefile | 2 +-
textproc/enchant/Makefile | 3 +--
textproc/gmetadom/Makefile | 3 +--
textproc/gnome-translate/Makefile | 3 +--
textproc/goldendict/Makefile | 2 +-
textproc/hyphen/Makefile | 2 ++
textproc/iksemel/Makefile | 12 +++---------
textproc/libcroco/Makefile | 2 +-
textproc/liblrdf/Makefile | 3 +--
textproc/libmrss/Makefile | 3 +--
textproc/libtre/Makefile | 3 +--
textproc/libvisio/Makefile | 3 +--
textproc/mythes/Makefile | 8 +-------
textproc/rasqal/Makefile | 2 +-
textproc/redland/Makefile | 2 +-
textproc/ruby-sary/Makefile | 2 +-
textproc/sagasu/Makefile | 3 +--
textproc/sary/Makefile | 3 +--
textproc/scim-openvanilla/Makefile | 8 ++------
textproc/sdcv/Makefile | 7 ++-----
textproc/sigil/Makefile | 3 +--
textproc/soothsayer/Makefile | 8 ++------
textproc/soprano/Makefile | 3 +--
textproc/the_silver_searcher/Makefile | 2 +-
textproc/xml2/Makefile | 2 +-
textproc/xmlwrapp/Makefile | 3 +--
www/bookmarkbridge/Makefile | 8 ++------
www/cherokee/Makefile | 3 +--
www/dansguardian-devel/Makefile | 2 +-
www/deforaos-surfer/Makefile | 2 +-
www/erwn/Makefile | 3 +--
www/gecko-mediaplayer/Makefile | 2 +-
www/httpsqs/Makefile | 8 ++------
www/lighttpd/Makefile | 8 ++------
www/luakit/Makefile | 2 +-
www/midori/Makefile | 3 +--
www/mod_gnutls/Makefile | 2 +-
www/multiwatch/Makefile | 2 +-
www/openvrml/Makefile | 3 +--
www/qt4-webkit/Makefile | 2 +-
www/screem/Makefile | 3 +--
www/squid32/Makefile | 2 +-
www/surf/Makefile | 2 +-
www/tickr/Makefile | 2 +-
www/volta/Makefile | 8 ++------
www/webkit-gtk2/Makefile | 3 +--
www/webkit-gtk3/Makefile | 3 +--
www/xfce4-smartbookmark-plugin/Makefile | 2 +-
www/xombrero/Makefile | 4 ++--
www/xsp/Makefile | 9 ++-------
x11-clocks/buici-clock/Makefile | 3 +--
x11-clocks/dclock/Makefile | 2 +-
x11-clocks/xfce4-datetime-plugin/Makefile | 3 +--
x11-clocks/xfce4-timer-plugin/Makefile | 8 ++------
x11-fm/deforaos-browser/Makefile | 3 +--
x11-fm/rox-filer/Makefile | 2 +-
x11-fm/tdfsb/Makefile | 8 ++------
x11-fm/thunar-vfs/Makefile | 2 +-
x11-fm/thunar/Makefile | 2 +-
x11-fonts/cantarell-fonts/Makefile | 2 +-
x11-fonts/font-util/Makefile | 2 +-
x11-themes/bluecurve-themes/Makefile | 2 +-
x11-themes/clearlooks/Makefile | 8 ++------
x11-themes/gtk-cleanice-engine/Makefile | 3 +--
x11-themes/gtk-oxygen-engine/Makefile | 3 +--
x11-themes/gtk-xfce-engine/Makefile | 8 ++------
x11-themes/gtk3-oxygen-engine/Makefile | 3 +--
x11-themes/gtk3-unico-engine/Makefile | 3 +--
x11-themes/icon-naming-utils/Makefile | 3 +--
x11-themes/thewidgetfactory/Makefile | 2 +-
x11-toolkits/c++-gtk-utils/Makefile | 3 +--
x11-toolkits/fltk/Makefile | 2 +-
x11-toolkits/fxscintilla/Makefile | 3 +--
x11-toolkits/gtkdatabox/Makefile | 3 +--
x11-toolkits/gtkextra2/Makefile | 5 ++---
x11-toolkits/gtkglext/Makefile | 3 +--
x11-toolkits/gtkglextmm/Makefile | 3 +--
x11-toolkits/gtkmathview/Makefile | 3 +--
x11-toolkits/gtkunique/Makefile | 2 +-
x11-toolkits/libsexy/Makefile | 2 +-
x11-toolkits/p5-Gnome2-Canvas/Makefile | 9 ++-------
x11-toolkits/p5-Gnome2-VFS/Makefile | 9 ++-------
x11-toolkits/p5-Gtk2-Html2/Makefile | 9 ++-------
x11-toolkits/pango/Makefile | 2 +-
x11-toolkits/pangoxsl/Makefile | 3 +--
x11-toolkits/phat/Makefile | 5 ++---
x11-toolkits/py-gtkglext/Makefile | 3 +--
x11-toolkits/py-sexy/Makefile | 8 ++------
x11-toolkits/qt4-gui/Makefile | 2 +-
x11-toolkits/rep-gtk2/Makefile | 3 +--
x11-toolkits/sakura/Makefile | 9 ++-------
x11-toolkits/termit/Makefile | 3 +--
x11-wm/compizconfig-backend-gconf/Makefile | 3 +--
x11-wm/compizconfig-python/Makefile | 3 +--
x11-wm/devilspie/Makefile | 8 ++------
x11-wm/e16utils/Makefile | 2 +-
x11-wm/echinus/Makefile | 2 +-
x11-wm/emerald/Makefile | 3 +--
x11-wm/libcompizconfig/Makefile | 3 +--
x11-wm/pager/Makefile | 2 +-
x11-wm/windowlab/Makefile | 2 +-
x11-wm/windowmaker/Makefile | 3 +--
x11-wm/wmfs/Makefile | 2 +-
x11-wm/xfce4-desktop/Makefile | 4 +---
x11-wm/xfce4-panel/Makefile | 4 +---
x11-wm/xfce4-session/Makefile | 3 +--
x11/apwal/Makefile | 8 ++------
x11/avant-window-navigator/Makefile | 3 +--
x11/babl/Makefile | 3 +--
x11/decurs/Makefile | 8 ++------
x11/deforaos-keyboard/Makefile | 3 +--
x11/deforaos-libdesktop/Makefile | 2 +-
x11/deforaos-locker/Makefile | 3 +--
x11/deforaos-panel/Makefile | 3 +--
x11/ecore-imf/Makefile | 2 +-
x11/ecore-imf_evas/Makefile | 2 +-
x11/ecore-input/Makefile | 2 +-
x11/ecore-input_evas/Makefile | 2 +-
x11/efreet/Makefile | 3 +--
x11/fbpanel/Makefile | 2 +-
x11/gnome-clipboard-daemon/Makefile | 2 +-
x11/gnome-menus/Makefile | 2 +-
x11/gnome-pie/Makefile | 3 +--
x11/gromit/Makefile | 2 +-
x11/gsynaptics/Makefile | 3 +--
x11/gtkterm2/Makefile | 2 +-
x11/idesk/Makefile | 2 +-
x11/kde4-workspace/Makefile | 3 +--
x11/keybinder/Makefile | 2 +-
x11/keyboardcast/Makefile | 2 +-
x11/libXcm/Makefile | 2 +-
x11/libexo/Makefile | 2 +-
x11/libfm/Makefile | 2 +-
x11/libxfce4menu/Makefile | 8 ++------
x11/libxfce4util/Makefile | 8 ++------
x11/roxterm/Makefile | 2 +-
x11/simdock/Makefile | 3 +--
x11/slim/Makefile | 3 +--
x11/wmblob/Makefile | 8 ++------
x11/wmdrawer/Makefile | 9 ++-------
x11/workrave/Makefile | 3 +--
x11/xfce4-clipman-plugin/Makefile | 2 +-
x11/xfce4-conf/Makefile | 8 ++------
x11/xfce4-screenshooter-plugin/Makefile | 3 +--
x11/xfce4-terminal/Makefile | 2 +-
x11/xfce4-verve-plugin/Makefile | 2 +-
x11/xscreensaver/Makefile | 2 +-
x11/xvattr/Makefile | 9 ++-------
407 files changed, 506 insertions(+), 1035 deletions(-)
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index bd253ec95206..2598e385e4da 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for: libcomprex
-# Date created: Nov 22, 2001
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= libcomprex
PORTVERSION= 0.3.3
@@ -17,13 +12,12 @@ COMMENT= Transparently handles automatic compression and decompression of files
LICENSE= LGPL21
-USE_PKGCONFIG= yes
#LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
OPTIONS_DEFINE= NLS
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 61744897c473..48712d2cae46 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -25,8 +25,7 @@ MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_ICONV= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index 1ddde2347392..df95f885a0dd 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -18,7 +18,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= ENABLECANCEL
OPTIONS_DEFAULT= ENABLECANCEL
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index 4597a2b9b888..1d5e84c0f4d0 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PYDISTUTILS_PKGNAME}-${PORTVERSION}
MAINTAINER= dbn@FreeBSD.org
COMMENT= Python binding for the LZMA compression library
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_BZIP2= yes
USE_PYTHON= 2.6+
USE_PYDISTUTILS=yes
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 9399ca32a08b..a3dadc1f455e 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS= thunar-vfs-1:${PORTSDIR}/x11-fm/thunar-vfs
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+USES= pkgconfig
USE_XFCE= configenv libutil thunar
USE_XORG= x11
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils
@@ -27,7 +28,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GETTEXT= yes
MAKE_JOB_SAFE= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= DOCS
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 5baa856865bc..698f382731ff 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -23,13 +23,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
xcb:${PORTSDIR}/x11/libxcb
RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel
+USES= pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender
USE_GNOME= desktopfileutils gnomedocutils gtk20
-USE_PKGCONFIG= build
USE_PERL5_RUN= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index d4e21e545473..5890b4ae93d2 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -17,12 +17,12 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+USES= pkgconfig
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils
USE_XFCE= configenv libmenu libutil panel xfconf
-USE_PKGCONFIG= build
USE_GSTREAMER= good
MAKE_JOBS_UNSAFE= yes
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 685a79a17180..9e8a7b3ce5d2 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -1,6 +1,5 @@
# Created by: Martin Wilke (miwi@FreeBSD.org)
# $FreeBSD$
-#
PORTNAME= xfce4-mpc-plugin
PORTVERSION= 0.4.4
@@ -15,12 +14,12 @@ COMMENT= An MPC plugin for Xfce
LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack
USE_XFCE= configenv libexo libmenu panel
-USE_PKGCONFIG= build
.include <bsd.port.mk>
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 0fe0de72a8ed..e8368fee3f1d 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -23,8 +23,8 @@ PLIST_FILES= bin/gmolwt bin/molwt
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK2}
+USES+= pkgconfig
USE_GNOME= gtk20
-USE_PKGCONFIG= build
MAKE_ENV+= GTKCONFIG="pkg-config gtk+-2.0"
.else
USE_GNOME= gtk12
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index c4428b0cb80e..595f7c5917c5 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -19,9 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
FETCH_ARGS?= -pRr
PLIST_FILES= sbin/mydumper sbin/myloader
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_MYSQL= yes
-USES= cmake
+USES= cmake pkgconfig
post-patch:
@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/CMakeLists.txt
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 92980147642f..7bf86a8d78db 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -1,9 +1,5 @@
-# ports collection makefile for: mysqlcppapi
-# Date created: 4 August 2004
-# Whom: Jie Gao <gaoj@cpsc.ucalgary.ca>
-#
+# Created by: Jie Gao <gaoj@cpsc.ucalgary.ca>
# $FreeBSD$
-#
PORTNAME= mysqlcppapi
PORTVERSION= 1.9.3
@@ -16,8 +12,7 @@ COMMENT= A fork of mysql++ C++ API for MySQL
USE_AUTOTOOLS= libtool
USE_MYSQL= yes
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 110adb441505..81bc812a2b24 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -16,7 +16,7 @@ MAKE_ENV= PERL=${PERL}
CONFLICTS= rrdtool-1.2*
LATEST_LINK= rrdtool10
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib \
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index c649c9bdd24b..49da7d0de48a 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES= http://www.sqlite.org/
MAINTAINER= ports@FreeBSD.org
COMMENT= An SQL database engine in a C library
+USES= pkgconfig
USE_GMAKE= YES
USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
-USE_PKGCONFIG= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 64096bb8f62e..b0e770bd79a8 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -17,7 +17,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
CONFLICTS= sqlite34-[0-9]* sqlcipher-[0-9]*
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index a58bf916bc13..4422d8496fe1 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
HAS_CONFIGURE= yes
WAF_TOOL= buildtools/bin/waf
CONFIGURE_SCRIPT= ${WAF_TOOL} configure
-USE_PKGCONFIG= build
+USES= pkgconfig
MAKE_JOBS_SAFE= yes
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index 2bbcd97cf05c..510822a4613e 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= hangul:${PORTSDIR}/korean/libhangul \
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= NLS
diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index b732548b8d35..7fa591c0907b 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
.include <bsd.port.pre.mk>
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index 643d0f7112d6..692b0e83eb0d 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD
DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= eina libtool_hack librt_hack
-USE_PKGCONFIG= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 3f8f0a402047..d685bfc67743 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -16,9 +16,9 @@ LICENSE= AL2
BUILD_DEPENDS= mono>=3.0:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono>=3.0:${PORTSDIR}/lang/mono
+USES= pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-USE_PKGCONFIG= build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 48b14a2e6f8b..4bdc5b23d62a 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_PYTHON_BUILD=yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 18c44389e7f7..7d40861ed439 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -31,7 +31,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
USE_ICONV= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index a92bf70dcd68..709eaeb8862e 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -20,7 +20,7 @@ PATCH_WRKSRC= ${WRKSRC}/src
USE_LUA= 5.1
LUA_COMPS= # only define variables
ALL_TARGET= freebsd
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}"
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 05fcf6ea6f76..907ed8f4052c 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -12,11 +12,10 @@ COMMENT= Programming language and compiler that converts Vala code into C code
LICENSE= LGPL21
-USES= bison pathfix
+USES= bison pathfix pkgconfig
USE_XZ= yes
USE_GNOME= glib20 gnomeprefix libxslt
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_GETTEXT= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 02b99be04861..03ae5d8a2186 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -42,7 +42,7 @@ USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender
USE_GNOME= atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index c1e2d245f33a..27ef4d506103 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= System:${PORTSDIR}/devel/deforaos-libsystem \
Desktop:${PORTSDIR}/x11/deforaos-libdesktop
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 0f8699eaaf5b..7a65d0c7d2d6 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gmime2
-# Date created: 16 Apr 2001
-# Whom: Kirill Ponomarew <ponomarew@oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
# $FreeBSD$
-#
PORTNAME= gmime
PORTVERSION= 2.2.27
@@ -23,7 +19,7 @@ SLAVEDIRS= mail/gmime2-sharp
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME?= gnomehack glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 48219c01f537..79e163d4639d 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gmime2
-# Date created: 16 Apr 2001
-# Whom: Kirill Ponomarew <ponomarew@oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
# $FreeBSD$
-#
PORTNAME= gmime
PORTVERSION= 2.4.33
@@ -25,7 +21,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}24
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME?= gnomehack glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
USE_XZ= yes
GNU_CONFIGURE= yes
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 4e395e8b5a2d..1fe8d640dc2b 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -25,7 +25,7 @@ HOSTCONFIG= ${LOCALBASE}/libdata/pkgconfig/samba-hostconfig.pc
CODENAME= COCHRANE
USE_GMAKE= yes
USE_SQLITE= 3
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile
index 9f87ea1735d5..eb47e2d4ecec 100644
--- a/mail/masqmail/Makefile
+++ b/mail/masqmail/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: masqmail
-# Date created: 4 Apr 2004
-# Whom: Andrey Slusar <anray@FreeBSD.org>
-#
+# Created by: Andrey Slusar <anray@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= masqmail
PORTVERSION= 0.3.4
@@ -20,7 +16,7 @@ MAN8= masqmail.8 rmail.8
.endif
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_RC_SUBR= masqmail
GNU_CONFIGURE= yes
CFLAGS+= -Wno-trigraphs
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index d08cebc61b6c..2f05dca06e39 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \
talloc:${PORTSDIR}/devel/talloc
HAS_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/mail/spmfilter-clamav/Makefile b/mail/spmfilter-clamav/Makefile
index de62faf40ee0..815a5d0f6aa0 100644
--- a/mail/spmfilter-clamav/Makefile
+++ b/mail/spmfilter-clamav/Makefile
@@ -19,7 +19,7 @@ CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
USE_LDCONFIG= ${PREFIX}/lib/spmfilter
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS= DEBUG "Enable Debugging" off
diff --git a/mail/spmfilter-spamassassin/Makefile b/mail/spmfilter-spamassassin/Makefile
index ed18252c52da..cf57c768e0ab 100644
--- a/mail/spmfilter-spamassassin/Makefile
+++ b/mail/spmfilter-spamassassin/Makefile
@@ -18,7 +18,7 @@ CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
USE_LDCONFIG= ${PREFIX}/lib/spmfilter
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS= DEBUG "Enable Debugging" off
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index 27181bf9e928..9966f0e53a05 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: spmfilter
-# Date created: 2010-04-12
-# Whom: Frank Wall <fw@moov.de>
-#
+# Created by: Frank Wall <fw@moov.de>
# $FreeBSD$
-#
PORTNAME= spmfilter
PORTVERSION= 0.4.2
@@ -24,10 +20,9 @@ RUN_DEPENDS= gmime-24>=2.4:${PORTSDIR}/mail/gmime24 \
LICENSE= LGPL3
-USES= cmake
+USES= cmake pkgconfig
CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
-USE_PKGCONFIG= build
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
USE_RC_SUBR= ${PORTNAME}
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 43aa9fd3e77f..c3d74b35ec12 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= SF
MAINTAINER= naddy@FreeBSD.org
COMMENT= RPN and algebraic scientific calculator
+USES= pkgconfig
USE_GNOME= gtk20
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 9fafb2925de5..e69d25bb5626 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -19,10 +19,9 @@ FFTW3_FLAVOR?= default
FFTW3_SUFX=
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
CONFIGURE_ARGS = --enable-shared --enable-threads --disable-fortran
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 134c01580079..cd5b3dc02a63 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: FreeMat
-# Date created: Sat 26 mar 2005
-# Whom: Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
# $FreeBSD$
-#
PORTNAME= FreeMat
PORTVERSION= 4.0
@@ -34,8 +30,7 @@ USE_FORTRAN= yes
FFLAGS+= -O2
USE_GL= yes
-USE_PKGCONFIG= yes
-USES= cmake
+USES= cmake pkgconfig
USE_QT4= gui network opengl moc_build rcc_build uic_build \
qmake_build xml svg
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC}
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 899a43802831..16b58cd0033a 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -12,7 +12,7 @@ COMMENT= Multi-purpose desktop calculator (backend library)
LIB_DEPENDS= cln:${PORTSDIR}/math/cln
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= glib20 gnomehack intlhack libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 7cc1ec315aee..a4cc7132d818 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
png15:${PORTSDIR}/graphics/png
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PYTHON= yes
USE_PYDISTUTILS=yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index 0226fb6e3ce7..ad1a22690ec0 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -10,8 +10,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Worldforge math library
USE_GMAKE= yes
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index e33286a6036d..40207311f868 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkre
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
ONLY_FOR_ARCHS= i386 amd64
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gtk20
WRKSRC= ${WRKDIR}/gkx86info${PORTVERSION}
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index e3a0e3796cd6..25a1aec54cc6 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gnomeuserdocs2
-# Date created: 07 July 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.62 2010/09/30 06:07:30 kwm Exp $
-#
PORTNAME= gnome-user-docs
PORTVERSION= 2.32.0
@@ -18,8 +14,8 @@ COMMENT= GNOME 2 users guide
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+USES= pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index f81b95073065..36791bab1fb0 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -12,9 +12,9 @@ DISTNAME= linm_${LINM_VER}-1
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Mdir, mc-style terminal file manager
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_ICONV= yes
-USE_PKGCONFIG= yes
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index c9a22a2e6839..0e112e91be22 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -19,9 +19,9 @@ OPTIONS_DEFINE= NLS SUBSHELL MC_IN_MC
SUBSHELL_DESC= Build with subshell support (only for bash!)
MC_IN_MC_DESC= Allow run mc inside mc (useful for mcedit)
+USES= pkgconfig
USE_GMAKE= yes
USE_ICONV= yes
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-included-slang \
--with-gettext \
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index d1871cbbf937..53a305005f53 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mc
-# Date created: 15 Jul 1995
-# Whom: torstenb@FreeBSD.org
-#
+# Created by: torstenb@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= mc
PORTVERSION= 4.8.1.7
@@ -22,9 +18,9 @@ LICENSE= GPLv3
CONFLICTS= mc-light-4*
+USES= pkgconfig
USE_GMAKE= yes
USE_GNOME= glib20
-USE_PKGCONFIG= yes
USE_PERL5= yes
USE_XZ= yes
GNU_CONFIGURE= yes
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index deccf4912de9..1a9257b4ed04 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Metalink tools
-# Date created: Sun 10 Aug 2008 04:22:51 UTC
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= metalink
PORTVERSION= 0.3.6
@@ -25,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= glib20
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ENV+= AWK="${AWK}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/misc/salias/Makefile b/misc/salias/Makefile
index f3abbafad473..3ecc85bbbb66 100644
--- a/misc/salias/Makefile
+++ b/misc/salias/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= SF/${PORTNAME}/C%20${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= CLI tool to alias arguments of other programs
+USES= pkgconfig
USE_BZIP2= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
MAN1= salias.1
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 12b26daad12a..1114b7e2e455 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -16,8 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-update-mimedb
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 libxml2 intltool intlhack
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 854f0ea9b9c2..c5fc4ebb6bcc 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= ports@FreeBSD.org
COMMENT= A diff/patch utility for binary files
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_GNOME= glib20
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index e84b9fffa2a1..0769d991d23a 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -16,12 +16,12 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+USES= pkgconfig
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 intltool intlhack libxml2
USE_XFCE= configenv libmenu libutil panel
-USE_PKGCONFIG= build
OPTIONS_DEFINE= UPOWER
UPOWER_DESC= Power state support
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 1fd91e6d59fc..ac7cf0383196 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -28,9 +28,9 @@ EFENCE_DESC= Electric Fence (require profiling)
ASS_DESC= libASS subtitle provider
HUNSPELL_DESC= Spell checking via Hunspell
+USES= pkgconfig
USE_GNOME= intltool
USE_WX= 2.8
-USE_PKGCONFIG= yes
WX_COMPS= wx contrib
WX_UNICODE= yes
WX_CONF_ARGS= absolute
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 35aff40d23bd..92120d26c7c2 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -17,8 +17,7 @@ LICENSE= BSD
LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs
USE_ZIP= yes
-USES= cmake
-USE_PKGCONFIG= build
+USES= cmake pkgconfig
USE_GCC= 4.6+ # 4.2+ causes compiler warnings
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 6de9f5f718b0..04898dcbee69 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -24,9 +24,8 @@ USE_QT4= # empty
USE_GMAKE= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
WANT_SDL= yes
-USES= cmake:outsource
+USES= cmake:outsource pkgconfig
CMAKE_USE_PTHREAD=yes
CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
MAKE_JOBS_UNSAFE= yes
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 2d117c05e307..683a0993ce3d 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -14,7 +14,7 @@ COMMENT= GTK2 multimedia player
LIB_DEPENDS= id3-3.8:${PORTSDIR}/audio/id3lib
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gnomehack gtk20 libglade2 desktopfileutils
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index c75137a11397..45a22c3a932c 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bino
-# Date created: 2012-03-12
-# Whom: Mykola Dzham <i@levsha.me>
-#
+# Created by: Mykola Dzham <i@levsha.me>
# $FreeBSD$
-#
PORTNAME= bino
PORTVERSION= 1.2.1
@@ -17,10 +13,10 @@ COMMENT= 3D video player with multi-display support
LICENSE= GPLv3
FETCH_ARGS= -Fpr
+USES= pkgconfig
USE_XZ= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
INSTALLS_ICONS= yes
USE_QT4= moc_build opengl rcc_build
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 233b5b4d3d91..4a71ee9ef495 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
toolame:${PORTSDIR}/audio/toolame
+USES= pkgconfig
USE_BZIP2= yes
USE_SCONS= yes
-USE_PKGCONFIG= build
USE_GCC= 4.2+
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index 7dd07a0f92d5..874ba6bbc71c 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-boost=${LOCALBASE}
MAKE_JOBS_SAFE= yes
+USES= pkgconfig
USE_XZ= yes
-USE_PKGCONFIG= build
MAN1= cclive.1
PLIST_FILES= bin/ccl \
diff --git a/multimedia/deforaos-player/Makefile b/multimedia/deforaos-player/Makefile
index a2ade9d0f561..f0bfdb31d944 100644
--- a/multimedia/deforaos-player/Makefile
+++ b/multimedia/deforaos-player/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
MAKE_ARGS+= PREFIX=${PREFIX}
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
-USE_GETTEXT= yes
+USES= pkgconfig gettext
.include <bsd.port.mk>
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 54a44b0af1a1..c9b0e695469f 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS= dvdread:${PORTSDIR}/multimedia/libdvdread \
WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= pkgconfig
USE_GNOME= libxml2
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_ICONV= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 99ef0af82f30..6f4fafa5d9b3 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -29,14 +29,13 @@ RUN_DEPENDS= wxsvg>=1.1.13:${PORTSDIR}/graphics/wxsvg \
OPTIONS_DEFINE= GNOME DOCS
+USES= pkgconfig gettext
USE_BZIP2= yes
USE_WX= 2.8
WX_COMPS= wx svg
WX_CONF_ARGS= absolute
USE_GNOME= desktopfileutils
-USE_GETTEXT= yes
USE_CDRTOOLS= yes # dvdstyler needs mkisofs
-USE_PKGCONFIG= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index fd6d2b051e9a..7a09be92b9dc 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ffmpeg-devel
-# Date created: 2009-08-12
-# Whom: Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= ffmpeg
DISTVERSION= 2012-10-13
@@ -34,11 +30,11 @@ FETCH_URL= "http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};s
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
+USES= pkgconfig
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_SDL= yes
USE_PERL5_BUILD= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2310dae21454..6c0f284df7c9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: ffmpeg cvs
-# Date created: Sun May 1 20:46:59 UTC 2005
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
PORTNAME= ffmpeg
@@ -24,12 +21,12 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_SDL= yes
USE_PERL5_BUILD= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index 4a96c9a2d9b8..7e2483d6adcd 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ffmpeg1
-# Date created: 2012-10-14
-# Whom: Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= ffmpeg
PORTVERSION= 1.0.5
@@ -27,12 +23,12 @@ LATEST_LINK= ffmpeg${PKGNAMESUFFIX}
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_SDL= yes
USE_PERL5_BUILD= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 462915040b80..c37532a33590 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -19,7 +19,7 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gnomehack _glib20
USE_LDCONFIG= yes
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index d957fed7aff7..6d306ce6f5b0 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -30,7 +30,7 @@ USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
xi xinerama xrandr xrender
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_ICONV= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 0caed747f4cf..4f7787c1455a 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -12,9 +12,8 @@ COMMENT= A library for handling uncompressed video and audio data
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 77e21e6eeb88..c838555b6fd2 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gmerlin-avdecoder
-# Date created: 07 Nov 2008
-# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.2.0
@@ -29,12 +25,11 @@ DVDREAD_DESC= libdvdread support
GMERLIN_DESC= gmerlin support
SAMBA_DESC= Samba support using libsmbclient
-USES= pathfix
+USES= pathfix pkgconfig
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index 1ac3287ecada..432a0a492caa 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -17,9 +17,8 @@ USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_PERL5_BUILD= yes
-USE_PKGCONFIG= build
USE_XORG= x11
-USES= pathfix
+USES= pathfix pkgconfig
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index d6c504c6bcc9..6435ef6b8638 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -21,7 +21,7 @@ NO_BUILD= yes
USE_GSTREAMER= yes
.include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
-.for all in ${_USE_GSTREAMER10_ALL}
+.for all in ${_GSTREAMER_PLUGINS}
OPTIONS_DEFINE+= ${all:U}
${all:U}_DESC= ${all} plugin
OPTIONS_DEFAULT+= ${all:U}
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index f46fa82d5130..e1a41e6f0e21 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -47,7 +47,7 @@ WANT_GSTREAMER= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME+= gnomehack ltverhack ltasneededhack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= libtool
GST_PLUGIN?= base
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index fd5f915a05a6..383aa4991c64 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -17,11 +17,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
CFLAGS:= ${CFLAGS} -O2 -Wno-format
-USES= bison pathfix
+USES= bison pathfix pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 libxml2 ltverhack ltasneededhack
-USE_PKGCONFIG= build
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-tests \
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 02d05b141c5e..63a84b1550c2 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -14,11 +14,11 @@ LICENSE= LGPL21
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+USES= pkgconfig
USE_XZ= yes
USE_GMAKE= yes
USE_GSTREAMER= theora vorbis cdparanoia gio pango
USE_GNOME= gnomeprefix gnomehack
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-documentation
USE_LDCONFIG= yes
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index 381f47de0914..2d491cb04358 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -16,12 +16,12 @@ GH_ACCOUNT= Pulse-Eight
GH_COMMIT= 178d498
GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
+USES= pkgconfig
USE_GMAKE= yes
USE_AUTORECONF= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
ACLOCAL_ARGS= -I.
AUTOMAKE_ARGS= --add-missing
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 50feb132462b..961225555bf2 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \
png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
CFLAGS+= "-I${LOCALBASE}/include"
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 3e8d45bda8bc..b12620784169 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -18,10 +18,8 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USE_LDCONFIG= yes
-USE_GNOME= gnomehack
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig gettext
USE_GMAKE= yes
-USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= autoconf
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 081fa3302c30..8153b5c9e6c9 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -19,12 +19,11 @@ OPTIONS_DEFINE= DOCS
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_ICONV= yes
USE_LDCONFIG= yes
USE_LUA= yes
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
MAN3= libquvi.3
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index f3e28a4d48be..730e0cfa6c9b 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -37,6 +37,7 @@ BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
.endif
+USES= pkgconfig
USE_XZ= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
@@ -48,7 +49,6 @@ USE_GL= gl glu
USE_PERL5_BUILD=yes
USE_SDL= sdl
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}" \
EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index a805eeb461c8..4d2f2e87a9ad 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -42,9 +42,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
WRKSRC= ${WRKDIR}/${DISTNAME:L}
+USES= pkgconfig
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_CSTD= gnu89
USE_PYTHON= yes
USE_PERL5= yes
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 7d6467ab0938..eb619257a8e8 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -19,8 +19,8 @@ SLAVE_PORT?= no
# They both install bin/melt.
CONFLICTS_INSTALL= freeze-[0-9]*
+USES= pkgconfig
USE_GNOME= gnomehack libxml2
-USE_PKGCONFIG= build
USE_SDL= image
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gpl --enable-gpl3
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 16ae3703e9f9..7be709272c25 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \
CONFLICTS= mythtv-frontend-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
+USES= pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= yes
USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \
moc_build qmake_build rcc_build uic_build imageformats
QT_NONSTANDARD= yes
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index ce83b9992c01..2409910fe496 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \
vorbis:${PORTSDIR}/audio/libvorbis
USE_SDL= sdl
-USE_PKGCONFIG= build
-USES= cmake
+USES= cmake pkgconfig
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 52163f6bf91d..dbbd3dca16ab 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -19,11 +19,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
+USES= pkgconfig
USE_PYTHON= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pygobject gnomehack
-USE_PKGCONFIG= build
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 25ae614b1f50..15119c1c17e8 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for: qmmp-plugin-pack
-# Date created: Fri Jul 01 02:59:13 JST 2012
-# Whom: SimaMoto,RyoTa <liangtai.s4@gmail.com>
-#
+# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
# $FreeBSD$
-#
PORTNAME= qmmp-plugin-pack
PORTVERSION= 0.6.2
@@ -20,10 +16,9 @@ LIB_DEPENDS= qmmpui:${PORTSDIR}/multimedia/qmmp
BUILD_DEPENDS= qmmp>=0.6.0:${PORTSDIR}/multimedia/qmmp
USE_BZIP2= yes
-USES= cmake:outsource
+USES= cmake:outsource pkgconfig
USE_QT4= corelib gui qmake_build rcc_build moc_build linguist_build
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= FFAP MPG123 QSUI
OPTIONS_DEFAULT= FFAP MPG123 QSUI
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index e9ce84b39ac0..afd1cba957a4 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for: qmmp
-# Date created: Fri Jan 30 01:13:20 JST 2009
-# Whom: SimaMoto,RyoTa <liangtai.s4@gmail.com>
-#
+# Created by: SimaMoto,RyoTa <liangtai.s4@gmail.com>
# $FreeBSD$
-#
PORTNAME= qmmp
PORTVERSION= 0.6.3
@@ -17,11 +13,10 @@ COMMENT= A Qt4-based multimedia player
LICENSE= GPLv2
USE_BZIP2= yes
-USES= cmake:outsource
+USES= cmake:outsource pkgconfig
USE_QT4= corelib gui network xml \
qmake_build rcc_build uic_build moc_build linguist_build
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 104dd30dfe11..a6f4bdae61f9 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS= libquvi>=0.4.0:${PORTSDIR}/multimedia/libquvi
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_XZ= yes
-USE_PKGCONFIG= build
MAN1= quvi.1
PLIST_FILES= bin/quvi
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index b769ad259bd8..65a7ac3364e0 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -12,11 +12,11 @@ COMMENT= Program used to time subtitles
LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg \
sndfile:${PORTSDIR}/audio/libsndfile
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= yes
USE_GNOME= gtk20
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 7bd770112626..3a70087b3680 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -22,7 +22,6 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GNOME= lthack
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile
index dc6625d511f3..dcfea066f84b 100644
--- a/multimedia/vdr-plugin-softdevice/Makefile
+++ b/multimedia/vdr-plugin-softdevice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: vdr-plugin-softdevie
-# Date created: Wed Apr 14 18:11:42 CEST 2010
-# Whom: Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
# $FreeBSD$
-#
PORTNAME= vdr-plugin-softdevice
PORTVERSION= 0.5.0p20100414
@@ -18,8 +14,8 @@ COMMENT= Video Disk Recorder - softdevice plugin
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
+USES= pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= build
USE_XORG+= xv x11 xinerama
PATCH_STRIP= -p1
HAVE_CONFIGURE= yes
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index 4ccc43df4061..acc75d229043 100644
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: vdr-plugin-softhddevie
-# Date created: Sun Apr 29 17:00:02 CEST 2012
-# Whom: Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
# $FreeBSD$
-#
PORTNAME= vdr-plugin-softhddevice
PORTVERSION= 0.5.1
@@ -22,7 +18,7 @@ LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \
xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
asound:${PORTSDIR}/audio/alsa-lib
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG+= xv x11 xinerama
USE_GL+= gl glu
PATCH_STRIP= -p1
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index f0920b6697e3..abaa10ac31c3 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: vdr-plugin-xineliboutput
-# Date created: Wed Apr 14 18:11:42 CEST 2010
-# Whom: Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
# $FreeBSD$
-#
PORTNAME= vdr-plugin-xineliboutput
PORTVERSION= 1.0.90s20120511
@@ -25,7 +21,7 @@ LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine \
USE_BZIP2= yes
PATCH_STRIP= -p1
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG+= xrandr xrender
USE_GL= gl glu glut
PORTDOCS= COPYING README HISTORY
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 33625c2d90ba..3ba84d7fc332 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -22,10 +22,10 @@ DVBPATCH_DESC= DVB audio patch for some countries
STB0899_SIGNAL_DESC= STB0899 signal strength patch
OPTIONS_DEFAULT= IPTVPATCH TTXPATCH
+USES= pkgconfig
DIST_SUBDIR= vdr
USE_BZIP2= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GETTEXT= yes
USE_ICONV= yes
PORTDOCS= COPYING INSTALL MANUAL README HISTORY
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index b56c74f39468..e6827198181b 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -63,8 +63,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
GITHASH= 9023e39
WRKSRC= ${WRKDIR}/opdenkamp-${PORTNAME}-${GITHASH}
FETCH_ARGS= -Fpr
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= autoconf libtool automake libltdl
GNU_CONFIGURE= yes
USE_XORG= xinerama xt xmu xtst
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 87a599ab0053..f50491e1904b 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -52,8 +52,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
xdpyinfo:${PORTSDIR}/x11/xdpyinfo
FETCH_ARGS= -Fpr
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= autoconf libtool automake libltdl
GNU_CONFIGURE= yes
USE_XORG= xt xmu xrandr xtst
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 1ac1340db288..4905303aeaf5 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -19,11 +19,10 @@ INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 gtk20 intltool intlhack
USE_XFCE= configenv libexo libgui libutil panel
USE_XORG= x11 sm
-USE_PKGCONFIG= build
OPTIONS_DEFINE= TAGLIB DBUS STARTUP
OPTIONS_DEFAULT= DBUS STARTUP
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index f7a016943040..9da1dae47ab0 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -1,6 +1,5 @@
# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= parole
PORTVERSION= 0.5.0
@@ -33,7 +32,7 @@ USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils
USE_XFCE= configenv libmenu libutil
USE_XORG= x11 sm
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= CDDA HTTP NLS
OPTIONS_DEFAULT= CDDA HTTP NLS
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index d5f69676d83c..5096af157d40 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: micq
-# Date created: 11 Oct 1998
-# Whom: mph
-#
+# Created by: mph
# $FreeBSD$
-#
PORTNAME= climm
PORTVERSION= 0.7.1
@@ -16,8 +12,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= johans@FreeBSD.org
COMMENT= CLI-based Multi-Messenger
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
@@ -72,7 +68,6 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \
--with-libgcrypt-prefix=${LOCALBASE}
CONFIGURE_ENV+= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls"
-USE_PKGCONFIG= yes
LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel \
gnutls:${PORTSDIR}/security/gnutls \
gcrypt:${PORTSDIR}/security/libgcrypt \
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 746c0e528689..c93d922d1224 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -15,12 +15,12 @@ LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice
CONFLICTS= farstream-[0-9]*
+USES= pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
USE_GNOME= gnomehack glib20 ltverhack
-USE_PKGCONFIG= build
USE_GSTREAMER= core good bad python
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index ff20a784bfb8..54403f0a0d87 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -18,11 +18,11 @@ LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \
CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
+USES= pkgconfig
USE_GNOME= glib20
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
USE_DOS2UNIX= README
-USE_PKGCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 5225df90494d..1f17d7059dcd 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES= http://nice.freedesktop.org/releases/ \
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library and transmitter that implements ICE-19
+USES= pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 ltverhack
-USE_PKGCONFIG= build
USE_GSTREAMER= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-gstreamer --with-gstreamer-0.10
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index eb8b9144e51d..8073e9aef127 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,11 +19,11 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sigwinch --libdir=${PREFIX}/lib
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+USES= pkgconfig
USE_ICONV= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_NCURSES= yes
-USE_PKGCONFIG= build
USE_GNOME= glib20
MAN1= mcabber.1
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 8e08ef1957d9..ffcd1208ea16 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: meanwhile
-# Date created: 24 June 2004
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= meanwhile
PORTVERSION= 1.0.2
@@ -15,9 +11,9 @@ MAINTAINER= marcus@FreeBSD.org
COMMENT= Open Source implementation of the Lotus Sametime protocol
USE_AUTOTOOLS= libtool
+USES= pkgconfig
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-doxygen=no \
diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile
index dd061725fba9..665c7478ef9a 100644
--- a/net-im/mu-conference/Makefile
+++ b/net-im/mu-conference/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mu-conference
-# Date created: Mon Feb 9 15:34:59 MSK 2004
-# Whom: Denis Shaposhnikov <dsh@vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh@vlink.ru>
# $FreeBSD$
PORTNAME= mu-conference
@@ -19,8 +16,8 @@ LICENSE= GPLv2
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
idn:${PORTSDIR}/dns/libidn
+USES= pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_RC_SUBR= ${PORTNAME}
OPTIONS_DEFINE= MYSQL
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index d9a6d42927c2..b1a043caccc1 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
+USES= pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= build
USE_QT4= gui network xml imageformats_run \
qmake_build moc_build rcc_build uic_build
USE_XORG= xscrnsaver
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 7e5aaa63b195..d975e957ba21 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -15,10 +15,10 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_OPENSSL= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
MAN8= telepathy-idle.8
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index a38da11d3192..6e588a1577f5 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -16,13 +16,13 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
LICENSE= LGPL21
+USES= pkgconfig
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
libxslt:build
-USE_PKGCONFIG= build
USE_SQLITE= yes
USE_PYTHON_BUILD= yes
GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 78b2e4996dc5..6057107088f3 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -14,9 +14,9 @@ LICENSE= LGPL21
LIB_DEPENDS= telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \
telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
+USES= pkgconfig
USE_GNOME= libxslt:build
USE_GSTREAMER= yes
-USE_PKGCONFIG= yes
USE_PYTHON_BUILD= 2.5+
USE_QT4= dbus gui network qtestlib_build xml \
moc_build qmake_build rcc_build uic_build
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 3e6e39709bb3..9832f11b8092 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -14,9 +14,9 @@ LIB_DEPENDS= avahi-glib.1:${PORTSDIR}/net/avahi-app \
soup-2.4.1:${PORTSDIR}/devel/libsoup
GNU_CONFIGURE= yes
+USEs= pkgconfig
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 libxslt:build
-USE_PKGCONFIG= build
USE_OPENSSL= yes
USE_PYTHON_BUILD= yes
USE_SQLITE= 3
diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile
index 66df22801824..3677fe7ca3a3 100644
--- a/net-mgmt/bwm-ng/Makefile
+++ b/net-mgmt/bwm-ng/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bwm-ng
-# Date created: 19 February 2006
-# Whom: Tim Bishop <tdb@FreeBSD.org>
-#
+# Created by: Tim Bishop <tdb@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= bwm-ng
PORTVERSION= 0.6
@@ -16,7 +12,7 @@ COMMENT= A small and simple bandwidth monitor
LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab
GNU_CONFIGURE= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAN1= bwm-ng.1
PLIST_FILES= bin/bwm-ng
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 14460c30e3a5..f886e712cbc1 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -247,7 +247,7 @@ PLIST_SUB+= NUTUPS="@comment "
.endif
.if ${PORT_OPTIONS:MINTERFACE}
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-interface
LIB_DEPENDS+= statgrab:${PORTSDIR}/devel/libstatgrab
PLIST_SUB+= INTERFACE=""
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index b408cff6c375..f0d73fdf7d5d 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -258,7 +258,7 @@ PLIST_SUB+= NUTUPS="@comment "
.endif
.if ${PORT_OPTIONS:MINTERFACE}
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-interface
LIB_DEPENDS+= statgrab:${PORTSDIR}/devel/libstatgrab
PLIST_SUB+= INTERFACE=""
@@ -297,7 +297,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MIPMI}
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-ipmi
LIB_DEPENDS+= OpenIPMI:${PORTSDIR}/sysutils/openipmi
PLIST_SUB+= IPMI=""
diff --git a/net-mgmt/gsnmp/Makefile b/net-mgmt/gsnmp/Makefile
index e47c5fdf43e4..ddae6542f046 100644
--- a/net-mgmt/gsnmp/Makefile
+++ b/net-mgmt/gsnmp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gsnmp
-# Date created: Sat Jun 9 19:34:09 PDT 2007
-# Whom: Matt Peterson <matt@peterson.org>
-#
+# Created by: Matt Peterson <matt@peterson.org>
# $FreeBSD$
-#
PORTNAME= gsnmp
PORTVERSION= 0.2.0
@@ -18,8 +14,8 @@ COMMENT= SNMP library written on top of glib and gnet2
LIB_DEPENDS= gnet:${PORTSDIR}/net/gnet2
+USES= pkgconfig
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net-mgmt/jnettop/Makefile b/net-mgmt/jnettop/Makefile
index 413a3bfda826..df9a07ac28a0 100644
--- a/net-mgmt/jnettop/Makefile
+++ b/net-mgmt/jnettop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: jnettop
-# Date created: 5 June 2009
-# Whom: Ryan Steinmetz
-#
+# Created by: Ryan Steinmetz
# $FreeBSD$
-#
PORTNAME= jnettop
PORTVERSION= 0.13.0
@@ -16,8 +12,8 @@ COMMENT= Traffic visualizer, similar to nettop
MAN8= jnettop.8
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_GMAKE= yes
LICENSE= GPLv2
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 2ffcd3b3147f..decceb9585d4 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tork
-# Date created: 09 Feb 2008
-# Whom: Beat G�tzi <beat@chruetertee.ch>
-#
+# Created by: Beat G�tzi <beat@chruetertee.ch>
# $FreeBSD$
-#
PORTNAME= tork
PORTVERSION= 0.30
diff --git a/net-mgmt/yaf/Makefile b/net-mgmt/yaf/Makefile
index 747fc7698eaa..6f2e8f316178 100644
--- a/net-mgmt/yaf/Makefile
+++ b/net-mgmt/yaf/Makefile
@@ -17,12 +17,12 @@ LIB_DEPENDS= fixbuf:${PORTSDIR}/net/libfixbuf \
pcre.3:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= glib20 gnomehack
USE_LDCONFIG= yes
USE_PERL5= yes
MAKE_JOBS_SAFE= yes
CONFIOGURE_ARGS+= --disable-doxygen
-USE_PKGCONFIG= build
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index dab09b3ecb1d..eac3dce2496a 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: zabbix-server
-# Date created: 2009-12-09
-# Whom: Jim Riggs <ports@christianserving.org>
-#
+# Created by: Jim Riggs <ports@christianserving.org>
# $FreeBSD$
-#
PORTNAME= zabbix2
PORTVERSION= 2.0.5
@@ -36,7 +32,7 @@ USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
.endif
USE_ICONV= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USERS= zabbix
GROUPS= zabbix
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index c6382519ce70..f63016744284 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -22,8 +22,7 @@ BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \
CONFLICTS= amule-[0-9]*
USE_BZIP2= yes
-USES= bison
-USE_PKGCONFIG= yes
+USES= bison pkgconfig
USE_GMAKE= yes
USE_WX= 2.8
WX_CONF_ARGS= absolute
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index ef0b1a51d5c7..e301e35f7b0e 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -22,8 +22,7 @@ BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \
CONFLICTS= amule-devel-[0-9]*
USE_BZIP2= yes
-USES= bison
-USE_PKGCONFIG= yes
+USES= bison pkgconfig
USE_GMAKE= yes
USE_WX= 2.8
WX_CONF_ARGS= absolute
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index 43218f1ced63..00d617d1a546 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: GKrellM MLDonkey plugin
-# Date created: Sat Mar 25 05:17:51 UTC 2006
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gkremldk
PORTVERSION= 0.9.8
@@ -22,9 +18,9 @@ BUILD_DEPENDS= \
${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+USES= pkgconfig
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_JOBS_SAFE= yes
diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile
index fb629d98e6b4..f5ae3a0973d9 100644
--- a/net-p2p/libtorrent-devel/Makefile
+++ b/net-p2p/libtorrent-devel/Makefile
@@ -18,8 +18,7 @@ CONFLICTS= libtorrent-[0-9]* \
rblibtorrent-devel-[0-9]*
USE_AUTOTOOLS= libtool
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_OPENSSL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar-16/Makefile
index 5d20151af292..18ea4cec91d3 100644
--- a/net-p2p/libtorrent-rasterbar-16/Makefile
+++ b/net-p2p/libtorrent-rasterbar-16/Makefile
@@ -20,11 +20,10 @@ LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs \
GeoIP:${PORTSDIR}/net/GeoIP
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_ICONV= yes
USE_LDCONFIG= yes
USE_OPENSSL= yes
-USE_PKGCONFIG= build
CONFIGURE_ARGS+= --disable-debug \
--disable-static \
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 6217d9f4dd05..4afeb6dce133 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -18,8 +18,7 @@ CONFLICTS?= libtorrent-devel-[0-9]* \
rblibtorrent-devel-[0-9]*
USE_AUTOTOOLS= libtool
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_OPENSSL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 3345c0ac03e1..481024bba392 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \
nettle:${PORTSDIR}/security/nettle \
p11-kit:${PORTSDIR}/security/p11-kit
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_NCURSES= yes
USE_GNOME= glib20
USE_GMAKE= yes
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 0bd8bcec8b48..cdab4e4ad3be 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
torrent-rasterbar.7:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16
HAS_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_QT4= corelib network qmake_build moc_build rcc_build
QT_NONSTANDARD= yes
diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile
index f89c8ed706a2..f698409ca004 100644
--- a/net-p2p/rtorrent-devel/Makefile
+++ b/net-p2p/rtorrent-devel/Makefile
@@ -20,7 +20,7 @@ CONFLICTS= rtorrent-[0-9]*
USE_GCC= 4.2+
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
LDFLAGS+= -pthread
CONFIGURE_ARGS= --disable-debug
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 1bb970ea7417..a79e73f51d17 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= rtorrent-devel-[0-9]*
USE_GCC= 4.2+
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
LDFLAGS+= -pthread
CONFIGURE_ARGS= --disable-debug
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index cbc5f367a647..dc902a160993 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -28,7 +28,7 @@ GEN_LIB_DEPENDS=curl.6:${PORTSDIR}/ftp/curl \
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index a0385e627c3f..257b8f9a0dd4 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: coda-server-6
-# Date created: 9 september 2003
-# Whom: Tim Robbins
-
+# Created by: Tim Robbins
# $FreeBSD$
PORTNAME= coda
@@ -21,9 +18,9 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \
rpc2.9:${PORTSDIR}/devel/rpc2 \
rvmlwp.3:${PORTSDIR}/devel/rvm
+USES= pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= yes
CONFIGURE_ARGS+= --enable-${CODA_SUITE}
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
index f834c89505b8..3736a249f153 100644
--- a/net/ecore-con/Makefile
+++ b/net/ecore-con/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore libtool_hack
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_con
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 9cadd3f9390e..146235652223 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -11,10 +11,9 @@ COMMENT= A free implementation of Remote Desktop Protocol
LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_PKGCONFIG= build
USE_OPENSSL= yes
USE_LDCONFIG= yes
-USES= cmake
+USES= cmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
GH_PROJECT= FreeRDP
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index d7e2e1088803..1e2499fddd2a 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -43,9 +43,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env libtool:env
USE_PERL5_BUILD=yes
-USES= bison:both
+USES= bison:both pkgconfig
USE_GCC= any
-USE_PKGCONFIG= yes
USE_GMAKE= yes
SUB_FILES= pkg-install
USE_RC_SUBR= freeswitch
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 0b2a96c59d09..8858f41b7487 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -44,9 +44,8 @@ WRKSRC= ${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env libtool:env
USE_PERL5_BUILD=yes
-USES= bison:both
+USES= bison:both pkgconfig
USE_GCC= any
-USE_PKGCONFIG= yes
USE_GMAKE= yes
SUB_FILES= pkg-install pkg-message
USE_RC_SUBR= freeswitch
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index f2dbc2fd081c..1a35b51e8bd4 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -16,11 +16,10 @@ COMMENT= A popup style message communication tool for GNOME2
USE_GETTEXT= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack intltool \
libgnomeui libbonobo desktopfileutils gnomepanel
USE_GSTREAMER= vorbis
-USE_PKGCONFIG= build
USE_ICONV= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 958529284339..797928446372 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -15,9 +15,9 @@ PKGNAMESUFFIX= 2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A simple network library built upon Glib-2
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index efb2166c5bf0..b496f9eed239 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A C library for writing servers
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index 7911c3b5da87..281c340777d4 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -23,9 +23,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.options.mk>
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index b2ffc944dd97..37c39697b186 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.mk>
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index d74259a4cb1b..7343d3199653 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -19,13 +19,12 @@ RUN_DEPENDS= gupnp>=0.18:${PORTSDIR}/net/gupnp
CONFIGURE_ARGS= --enable-introspection=yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_PYTHON= yes
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
post-patch:
@${REINPLACE_CMD} -e '/ --define-variable=/d' ${WRKSRC}/configure
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index ecd1de5c70d4..1e09399961c5 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_PYTHON= yes
-USES= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.mk>
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index d8ea5b14d799..0195ca336212 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -22,10 +22,9 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_PYTHON= yes
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
post-patch:
@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/tools/gupnp-binding-tool
diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile
index 0d4287c4a9b0..40a21a25c916 100644
--- a/net/libcmis/Makefile
+++ b/net/libcmis/Makefile
@@ -16,11 +16,10 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit \
${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= libxml2
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --disable-werror --with-boost=${LOCALBASE} --without-man
diff --git a/net/libfixbuf/Makefile b/net/libfixbuf/Makefile
index f7fbd3ab0e68..4fc116d1022e 100644
--- a/net/libfixbuf/Makefile
+++ b/net/libfixbuf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libfixbuf
-# Date created: 2008-04-13
-# Whom: David Thiel <lx@redundancy.redundancy.org>
-#
+# Created by: David Thiel <lx@redundancy.redundancy.org>
# $FreeBSD$
-#
PORTNAME= libfixbuf
PORTVERSION= 1.0.2
@@ -15,8 +11,8 @@ MAINTAINER= lx@FreeBSD.org
COMMENT= Library for using the IP Flow Information Export protocol
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
post-patch:
diff --git a/net/libnfs/Makefile b/net/libnfs/Makefile
index 476d68bd0809..8c5c553335d6 100644
--- a/net/libnfs/Makefile
+++ b/net/libnfs/Makefile
@@ -13,12 +13,12 @@ LICENSE= LGPL21 GPLv3
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= pkgconfig
USE_GMAKE= yes
USE_AUTORECONF= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
ACLOCAL_ARGS= -I.
AUTOMAKE_ARGS= --add-missing
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
post-patch:
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 1fb108c4446d..08a9f3c776d2 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -18,7 +18,7 @@ GLIB2_DESC= Use GLIB2 for multiprocessing support
OPTIONS_DEFAULT= LIBNET11 GLIB2
WANT_GNOME= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
MAN3= libnids.3
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 55d6b31ecf3b..1ac66373a65c 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: linc
-# Date Created: 12 February 2002
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= linc
PORTVERSION= 1.0.3
@@ -19,9 +15,9 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
+USES= pkgconfig
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 5bae923b612b..041e5140ea09 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS= --with-utempter
CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
INSTALL_TARGET= install-strip
USE_OPENSSL= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
LATEST_LINK= mosh-term
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index aa87a3303b86..a6eadacf0e26 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -lglib-2.0
USE_GMAKE= yes
USE_GNOME= _glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN8= mtr.8
PLIST_FILES= sbin/mtr
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 1a7aee6c8583..82491bf3cb7e 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -14,7 +14,7 @@ COMMENT= Server for the Linux network block device (nbd)
USE_BZIP2= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lfs --enable-syslog
diff --git a/net/net6/Makefile b/net/net6/Makefile
index cad9b1759ff3..9cfc1c601771 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: net6
-# Date created: 2005-10-14
-# Whom: Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
# $FreeBSD$
-#
PORTNAME= net6
PORTVERSION= 1.3.14
@@ -19,11 +15,10 @@ LICENSE= GPLv2
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
gnutls.26:${PORTSDIR}/security/gnutls
-USES= pathfix
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/net/netembryo/Makefile b/net/netembryo/Makefile
index a0b52620f01f..8cc1b165fd1f 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -15,9 +15,8 @@ OPTIONS_DEFINE= OPENSSL
OPTIONS_DEFAULT=OPENSSL
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-silent-rules
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index 81ab0eeaa8bc..a5780b6f55e8 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: packter-agent
-# Date created: 2012-09-05
-# Whom: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
-#
+# Created by: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
# $FreeBSD$
-#
PORTNAME= packter-agent
PORTVERSION= 2.5
@@ -18,8 +14,8 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index 1bc27a796b64..9ff22fde8ba5 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: radvd
-# Date created: Fri Jul 6 03:17:33 EDT 2001
-# Whom: Patrick Li <pat@databits.net>
-#
+# Created by: Patrick Li <pat@databits.net>
# $FreeBSD$
-#
PORTNAME= radvd
PORTVERSION= 1.9.1
@@ -17,8 +13,8 @@ LIB_DEPENDS= daemon.0:${PORTSDIR}/devel/libdaemon
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= yes
USE_RC_SUBR= radvd
MAN5= radvd.conf.5
diff --git a/net/samba34/Makefile b/net/samba34/Makefile
index 7b7752ba0f56..18dd1b9f9320 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: samba34
-# Date created: 1 May 2009
-# Whom: timur@FreeBSD.org
-#
+# Created by: timur@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= samba34
PORTVERSION= 3.4.17
@@ -75,7 +71,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-USE_PKGCONFIG= yes
+USES= pkgconfig
# Let process generate meaningful backtrace on a core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
# Always use external libtalloc
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index fad488f970ea..ea830980653f 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -32,7 +32,7 @@ AUTOCONF_ARGS= ${IPATHS}
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= autoconf autoheader
USE_LDCONFIG= ${SAMBA_LIBDIR}
# pkg-config is used to find talloc
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 50422fa4f5e3..7ea3cb1ec02d 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -74,7 +74,7 @@ USE_GCC= 4.2+
USE_PYTHON= yes
USE_ICONV= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= ${SAMBA4_LIBDIR}
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index b8d08f1cbaf9..13c96be7943a 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: silc client
-# Date created: Thu Nov 8 01:50:05 BRST 2001
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= silc
PORTVERSION= 1.1.8
@@ -28,7 +24,7 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GMAKE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --docdir=${DOCSDIR} \
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 0843aeda75ce..f693383e7142 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -10,8 +10,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= An iostream based C++ socket library
USE_GMAKE= yes
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 4ebb162e2676..82daa786738b 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 1416c730143b..990ddaecb402 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= tridiavnc-[0-9]* \
MAKE_JOBS_UNSAFE= yes
-USES= cmake
-USE_PKGCONFIG= build
+USES= cmake pkgconfig
USE_GMAKE= yes
USE_GL= gl
USE_AUTOTOOLS+= autoconf:env automake:env libtool:env
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index de2e6c976ba9..e96f4e2d34d6 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -76,7 +76,7 @@ WIRESHARK_LIBS+=${PTHREAD_LIBS}
.else
PLIST_SUB+= WIRESHARK="@comment wireshark not built"
USE_GNOME+= glib20
-USE_PKGCONFIG= build
+USES+= pkgconfig
CONFIGURE_ARGS+= --enable-wireshark=no \
--disable-gtktest
.endif
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 794fc4361d29..b4dbd9b685fe 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu
USE_ICONV= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= libxml2 libxslt gnomehack
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/palm/barry/Makefile b/palm/barry/Makefile
index b1e57288d0dd..35f0727b93cf 100644
--- a/palm/barry/Makefile
+++ b/palm/barry/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= OPENSSL_CFLAGS=-I/usr/include \
OPENSSL_LIBS="-L/lib -lssl -lcrypto"
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 6e5bca736e94..72e8c835abd4 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -14,10 +14,9 @@ COMMENT= PalmPilot conduit system for GNOME 2
BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link
-USES= pathfix
+USES= pathfix pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GNOME= gnomeprefix gnomehier gnomepanel intlhack \
ltverhack libgnomeui
USE_GETTEXT= yes
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 0c626a61c8ab..bd0c55fd1566 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -16,8 +16,8 @@ COMMENT= Desktop Organizer Software for the Palm Pilot
LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link
USE_GCC= any
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GNOME= gnomehier
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index d36fcf8f742b..0a3e220ac0e0 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -13,10 +13,9 @@ COMMENT= Suite of tools used to connect and sync your Palm handled
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-USES= pathfix
+USES= pathfix pkgconfig
USE_BZIP2= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits --enable-xsltproc
diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 048aa5b1525b..64f33bea216f 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-libungif \
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index dc70a328e5bf..7034512bb5d4 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -44,8 +44,7 @@ GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz
GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz
USE_BZIP2= yes
-USES= cmake
-USE_PKGCONFIG= build
+USES= cmake pkgconfig
USE_ICONV= yes
USE_GETTEXT= yes
USE_XORG= ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index ebdca41edbea..4d83290b607e 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap
CONFIGURE_ARGS+= --disable-openssl --enable-gnutls
LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
-USE_PKGCONFIG= yes
+USES+= pkgconfig
.else
CONFIGURE_ARGS+= --disable-gnutls --enable-openssl
WITH_OPENSSL_HACK7= yes
diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile
index 2b74afbc70c8..08fe56be2ee7 100644
--- a/print/deforaos-pdfviewer/Makefile
+++ b/print/deforaos-pdfviewer/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= System:${PORTSDIR}/devel/deforaos-libsystem \
poppler-glib:${PORTSDIR}/graphics/poppler-glib
MAKE_ARGS+= PREFIX=${PREFIX}
+USES= pkgconfig
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
PLIST_FILES= bin/pdfviewer \
share/applications/pdfviewer.desktop
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index 0c0dc3b0b763..4f3ffbde1d64 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 92ed51aeca68..8027193162df 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -25,7 +25,7 @@ CONFLICTS_INSTALL= hpijs-[0-9]*
USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= 2.5+
USE_GNOME= pygobject
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-foomatic-ppd-install \
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 9c7bc4a6f47f..129a461290ca 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -14,10 +14,10 @@ COMMENT= Support library for gnome cups administration
LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack ltverhack glib20
-USE_PKGCONFIG= build
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index f6583caa0467..a3ebf36e869e 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: hpijs
-# Date created: 1 May 2002
-# Whom: ports@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= libijs
PORTVERSION= 0.35
@@ -16,12 +11,12 @@ DIST_SUBDIR= ghostscript
MAINTAINER= ports@FreeBSD.org
COMMENT= C library that supports plugin printer driver for Ghostscript
+USES= pkgconfig
USE_BZIP2= yes
USE_GNOME= lthack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
MAN1= ijs-config.1
diff --git a/print/libmspub/Makefile b/print/libmspub/Makefile
index 9c217fca2756..517553ac7314 100644
--- a/print/libmspub/Makefile
+++ b/print/libmspub/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu \
wpd-0.9:${PORTSDIR}/textproc/libwpd
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_XZ= yes
CONFIGURE_ARGS= --disable-werror --without-docs
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index 39d1b376606e..fb192cd7ce25 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Font::FreeType
-# Date created: 12 Aug 2011
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= Font-FreeType
PORTVERSION= 0.03
@@ -17,7 +13,7 @@ COMMENT= Perl extension to read font files and render glyphs using FreeType2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
PERL_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN3= Font::FreeType.3 \
Font::FreeType::Face.3 \
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 8a2e6503ac5a..d829918cc9bb 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Panda
-# Date created: 28 March 2001
-# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
# $FreeBSD$
-#
PORTNAME= panda
PORTVERSION= 0.5.4
@@ -24,13 +20,12 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_BDB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-berkeley-db
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index def405eeb681..6f05618c11e3 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_GNOME= intlhack
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 705bbc6791d6..291ae4e6c0e4 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -34,12 +34,11 @@ CONFLICTS= scribus-1.[0-4]*
NO_LATEST_LINK= yes
USE_BZIP2= yes
-USE_PKGCONFIG= yes
USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network
USE_GNOME= desktopfileutils libartlgpl2 libxml2
USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= yes
-USES= cmake
+USES= cmake pkgconfig
USE_LDCONFIG= yes
MAN1= scribus.1
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 4d8c4d3cbf8f..3dbd90cf5d33 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -14,7 +14,7 @@ COMMENT= True Type Font to Postscript Type 1 Converter
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= t1asm:${PORTSDIR}/print/t1utils
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PERL5= yes
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
INSTDIR="${PREFIX}" LIBXDIR="${PREFIX}/bin"
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 3c84d2f960ce..7990b4466be2 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS= mpqc:${PORTSDIR}/science/mpqc \
oglappth:${PORTSDIR}/science/liboglappth \
mopac7:${PORTSDIR}/biology/mopac
+USES= pkgconfig
USE_FORTRAN= yes
USE_GMAKE= yes
USE_GNOME= glib20 gtk20 libglade2
-USE_PKGCONFIG= build
USE_GL= glut
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 21d199e80454..bfe754b61c80 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS+= plplotd.11:${PORTSDIR}/math/plplot \
USE_GCC= 4.6+
USE_WX= 2.8
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
# Disable ncurses and readline from ports
CONFIGURE_FLAGS=--with_ncursesdir=/usr --with_readlinedir=/usr
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 392d45a79756..b73828e3e11b 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -22,10 +22,9 @@ GSL_DESC= Extra analysis using math/gsl
MPICH_DESC= MPI support using net/mpich2
OMPI_DESC= MPI support using net/openmpi
-USES= cmake
+USES= cmake pkgconfig
USE_FORTRAN= yes
USE_PERL5= yes
-USE_PKGCONFIG= build
CMAKE_ARGS= -DBLAS_LIBRARIES:FILEPATH="${BLAS_LIBS}" \
-DLAPACK_LIBRARIES:FILEPATH="${LAPACK_LIBS}"
USE_LDCONFIG= yes
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index 6d08fd611996..3d6a6679d532 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -17,12 +17,11 @@ LIB_DEPENDS+= mpqc:${PORTSDIR}/science/mpqc \
f2c:${PORTSDIR}/lang/f2c
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GL= gl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= build
USE_FORTRAN= yes
CONFIGURE_ARGS+= --enable-mpqc
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 20573b497479..001a7b2d5a8d 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gnutls
-# Date created: 13 Nov 2002
-# Whom: Sergei Kolobov <sergei@kolobov.com>
-#
+# Created by: Sergei Kolobov <sergei@kolobov.com>
# $FreeBSD$
-#
PORTNAME= gnutls
PORTVERSION= 2.12.23
@@ -21,9 +17,9 @@ LIB_DEPENDS= nettle:${PORTSDIR}/security/nettle \
CONFLICTS= gnutls-devel-[0-9]*
+USES= pkgconfig
USE_BZIP2= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
USE_GNOME= ltverhack gnomehack
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index ac50e1de5237..cba48511390f 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gpa
-# Date created: 16 August 2000
-# Whom: Clive Lin <clive@CirX.ORG>
-#
+# Created by: Clive Lin <clive@CirX.ORG>
# $FreeBSD$
-#
PORTNAME= gpa
PORTVERSION= 0.9.3
@@ -21,9 +17,9 @@ LIB_DEPENDS= assuan:${PORTSDIR}/security/libassuan \
BUILD_DEPENDS= gpgv2:${PORTSDIR}/security/gnupg
RUN_DEPENDS= gpgv2:${PORTSDIR}/security/gnupg
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GPGKEYS_LDAP="${LOCALBASE}/libexec/gpg2keys_ldap" \
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index 36aec883265f..8f092781fac8 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES= bin/gtkportscan bin/portscan
.if ${PORT_OPTIONS:MGTK2}
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES+= pkgconfig
GTK_CONFIG= pkg-config gtk+-2.0
.else
USE_GNOME= gtk12
diff --git a/security/kopete-otr/Makefile b/security/kopete-otr/Makefile
index c299be0644ef..233320bc4692 100644
--- a/security/kopete-otr/Makefile
+++ b/security/kopete-otr/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Kopete-OTR
-# Date created: 2007-04-09
-# Whom: Dave Grochowski <malus.x@gmail.com>
-#
+# Created by: Dave Grochowski <malus.x@gmail.com>
# $FreeBSD$
-#
PORTNAME= otr
PORTVERSION= 0.7
@@ -24,11 +20,11 @@ LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr3
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
+USES= pkgconfig
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
.include <bsd.port.mk>
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 477fe7fbb1d9..3202448a3c52 100644
--- a/security/libntlm/Makefile
+++ b/security/libntlm/Makefile
@@ -11,9 +11,8 @@ COMMENT= Library that implement Microsoft's NTLM authentication
LICENSE= LGPL21
-USES= pathfix
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 92a69bf56b58..44208f72f73b 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -24,10 +24,9 @@ CONFIGURE_ARGS= --localstatedir=/var \
--enable-gtk-doc=no \
--with-html-dir=${PREFIX}/share/doc
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_ICONV= yes
USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 9e90b2d3d3e2..4ea8dd8c9e3c 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -11,8 +11,7 @@ MAINTAINER= ale@FreeBSD.org
COMMENT= Library, tools, and PAM module for OATH authentication
USE_GMAKE= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 80dd5674110f..d22539f87e73 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -20,8 +20,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_AUTOTOOLS= aclocal autoconf libtool
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
USE_GMAKE= yes
USE_OPENSSL= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 3d29ef21824d..74e6b0a47901 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -24,10 +24,10 @@ OPENCT_DESC= Use OpenCT backend
CTAPI_DESC= Use CT-API backend
SM_DESC= Enable secure messaging support
+USES= pkgconfig
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
CONFIGURE_ENV= \
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 67d92b2b91e5..355caa9d4ffc 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: openvas-libraries
-# Date created: 2008-04-26
-# Whom: Tomoyuki Sakurai <cherry@trombik.org>
-#
+# Created by: Tomoyuki Sakurai <cherry@trombik.org>
# $FreeBSD$
-#
PORTNAME= openvas-libraries
PORTVERSION= 2.0.3
@@ -17,9 +13,9 @@ COMMENT= Libraries for OpenVAS
LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls \
gcrypt.18:${PORTSDIR}/security/libgcrypt
+USES= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
USE_GNOME= glib20
MAKE_JOBS_UNSAFE= yes
diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile
index 0de844ac80b0..3e2baecc751e 100644
--- a/security/pam_yubico/Makefile
+++ b/security/pam_yubico/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= ykclient:${PORTSDIR}/security/ykclient \
yubikey:${PORTSDIR}/security/libyubikey
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
PLIST_FILES= include/drop_privs.h \
include/util.h \
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index f54508d46a54..4d753dd9ac2f 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
USE_RC_SUBR= prelude-lml
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index aa4b60061ca5..ca646984139e 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: prelude-manager
-# Date created: Sun Aug 4 19:31:17 CEST 2002
-# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
# $FreeBSD$
PORTNAME= prelude-manager
@@ -22,10 +19,10 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \
nettle:${PORTSDIR}/security/nettle \
p11-kit:${PORTSDIR}/security/p11-kit
+USES= pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_GETTEXT= yes
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/security/py-otr/Makefile b/security/py-otr/Makefile
index 3c30d367b5f2..01f579a97172 100644
--- a/security/py-otr/Makefile
+++ b/security/py-otr/Makefile
@@ -15,9 +15,9 @@ BUILD_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
# This should be updated to the newer version of libotr
LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr3
+USES= pkgconfig
USE_PYTHON= yes
USE_PYDISTUTILS=yes
-USE_PKGCONFIG= build
PYDISTUTILS_PKGNAME= python-otr
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index b3b06296dec6..25880345e404 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -21,11 +21,10 @@ OPTIONS_DEFINE= APPLET
APPLET_DESC= Build with applet
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= desktopfileutils gnomeprefix pygnome2
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/security/rifiuti2/Makefile b/security/rifiuti2/Makefile
index c4d9341b147b..d15dc9ccd6a3 100644
--- a/security/rifiuti2/Makefile
+++ b/security/rifiuti2/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GETTEXT= yes
USE_ICONV= yes
USE_GNOME= glib20
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 80a7f7667368..72d38f61787a 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \
LIB_DEPENDS+= net:${PORTSDIR}/net/libnet
USE_AUTOTOOLS= automake autoconf libtool
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_RC_SUBR= suricata
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 4b52b6bcf86d..3d8a9fd4b24f 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -15,7 +15,7 @@ USE_GMAKE= YES
USE_ICONV= YES
USE_OPENSSL= YES
USE_LDCONFIG= YES
-USE_PKGCONFIG= YES
+USES= pkgconfig
USE_AUTOTOOLS= autoconf automake libtool
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 78f9d1aa435d..12fc540e3db2 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -22,7 +22,7 @@ USE_OPENSSL= yes
USE_GNOME= gnomehack lthack libxslt
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAN1= xmlsec1.1 xmlsec1-config.1
CFLAGS+= -I${LOCALBASE}/include
diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile
index 244607711f7d..3592bac2ac11 100644
--- a/security/ykpers/Makefile
+++ b/security/ykpers/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= yubikey:${PORTSDIR}/security/libyubikey
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= ykchalresp.1 \
ykinfo.1 \
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 1881cc5a1a4f..858d8e0d61ba 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -15,10 +15,9 @@ MAN1= archivemount.1
GNU_CONFIGURE= yes
NO_INSTALL_MANPAGES= yes
-USES= fuse
+USES= fuse pkgconfig
USE_GMAKE= yes
USE_ICONV= yes
-USE_PKGCONFIG= yes
USE_GCC= 4.2+
.include <bsd.port.mk>
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 684bdddb1d6c..fbc854c6888c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -13,12 +13,12 @@ COMMENT= An advanced, highly configurable system monitor for X
CONFLICTS?= conky-awesome-[0-9]*
SLAVEDIRS= sysutils/conky-awesome
+USES= pkgconfig
USE_ICONV= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
CONFIGURE_ARGS+= --disable-portmon \
--disable-hddtemp \
--disable-alsa \
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 9df6b0d593d8..dc8b95141acc 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -15,12 +15,11 @@ LICENSE= GPLv2
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack nautilus2 libgnomeui
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 72aa2a02f99e..2523994475a9 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: flashrom
-# Date created: 06 May 2009
-# Whom: Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
# $FreeBSD$
-#
PORTNAME= flashrom
PORTVERSION= 0.9.6.1
@@ -45,7 +41,7 @@ RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
.endif
.if ${PORT_OPTIONS:MFTDI}
-USE_PKGCONFIG= build
+USES+= pkgconfig
LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi
.endif
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index 99927db1e7f0..f8150be3650f 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -17,8 +17,7 @@ GNU_CONFIGURE= yes
PORTDOCS= AUTHORS ChangeLog README
PLIST_FILES= bin/${PORTNAME}
-USES= fuse
-USE_PKGCONFIG= yes
+USES= fuse pkgconfig
MAN1= afuse.1
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 294aa4f5f584..6731d95bc0d9 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
-USES= fuse
+USES= fuse pkgconfig
PLIST_FILES= bin/cryptofs
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 33f4022d95fa..24a714406037 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -14,9 +14,8 @@ COMMENT= Mount remote ftp directories
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-USES= fuse
+USES= fuse pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/curlftpfs
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 87704311dbbe..21c1582a9a3d 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -20,10 +20,9 @@ VCHMOD_DESC= Fake hook for chmod that just returns 0
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-USES= fuse
+USES= fuse pkgconfig
USE_GMAKE= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include -DFUSE_USE_VERSION=26
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index addcb58179b0..cda7ce393988 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -13,10 +13,9 @@ COMMENT= Interface between FUSE and the Gnome VFS 2.0
RPORTNAME= gnome-vfs-fuse
WRKSRC= ${WRKDIR}/${RPORTNAME}
-USES= fuse
+USES= fuse pkgconfig
USE_GNOME= gnomevfs2
USE_GMAKE= yes
-USE_PKGCONFIG= yes
PLIST_FILES= bin/gnomevfs-mount
PORTDOCS= README
diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile
index aecd5db7e4ff..2cd800069ae1 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/sysutils/fusefs-httpfs/Makefile
@@ -15,8 +15,7 @@ COMMENT= Fuse-based http filesystem
WRKSRC= ${WRKDIR}/${PORTNAME}2-${VERSION}
VERSION= 0.1.5
-USES= fuse
-USE_PKGCONFIG= yes
+USES= fuse pkgconfig
USE_GMAKE= yes
CFLAGS+= -D__BSD_VISIBLE
ALL_TARGET= httpfs2
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 36f7435a424a..4524dc317605 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -14,7 +14,7 @@ COMMENT= FUSE allows filesystem implementation in userspace
GNU_CONFIGURE= yes
CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_ICONV= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/sysutils/fusefs-mhddfs/Makefile b/sysutils/fusefs-mhddfs/Makefile
index 1e7eb9703c07..81f060cf5827 100644
--- a/sysutils/fusefs-mhddfs/Makefile
+++ b/sysutils/fusefs-mhddfs/Makefile
@@ -11,9 +11,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= proler@gmail.com
COMMENT= Multi HDD [FUSE] File System
-USES= fuse
+USES= fuse pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= build
MAKE_ARGS= WITHOUT_XATTR=1
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index e84fc4d3082f..60f439656f10 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -16,11 +16,10 @@ LICENSE= GPLv2
CONFLICTS_BUILD= bonobo-1.*
CONFLICTS_INSTALL= ntfsprogs-*
-USES= fuse
+USES= fuse pkgconfig
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_ICONV= yes
-USE_PKGCONFIG= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \
--disable-mtab --with-fuse=external
CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index 16aa6255596a..23a4b208197a 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -14,9 +14,8 @@ COMMENT= Mount remote directories over ssh
KMODDIR?= ${LOCALBASE}/modules
GNU_CONFIGURE= yes
-USES= fuse
+USES= fuse pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
MAN1= sshfs.1
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 846480697466..3ddfb3387dae 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -14,9 +14,8 @@ COMMENT= Mount remote WedDAV directories with Fuse
LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29
GNU_CONFIGURE= yes
-USES= fuse
+USES= fuse pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
PLIST_FILES= bin/wdfs
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index 8771ed110a6e..5b7714043187 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
LIB_DEPENDS= zip:${PORTSDIR}/archivers/libzip
USE_GMAKE= yes
-USE_PKGCONFIG= build
-USES= fuse
+USES= fuse pkgconfig
PLIST_FILES= bin/${PORTNAME}
MAN1= ${PORTNAME}.1
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index 5b46bdd7713e..4fe97d990c37 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -15,7 +15,7 @@ SUB_FILES= pkg-message
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gconf2
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
PORTDOCS= AUTHORS ChangeLog INSTALL README
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index b150081ad33d..9b813b1e922f 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: garcon
-# Date created: 11 January 2011
-# Whom: Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= garcon
PORTVERSION= 0.2.0
@@ -20,7 +16,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 intltool intlhack
USE_XFCE= configenv libutil
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS+=--disable-gtk-doc-html
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index a838a353ef50..da0887487b9c 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gkleds2
-# Date Created: Dec 10 2002
-# Whom: Jan Stocker <Jan.Stocker@t-online.de>
-#
+# Created by: Jan Stocker <Jan.Stocker@t-online.de>
# $FreeBSD$
-#
PORTNAME= gkleds2
PORTVERSION= 0.8.2
@@ -18,11 +14,11 @@ COMMENT= GKrellM Leds for CapsLock, NumLock, and ScrollLock
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+USES= pkgconfig
USE_XORG= x11 xtst
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 02c348250c12..139f43c47b29 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS= gksu2:${PORTSDIR}/sysutils/libgksu \
nautilus-extension:${PORTSDIR}/x11-fm/nautilus \
gnome-keyring:${PORTSDIR}/security/gnome-keyring
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_GNOME= desktopfileutils gconf2 gnomeprefix gtk20 intlhack
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index cd6628728d17..dd24a973ebe4 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: goaccess
-# Date created: 2010-11-17
-# Whom: Sofian Brabez <sbrabez@gmail.com>
-#
+# Created by: Sofian Brabez <sbrabez@gmail.com>
# $FreeBSD$
-#
PORTNAME= goaccess
PORTVERSION= 0.5
@@ -22,7 +18,7 @@ LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index e129fdd18a55..684a30a5a761 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -18,8 +18,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_CDRTOOLS= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= libglade2 intlhack gnomeprefix
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index f7a916f8dc7f..3a426fd7dcd1 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gsmartcontrol
-# Date created: 2009-03-25
-# Whom: Pawel Pekala <c0rn@o2.pl>
-#
+# Created by: Pawel Pekala <c0rn@o2.pl>
# $FreeBSD$
-#
PORTNAME= gsmartcontrol
PORTVERSION= 0.8.7
@@ -32,10 +28,10 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
smartctl:${PORTSDIR}/sysutils/smartmontools
USE_AUTOTOOLS= libtool
+USES= pkgconfig
USE_BZIP2= yes
USE_GETTEXT= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
USE_GNOME= gtk20
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
xi xinerama xrandr xrender
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 6106f5ae482c..ac3dad016e4a 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gdkpixbuf2 gtk20
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender
diff --git a/sysutils/hardlink/Makefile b/sysutils/hardlink/Makefile
index 4630309195ac..f3031404bd97 100644
--- a/sysutils/hardlink/Makefile
+++ b/sysutils/hardlink/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: hardlink
-# Date created: 14 January 2011
-# Whom: Douglas Thrift
-#
+# Created by: Douglas Thrift
# $FreeBSD$
-#
PORTNAME= hardlink
PORTVERSION= 0.2.0
@@ -17,7 +13,7 @@ COMMENT= Replace file copies using hardlinks
LICENSE= MIT
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAN1= hardlink.1
PLIST_FILES= bin/hardlink
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index c92121c671db..7918f128ad9a 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -21,11 +21,11 @@ RUN_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
gpgv:${PORTSDIR}/security/gnupg1 \
lzop:${PORTSDIR}/archivers/lzop
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_AUTOTOOLS= autoconf
MAN1= hdup.1
diff --git a/sysutils/iextract/Makefile b/sysutils/iextract/Makefile
index 059e37b3050b..0363018cb451 100644
--- a/sysutils/iextract/Makefile
+++ b/sysutils/iextract/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: IExtract
-# Date created: 19 August 2006
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= IExtract
PORTVERSION= 0.9.30
@@ -19,7 +15,7 @@ LIB_DEPENDS= YGP.0:${PORTSDIR}/devel/libYGP
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath
.include <bsd.port.mk>
diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile
index 0ce4953d2d3c..4c0e19c749fa 100644
--- a/sysutils/kcm-polkit-kde/Makefile
+++ b/sysutils/kcm-polkit-kde/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS= polkit-qt-agent-1:${PORTSDIR}/sysutils/polkit-qt
RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-USE_PKGCONFIG= build
USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build
USE_BZIP2= yes
-USES= cmake
+USES= cmake pkgconfig
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 36a976abc15c..a2627973b702 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_AUTOTOOLS= autoconf automake aclocal
GNU_CONFIGURE= yes
USE_RC_SUBR= LCDd lcdproc lcdexec
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \
--disable-dependency-tracking \
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 065b0b51e4a7..b91da3a5564b 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \
RUN_DEPENDS= xauth:${PORTSDIR}/x11/xauth \
sudo:${PORTSDIR}/security/sudo
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= desktopfileutils glib20 gconf2
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-gtk-doc=no
diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile
index 62ab5d4aae9c..2800938e5318 100644
--- a/sysutils/libzeitgeist/Makefile
+++ b/sysutils/libzeitgeist/Makefile
@@ -10,12 +10,11 @@ MASTER_SITES= https://launchpadlibrarian.net/100152436/ \
MAINTAINER= olivierd@FreeBSD.org
COMMENT= Zeitgeist client library
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20 intltool intlhack
USE_GETTEXT= yes
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 246ca464a26c..3450a82f463c 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -12,8 +12,7 @@ COMMENT= Moosefs client tools
DISTINFO_FILE= ${.CURDIR}/../moosefs-master/distinfo
-USES= fuse
-USE_PKGCONFIG= yes
+USES= fuse pkgconfig
MAN1= mfstools.1 mfscheckfile.1 mfsdirinfo.1 mfsfileinfo.1 \
mfsfilerepair.1 mfsgetgoal.1 mfsgettrashtime.1 \
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index e3569d984513..0f0f9897979a 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -13,9 +13,8 @@ LICENSE= GPLv2
CONFLICTS_INSTALL= fusefs-ntfs-*
-USE_PKGCONFIG= build
USE_BZIP2= yes
-USES= fuse
+USES= fuse pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index c3cc8ffe1a3c..893c54a4d83f 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
NO_LATEST_LINK= yes
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index fad6a94d8d23..c02d05ba6b1c 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -15,8 +15,7 @@ COMMENT= Write filesystems in Perl using FUSE
PERL_CONFIGURE= yes
PORTSCOUT= skipv:0.09_4
-USES= fuse
-USE_PKGCONFIG= build
+USES= fuse pkgconfig
MAN3= Fuse.3
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3a129234ab23..5c573e2f025b 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack glib20 intlhack gnomehier
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-authfw=pam \
diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index b9876105fafd..5cd202cdf409 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
# $MCom: ports/sysutils/pyrenamer/Makefile,v 1.1 2007/08/14 21:33:09 mezz Exp $
+
PORTNAME= pyrenamer
PORTVERSION= 0.6.0
PORTREVISION= 5
@@ -9,12 +10,11 @@ MASTER_SITES= http://www.infinicode.org/code/pyrenamer/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= A mass file renamer written in PyGTK
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gconf2 pygtk2
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index ebdbff95e4cf..451a1873a495 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS= synergys:${PORTSDIR}/sysutils/synergy
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix libglade2
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 51e381be047b..65b22c37f258 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/rsyslog5-relp/Makefile b/sysutils/rsyslog5-relp/Makefile
index fa248bb11457..c68f3f43a22e 100644
--- a/sysutils/rsyslog5-relp/Makefile
+++ b/sysutils/rsyslog5-relp/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
COMMENT= RELP input/output module for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog5
MNAME= relp
LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-relp
diff --git a/sysutils/rsyslog5-rfc3195/Makefile b/sysutils/rsyslog5-rfc3195/Makefile
index c87028d2ec0c..1cc5803a904d 100644
--- a/sysutils/rsyslog5-rfc3195/Makefile
+++ b/sysutils/rsyslog5-rfc3195/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
COMMENT= RFC3195 input support for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog5
@@ -11,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../rsyslog5
MNAME= rfc3195
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-rfc3195
diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile
index 62df117f8d20..91f3fd4a4b2b 100644
--- a/sysutils/rsyslog5/Makefile
+++ b/sysutils/rsyslog5/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
PORTNAME= rsyslog
PORTVERSION= 5.10.0
@@ -42,7 +38,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/rsyslog
GNU_CONFIGURE= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
OPTIONS= DEBUG "Enable debugging" off
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index 9b3494054c57..92e98189c8cb 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -1,9 +1,5 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
PORTREVISION= 1
@@ -14,7 +10,7 @@ MNAME= gnutls
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \
gcrypt.18:${PORTSDIR}/security/libgcrypt
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-gnutls
diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile
index 9ce6cc8988a7..4bff5126b1a0 100644
--- a/sysutils/rsyslog6-devel-relp/Makefile
+++ b/sysutils/rsyslog6-devel-relp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
COMMENT= RELP input/output module for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog6-devel
@@ -11,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../rsyslog6-devel
MNAME= relp
LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG= yes
+USEs= pkgconfig
CONFIGURE_ARGS+=--enable-relp
diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile
index e32ba5bd514a..b9c32036ab06 100644
--- a/sysutils/rsyslog6-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog6-devel-rfc3195/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
COMMENT= RFC3195 input support for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog6-devel
@@ -11,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../rsyslog6-devel
MNAME= rfc3195
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-rfc3195
diff --git a/sysutils/rsyslog6-gnutls/Makefile b/sysutils/rsyslog6-gnutls/Makefile
index 9a4169457ad6..57657e524a5c 100644
--- a/sysutils/rsyslog6-gnutls/Makefile
+++ b/sysutils/rsyslog6-gnutls/Makefile
@@ -1,9 +1,5 @@
-#New ports collection makefile for: rsyslog4-gnutls
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
PORTREVISION= 1
@@ -14,7 +10,7 @@ MNAME= gnutls
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \
gcrypt.18:${PORTSDIR}/security/libgcrypt
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-gnutls
diff --git a/sysutils/rsyslog6-relp/Makefile b/sysutils/rsyslog6-relp/Makefile
index 7224976e39c5..cd2275da2028 100644
--- a/sysutils/rsyslog6-relp/Makefile
+++ b/sysutils/rsyslog6-relp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-relp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
# $FreeBSD$
-#
COMMENT= RELP input/output module for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog6
@@ -11,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../rsyslog6
MNAME= relp
LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-relp
diff --git a/sysutils/rsyslog6-rfc3195/Makefile b/sysutils/rsyslog6-rfc3195/Makefile
index d0521d2be5cd..b18847ac0770 100644
--- a/sysutils/rsyslog6-rfc3195/Makefile
+++ b/sysutils/rsyslog6-rfc3195/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created: 29 December 2008
-# Whom: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
#
# $FreeBSD$
#
@@ -11,7 +9,7 @@ MASTERDIR= ${.CURDIR}/../rsyslog6
MNAME= rfc3195
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-rfc3195
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 6a957dcf1f7c..b0da1344243c 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -34,7 +34,7 @@ SNMP_DESC= SNMP trap sender for rsyslog
.if ${PORT_OPTIONS:MDBI}
LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-libdbi
PLIST_FILES+= lib/rsyslog/omlibdbi.la \
lib/rsyslog/omlibdbi.so
@@ -43,7 +43,7 @@ PLIST_FILES+= lib/rsyslog/omlibdbi.la \
.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \
gcrypt.18:${PORTSDIR}/security/libgcrypt
-USE_PKGCONFIG= yes
+USES+= pkgconfig
CONFIGURE_ARGS+=--enable-gnutls
PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \
lib/rsyslog/lmnsd_gtls.so
@@ -75,7 +75,7 @@ PLIST_FILES+= lib/rsyslog/ompgsql.so \
.if ${PORT_OPTIONS:MRELP}
LIB_DEPENDS+= relp.0:${PORTSDIR}/devel/librelp
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-relp
PLIST_FILES+= lib/rsyslog/imrelp.la \
lib/rsyslog/imrelp.so \
@@ -85,7 +85,7 @@ PLIST_FILES+= lib/rsyslog/imrelp.la \
.if ${PORT_OPTIONS:MRFC3195}
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
-USE_PKGCONFIG= yes
+USES= pkgconfig
CONFIGURE_ARGS+=--enable-rfc3195
PLIST_FILES+= lib/rsyslog/im3195.la \
lib/rsyslog/im3195.so
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 1a0e5df136dc..b15b3e202fff 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -13,9 +13,8 @@ COMMENT= A GNOME applet displaying hardware sensor values
RUN_DEPENDS= mbmon:${PORTSDIR}/sysutils/mbmon \
smartctl:${PORTSDIR}/sysutils/smartmontools
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack gnomepanel libgnomeui
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_GMAKE= yes
DEFINES= -DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 0ed5d94e0ebe..c83436941592 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: serpentine
-# Date created: 2005-06-25
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/sysutils/serpentine/Makefile,v 1.4 2006/08/31 05:21:45 marcus Exp $
@@ -17,11 +14,11 @@ COMMENT= Gnome Audio Cd Burner
BUILD_DEPENDS= xmlproc_parse:${PORTSDIR}/textproc/py-xml
RUN_DEPENDS= xmlproc_parse:${PORTSDIR}/textproc/py-xml
+USES= pkgconfig
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= pygnomedesktop intlhack
USE_GMAKE= yes
-USE_PKGCONFIG= build
USE_GSTREAMER= core gnomevfs python
USE_PYTHON= 2.4+
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index e2e79befc53d..202a0594b1b3 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -12,7 +12,7 @@ COMMENT= A Terminal Multiplexer
LICENSE= BSD
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= tmux.1
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 147395fca79d..8220beac11fc 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS= confuse:${PORTSDIR}/devel/libconfuse \
cdio:${PORTSDIR}/sysutils/libcdio
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
USE_GETTEXT= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules \
--disable-doc
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 2f2d1de46c78..063accbe64b9 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wmfire
-# Date created: 21 October 1999
-# Whom: Chris D. Faulhaber <jedgar@fxp.org>
-#
+# Created by: Chris D. Faulhaber <jedgar@fxp.org>
# $FreeBSD$
-#
PORTNAME= wmfire
PORTVERSION= 1.2.4
@@ -16,8 +12,8 @@ COMMENT= Window Maker dock app showing load average as a flame
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+USES= pkgconfig
USE_GNOME= gtk20
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_CSTD= gnu89
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index ace6f1378253..15d99c0a5db0 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -1,6 +1,5 @@
# Created by: J.R. Oldroyd <fbsd@opal.com>
# $FreeBSD$
-#
PORTNAME= xfburn
PORTVERSION= 0.4.3
@@ -24,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= intltool
USE_XFCE= configenv libexo libgui
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 90e6f32b4234..cf54a06b0692 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfce4-fsguard-plugin
-# Date created: 2003-12-20
-# Whom: Matt Lancereau <matt@rimasec.net>
-#
+# Created by: Matt Lancereau <matt@rimasec.net>
# $FreeBSD$
-#
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 1.0.1
@@ -22,7 +18,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 intltool intlhack
USE_XFCE= configenv libmenu libutil panel
USE_XORG= x11
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= NLS
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 38b609ed5cfb..ec9e68dc51c9 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfce-netload-plugin
-# Date created: 3 September 2003
-# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xfce4-netload-plugin
PORTVERSION= 1.2.0
@@ -20,8 +16,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intltool intlhack
USE_XFCE= configenv libmenu panel
+USES= pkgconfig
INSTALLS_ICONS= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= NLS
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index e2582b3da009..8e2382ea176e 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,6 +1,5 @@
# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xfce4-settings
PORTVERSION= 4.10.0
@@ -22,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 desktopfileutils intltool intlhack
USE_XFCE= configenv garcon libexo libmenu libutil xfconf
USE_XORG= inputproto x11 xi
-USE_PKGCONFIG= build
+USEs= pkgconfig
CONFIGURE_ARGS= --enable-pluggable-dialogs \
--enable-gio-unix
diff --git a/textproc/ctpl/Makefile b/textproc/ctpl/Makefile
index e375a74af167..68f092d7517c 100644
--- a/textproc/ctpl/Makefile
+++ b/textproc/ctpl/Makefile
@@ -10,7 +10,7 @@ COMMENT= C Template (Parser) Library
GNU_CONFIGURE= yes
USE_GNOME= glib20 gnomehack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
MAN1= ctpl.1
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index f36f30e793af..62eb06589fb5 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -15,9 +15,8 @@ COMMENT= Dictionary/spellchecking framework
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 ltverhack
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --disable-uspell \
--disable-voikko
MAKE_JOBS_SAFE= yes
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index 4fac0408191d..0e66d9e32343 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -12,14 +12,13 @@ COMMENT= A Collection of DOM Implementations
LIB_DEPENDS= gdome:${PORTSDIR}/textproc/gdome2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
OPTIONS_DEFINE= OCAML
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 4f6878af0708..79aa900edc6d 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -16,10 +16,9 @@ LIB_DEPENDS= translate:${PORTSDIR}/textproc/libtranslate
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GCONF_SCHEMAS= gnome-translate.schemas
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix eel2 intlhack libgnomeui
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-export-dynamic
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index cd5a694b7f0f..e02aa2b76e10 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell \
USE_BZIP2= yes
HAS_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= xtst
USE_GNOME= desktopfileutils
USE_QT4= corelib gui webkit phonon \
diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 4bba752dd204..375cdbb36664 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -29,6 +29,8 @@ PLIST_DIRSTRY= %%DATADIR%%
USALIASES= en_AG en_AU en_BS en_BW en_BZ en_CA en_DK en_GB en_GH en_HK \
en_IE en_IN en_JM en_NA en_NZ en_PH en_SG en_TT en_ZA en_ZW
+
+CONFIGURE_ENV+= ac_cv_prog_AWK=gawk
.for ALIAS in ${USALIASES}
PLIST_FILES+= %%DATADIR%%/hyph_${ALIAS}.dic
.endfor
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 4dbe14ed6494..d5b4d349073e 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: iksemel
-# Date created: 24 April 2006
-# Whom: trasz
-#
+# Created by: trasz
# $FreeBSD$
-#
PORTNAME= iksemel
PORTVERSION= 1.4
@@ -22,16 +18,14 @@ GNU_CONFIGURE= yes
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
INFO= iksemel
-.include <bsd.port.pre.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \
${WRKSRC}/doc/iksemel.texi
@${REINPLACE_CMD} -e 's|pkgconfigdir=$$(libdir)/pkgconfig|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
${WRKSRC}/Makefile.am
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index fa0c38a119fa..48aa9a89d046 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -15,7 +15,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --disable-gtk-doc-html
PLIST_SUB= VERSION="0.6"
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index bb6352b03c28..d14023fe6628 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -20,9 +20,8 @@ USE_AUTOTOOLS= libtoolize automake autoconf aclocal
ACLOCAL_ARGS= -I${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
USE_ICONV= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= libxml2 libxslt
GNOME_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 116fb8603ad2..c86ca63929f5 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -18,7 +18,6 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
-USES= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.mk>
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 2f1a1b1d09ed..452a3a0e5d26 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_BZIP2= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --enable-static
USE_LDCONFIG= yes
diff --git a/textproc/libvisio/Makefile b/textproc/libvisio/Makefile
index 73d2b284522c..391e3e79e9e6 100644
--- a/textproc/libvisio/Makefile
+++ b/textproc/libvisio/Makefile
@@ -21,9 +21,8 @@ CONFIGURE_ARGS= --disable-werror
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
.include <bsd.port.pre.mk>
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index db90cdc41e96..c16e52a278b6 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mythes
-# Date created: 2011-06-18
-# Whom: Baptiste Daroussin <bapt@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= mythes
PORTVERSION= 1.2.3
@@ -16,8 +11,7 @@ COMMENT= Simple thesaurus library
LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 8ee93737c95a..27d5867b2814 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= raptor2:${PORTSDIR}/textproc/raptor2 \
USE_GNOME= gnomehack lthack
USE_OPENSSL= yes
USE_PERL5_BUILD=yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 2c01fce47751..a67ed3b89304 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS= libltdl
USE_GNOME= gnomehack libxml2 lthack
USE_OPENSSL= yes
USE_PERL5_BUILD= yes
-USE_PKGCONFIG= both
+USES= pkgconfig:both
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-raptor=system \
--with-threestore=no
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index c281f2ff75c0..f406760bd677 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= sary.10:${PORTSDIR}/textproc/sary
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
INSTALL_TARGET= site-install
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index a9f9fcc12a47..497f2a529a60 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -11,10 +11,9 @@ COMMENT= A GNOME tool to find strings in a set of files
LICENSE= GPLv2 # (or later)
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomehier libgnomeui
USE_GETTEXT= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index baad1afa4c67..00985d797cc4 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES= http://sary.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= A suffix array library and tools, which provide fast full-text search
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 3524cb8776c7..3683cbb5ff05 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scim-openvanilla
-# Date Created: 3 September 2005
-# Whom: Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
# $FreeBSD$
-#
PORTNAME= scim-openvanilla
PORTVERSION= 0.7.2.20070514
@@ -26,7 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV+= OV_MODULEDIR=${PREFIX}/lib/openvanilla/
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 6a5ab1e092bf..6da70ae7dd1c 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -1,8 +1,5 @@
-# Ports collection makefile for: sdcv
-# Date created: 2005/07/07
-# Whom: chinsan <chinsan.tw@gmail.com>
+# Created by: chinsan <chinsan.tw@gmail.com>
# $FreeBSD$
-#
PORTNAME= sdcv
PORTVERSION= 0.4.2
@@ -18,7 +15,7 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
SUB_FILES= pkg-message
.if !defined(WITHOUT_NLS)
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 6ac951308fc9..ad4964d51d9c 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -19,12 +19,11 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \
LICENCE= GPLv3
USE_ZIP= yes
-USES= cmake
+USES= cmake pkgconfig
USE_DOS2UNIX= CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp
NO_WRKSUBDIR= yes
USE_QT4= qmake gui svg webkit xml moc uic rcc imageformats linguist
USE_GNOME= desktopfileutils
-USE_PKGCONFIG= build
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index 007fd0e3ffcc..47d87c2c8268 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: soothsayer
-# Date created: 7 August 2007
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= soothsayer
PORTVERSION= 0.6.3
@@ -24,7 +20,7 @@ CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \
ac_cv_prog_HAVE_DOXYGEN=no
CONFIGURE_ARGS= --disable-python-binding
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAN1= soothsayer_demo.1 soothsayer_demo_text.1 \
soothsayer_simulator.1 text2ngram.1
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 5dc6d3bf9749..6f04169bb53b 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS= raptor2:${PORTSDIR}/textproc/raptor2 \
USE_QT4= corelib dbus qtestlib network \
qmake_build moc_build uic_build rcc_build
-USE_PKGCONFIG= both
USE_BZIP2= yes
-USES= cmake
+USES= cmake pkgconfig
CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \
-DSOPRANO_DISABLE_SESAME2_BACKEND=yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 75f7c1d1f925..8229841fb103 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -17,7 +17,7 @@ AUTOMAKE_ARGS+= --add-missing
GNU_CONFIGURE= yes
PLIST_FILES= bin/ag
USE_AUTOTOOLS= aclocal autoconf autoheader automake
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= ag.1
diff --git a/textproc/xml2/Makefile b/textproc/xml2/Makefile
index 1e05b013ad1f..0425f340f566 100644
--- a/textproc/xml2/Makefile
+++ b/textproc/xml2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Convert between XML and a line-oriented format similar to XPath
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= libxml2
PLIST_FILES= bin/xml2 \
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index ff61b78a6097..8ecfea836c54 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs
OPTIONS_DEFINE= XSLT
XSLT_DESC= Build libxsltwrap library (requires libxslt)
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= libxml2
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-silent-rules
USE_LDCONFIG= yes
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index a60a96863d47..4b7be4660a57 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bookmarkbridge
-# Date Created: January 2004
-# Whom: Marco Molteni <molter@gufi.org>
-#
+# Created by: Marco Molteni <molter@gufi.org>
# $FreeBSD$
-#
PORTNAME= bookmarkbridge
PORTVERSION= 0.76
@@ -21,7 +17,7 @@ USE_XORG= x11 ice xext
USE_QT4= corelib gui moc_build rcc_build uic_build qt3support
USE_GNOME= libxml2
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= aclocal automake autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 8031dfe7f570..cfc9ee4c5906 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -11,8 +11,7 @@ MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
MAINTAINER= c.petrik.sosa@gmail.com
COMMENT= Extremely fast and flexible web server
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_OPENSSL= yes
USE_LDCONFIG= yes
USE_GETTEXT= yes
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 644d5eefcd54..cb5b03df71c6 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
USE_RC_SUBR= dansguardian
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_BZIP2= yes
CONFLICTS= dansguardian-2.10.*
diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index 29253ca66036..69c91fd26c69 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
MAKE_ARGS= PREFIX=${PREFIX}
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 1e53dc86b2bc..d35ee2532d8e 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -11,10 +11,9 @@ DISTNAME= erwin-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple GTK+-2 HTML editor
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix gtksourceview gtkhtml3
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
MAN1= erwin.1
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index 13759f4b0c24..46b9d96785f0 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=CACHE
CACHE_DESC= Enable caching of remote media to local storage
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= glib20
USE_GECKO= libxul libxul19
USE_WEBPLUGINS= native
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index e7f2eb13d334..0034fc058d4f 100644
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: httpsqs
-# Date created: 2011-04-22
-# Whom: Zhihao Yuan <lichray@gmail.com>
-#
+# Created by: Zhihao Yuan <lichray@gmail.com>
# $FreeBSD$
-#
PORTNAME= httpsqs
PORTVERSION= 1.7
@@ -18,7 +14,7 @@ LICENSE= BSD
LIB_DEPENDS+= tokyocabinet:${PORTSDIR}/databases/tokyocabinet \
event-2.0:${PORTSDIR}/devel/libevent2
-USE_PKGCONFIG= yes
+USES= pkgconfig
PLIST_FILES= bin/${PORTNAME}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 350a3da2fa4d..9b6eaad96673 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lighttpd
-# Date created: 20 May 2004
-# Whom: k@123.org
-#
+# Created by: k@123.org
# $FreeBSD$
-#
PORTNAME?= lighttpd
PORTVERSION= 1.4.32
@@ -25,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= lthack
USE_GMAKE= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAKE_JOBS_SAFE= yes
#.if !defined(_BUILDING_LIGHTTPD_MODULE)
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index 19b437f5f1d5..4e347a1b9402 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -24,7 +24,7 @@ GH_TAGNAME= ${PORTVERSION:C/r/-r/}
GH_COMMIT= 0d5f4ab
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= glib20 gtk20
USE_LUA= 5.1
MAKE_ARGS+= USE_UNIQUE=1 NO_JAVASCRIPTCORE=1
diff --git a/www/midori/Makefile b/www/midori/Makefile
index a818cb4ae7cc..12d313bddd54 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,5 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= midori
PORTVERSION= 0.5.0
@@ -44,7 +43,7 @@ USE_GNOME= glib20 gtk20 intltool libxml2 desktopfileutils
USE_XORG= xscrnsaver
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
PLIST_SUB= VERSION="${PORTVERSION:R}"
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index dde6f4b5ae71..48e691d2c3b2 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_APACHE= 22
GNU_CONFIGURE= yes
diff --git a/www/multiwatch/Makefile b/www/multiwatch/Makefile
index c83173ef79e0..434e9ff92a56 100644
--- a/www/multiwatch/Makefile
+++ b/www/multiwatch/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= ev:${PORTSDIR}/devel/libev
GNU_CONFIGURE= yes
MAN1= multiwatch.1
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_BZIP2= yes
USE_GNOME= _glib20
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 8c2d9bc06e42..f7663d3d0045 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -19,12 +19,11 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
USE_GL= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= libglade2 libgnomeui
USE_SDL= sdl
USE_JAVA= yes
USE_GCC= 4.6+
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= configure
CONFIGURE_ARGS= --enable-gecko-rpath \
diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 0027821e36ca..a638e85e8dc0 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 WebKit engine
USE_GCC= any
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_QT4= corelib declarative gui network \
qmake_build moc_build rcc_build
QT_NONSTANDARD= yes
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 6533cd21bafd..632188481935 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -13,12 +13,11 @@ COMMENT= Nice GNOME/GTK-based HTML editor
LIB_DEPENDS= croco-0.6.3:${PORTSDIR}/textproc/libcroco
USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= desktopfileutils gnomemenus gnomeprefix \
gtksourceview intlhack libgnomeprintui libgnomeui libgtkhtml
USE_XORG= xpm
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 5d5c92644698..5be1f96d32b1 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -456,7 +456,7 @@ CONFIGURE_ARGS+= --enable-ecap
LIB_DEPENDS+= ecap:${PORTSDIR}/www/libecap
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_PKGCONFIG= build
+USES+= pkgc
.else
CONFIGURE_ARGS+= --disable-ecap
.endif
diff --git a/www/surf/Makefile b/www/surf/Makefile
index 0efa74110599..c967529302f2 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu
USE_CSTD= c99
USE_GNOME= gtk20
-USE_PKGCONFIG= yes
+USES= pkgconfig
MAN1= surf.1
PORTDOCS= README
diff --git a/www/tickr/Makefile b/www/tickr/Makefile
index dfa534cd5d01..a900d8d34da8 100644
--- a/www/tickr/Makefile
+++ b/www/tickr/Makefile
@@ -21,7 +21,7 @@ REINPLACE_ARGS= -e 's,%%PREFIX%%,${PREFIX},1' -i.bak
USE_DOS2UNIX= tickr.h
USE_GNOME= desktopfileutils gtk20 libxml2
-USE_PKGCONFIG= build
+USES= pkgconfig
post-patch:
${REINPLACE_CMD} ${WRKSRC}/${PORTNAME}.desktop ${WRKSRC}/src/tickr/tickr.h
diff --git a/www/volta/Makefile b/www/volta/Makefile
index 77a4972b6710..1fa69a4009d6 100644
--- a/www/volta/Makefile
+++ b/www/volta/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: volta
-# Date created: 28 November 2011
-# Whom: mahlon
-#
+# Created by: mahlon
# $FreeBSD$
-#
PORTNAME= volta
DISTVERSION= 0.2.0
@@ -20,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= cdb:${PORTSDIR}/databases/tinycdb
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GMAKE= yes
USE_LUA= 5.1
ALL_TARGET= ${PORTNAME}
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 75223ff2488c..e0f7ba3c8db7 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -26,11 +26,10 @@ USE_GETTEXT= yes
USE_GSTREAMER= yes
MAKE_JOBS_SAFE= yes
USE_XORG= xt
-USES= bison
+USES= bison pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 libxslt ltverhack
-USE_PKGCONFIG= build
USE_SQLITE= yes
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 9337a74bcc10..9e573f50d320 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -25,11 +25,10 @@ USE_GETTEXT= yes
USE_GSTREAMER= yes
MAKE_JOBS_SAFE= yes
USE_XORG= xt
-USES= bison
+USES= bison pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gtk30 libxslt ltverhack
-USE_PKGCONFIG= build
USE_SQLITE= yes
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 4da57131e6ab..66f0cc71d5e5 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XFCE= configenv libexo libmenu libutil panel
USE_XORG= ice
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index 76c4f6cde549..e02bbf2c2ad1 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -1,4 +1,4 @@
-# Created by: Aldis Berjoza <aldis@bsdroot.lv>
+# Created by: Aldis Berjoza <aldis@bsdroot.lv>
# $FreeBSD$
PORTNAME= xombrero
@@ -17,7 +17,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
soup-2.4:${PORTSDIR}/devel/libsoup \
webkitgtk-1:${PORTSDIR}/www/webkit-gtk2
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PERL5_BUILD=yes
USE_GNOME= gtk20
INSTALLS_ICONS= yes
diff --git a/www/xsp/Makefile b/www/xsp/Makefile
index 035f7870808d..b8933e295ebe 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xsp
-# Date created: 20040828
-# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
# $FreeBSD$
-#
PORTNAME= xsp
PORTVERSION= 2.10.2
@@ -18,10 +14,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono
MAKE_JOBS_UNSAFE= yes
-USE_PKGCONFIG= yes
USE_SQLITE= 3
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index a5fa672d2ef1..9fd5609a8e46 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11 xext
-USES= bison
+USES= bison pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 5491e05a04ef..0a4f4a5d9db9 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -17,7 +17,7 @@ SOX_DESC= Install SOX to play audio
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11 xt
-USE_PKGCONFIG= build
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXt -lm
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 3398b489b6e0..e1d8b181bc48 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -1,6 +1,5 @@
# Created by: Martin Wilke (miwi@FreeBSD.org)
# $FreeBSD$
-#
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.6.2
@@ -19,6 +18,6 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack
USE_XFCE= configenv libmenu libutil panel
-USE_PKGCONFIG= build
+USES= pkgconfig
.include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 6c01c0797fb1..cf9527b88266 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: timer plugin for xfce4
-# Date created: 23 Januar 2007
-# Whom: Martin Wilke (miwi@FreeBSD.org)
-#
+# Created by: Martin Wilke (miwi@FreeBSD.org)
# $FreeBSD$
-#
PORTNAME= xfce4-timer-plugin
PORTVERSION= 1.0.0
@@ -22,6 +18,6 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack
USE_XFCE= configenv libmenu libutil panel
-USE_PKGCONFIG= build
+USES= pkgconfig
.include <bsd.port.mk>
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 5bac6bcb8006..62763bc5666d 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= System:${PORTSDIR}/devel/deforaos-libsystem \
Xrandr:${PORTSDIR}/x11/libXrandr
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
-USE_GETTEXT= yes
+USES= pkgconfig gettext
INSTALLS_ICONS= yes
MAKE_ARGS+= PREFIX=${PREFIX}
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 24fdfe836a0d..457c6698dfd6 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11 sm xaw xproto
USE_GNOME= atk gconf2 glib20 gnomevfs2 gtk20 libglade2 libidl libxml2 orbit2 pango
-USE_PKGCONFIG= build
+USES= pkgconfig
HAS_CONFIGURE= yes
MAN1= rox.1
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 23503d7a7c3f..8a68011dccfb 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: TDFSB
-# Date created: 31 Jul 2005
-# Whom: Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
# $FreeBSD$
-#
PORTNAME= tdfsb
PORTVERSION= 0.0.10
@@ -21,7 +17,7 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg
USE_GL= glut
USE_SDL= image sdl
-USE_PKGCONFIG= yes
+USES= pkgconfig
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 73d40670d9b2..2120a4d30162 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 intltool intlhack
USE_XFCE= configenv libutil libexo
USE_XORG= x11
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --disable-debug
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 3d4e93e4d99c..67b22e6580cf 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= desktopfileutils gnomehack gtk20 intltool intlhack gdkpixbuf2
USE_LDCONFIG= yes
USE_XFCE= configenv libexo libmenu libutil
USE_XORG= sm x11
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= DBUS DOCS GVFS NLS NOTIFY STARTUP
OPTIONS_GROUP= PLUGINS
diff --git a/x11-fonts/cantarell-fonts/Makefile b/x11-fonts/cantarell-fonts/Makefile
index 9202ead5101d..e06a4b4d0fb1 100644
--- a/x11-fonts/cantarell-fonts/Makefile
+++ b/x11-fonts/cantarell-fonts/Makefile
@@ -11,7 +11,7 @@ COMMENT= Cantarell, a Humanist sans-serif font family
LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XZ= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 98f9720b05f0..362b1689e859 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -10,7 +10,7 @@ COMMENT= Create an index of X font files in a directory
XORG_CAT= font
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= xorg-macros
MAN1= bdftruncate.1 ucs2any.1
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 0689bdd5d2ea..1559ca30d6d4 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -43,7 +43,7 @@ MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/7/Fedora/source/SRPMS/
DISTFILES= redhat-artwork-${PORTVERSION}-9.fc7.src.rpm
-USE_PKGCONFIG= build
+USES+= pkgconfig
WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION}
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index a7d54cbdf983..c51420234620 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: clearlooks
-# Date created: 2005-02-26
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/x11-themes/clearlooks/Makefile,v 1.8 2007/08/07 04:34:29 mezz Exp $
-#
PORTNAME?= clearlooks
PORTVERSION= 0.6.2
@@ -18,7 +14,7 @@ COMMENT?= GTK+ 2.x engine based on Bluecurve
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 4eb41ad65421..0e94df860d28 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -14,10 +14,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= A simplistic GTK+ 2.x theme engine
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
THEME= cleanice-theme-1.2.7
THEMEDIR= ${WRKDIR}/${THEME}/Theme
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index ae3f94cb7408..9e1565648279 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
USE_BZIP2= yes
USE_GNOME= gtk20
-USES= cmake
-USE_PKGCONFIG= yes
+USES= cmake pkgconfig
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 20d051ba6a03..87a898611642 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gtk-xfce-engine
-# Date Created: 10 October 2002
-# Whom: olgeni@FreeBSD.org
-#
+# Created by: olgeni@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= gtk-xfce-engine
PORTVERSION= 3.0.1
@@ -19,7 +15,7 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gtk20
USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS+=--disable-glibtest \
--enable-gtk2 \
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index 7d5e7604cfb9..2b70de560477 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
USE_BZIP2= yes
USE_GNOME= gtk30
-USES= cmake:outsource
-USE_PKGCONFIG= yes
+USES= cmake:outsource pkgconfig
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/x11-themes/gtk3-unico-engine/Makefile b/x11-themes/gtk3-unico-engine/Makefile
index fda696d9544f..792de1cb6d28 100644
--- a/x11-themes/gtk3-unico-engine/Makefile
+++ b/x11-themes/gtk3-unico-engine/Makefile
@@ -1,6 +1,5 @@
# Created by: Olivier Duchateau
# $FreeBSD$
-#
PORTNAME= unico
PORTVERSION= 1.0.2
@@ -16,7 +15,7 @@ COMMENT= Gtk+ 3.0 engine
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= cairo glib20 gtk30
USE_LDCONFIG= yes
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index d344d53193b1..02a361ddb3b4 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
-USES+= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.mk>
diff --git a/x11-themes/thewidgetfactory/Makefile b/x11-themes/thewidgetfactory/Makefile
index 3f5061bf692b..c8f22e64280f 100644
--- a/x11-themes/thewidgetfactory/Makefile
+++ b/x11-themes/thewidgetfactory/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
PLIST_FILES= bin/twf
diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile
index dbb0b17074cc..add401c08485 100644
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@@ -14,8 +14,7 @@ LICENSE= LGPL21
GNU_CONFIGURE= yes
USE_GCC= 4.4+
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20
USE_LDCONFIG= yes
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 00ac8d355000..ab546c3ea647 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
USE_LDCONFIG= yes
USE_XORG= xft
USE_GL= glu
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-threads \
--enable-shared \
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index a5f109a202ee..06a6fc8978ca 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -15,11 +15,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 1e0614f7918f..3033832088a0 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -16,9 +16,8 @@ OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES
GLADE_DESC= Enable libglade2 support
GLADEUI_DESC= Enable glade3 support
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --includedir="${PREFIX}/include/${PORTNAME}" \
--with-html-dir="${PREFIX}/share/doc"
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index d0c090a993bd..579d4749d5b0 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -11,13 +11,12 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+ 2.0
-USES= pathfix
-USE_GNOME= gtk20 gnomehack
+USES= pathfix pkgconfig
+USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_CSTD= gnu89
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
LATEST_LINK= gtkextra2
DOCSDIR= ${PREFIX}/share/doc/gtkextra2
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 3c3b7c18df5a..a88cc272983c 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -28,13 +28,12 @@ OPTIONS_DEFINE= DOCS
USE_BZIP2= yes
USE_GETTEXT= yes
USE_ICONV= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xmu xrandr xrender xt xxf86vm
USE_GL= glu
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gdkpixbuf2 gtk20
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index e08cffa7d82c..f59aa521fb36 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
USE_BZIP2= yes
USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
post-patch:
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index a8c359122527..7dca5faa5cce 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
t1:${PORTSDIR}/devel/t1lib \
gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20 libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
MAN1= mathmlviewer.1
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index 6bd0659f3de9..f7bec35f9fa8 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -16,7 +16,7 @@ USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME= gtk20 ltverhack
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 31d88764b0b8..b79c7a096697 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME= gnomehack lthack gtk20 libxml2
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 55f1ace15455..908d69c2c935 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: p5-Gnome2-Canvas
-# Date created: Apr 1, 2004
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= Gnome2-Canvas
PORTVERSION= 1.002
@@ -26,7 +21,7 @@ RUN_DEPENDS= p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
USE_GNOME= libgnomecanvas
-USE_PKGCONFIG= build
+USES= pkgconfig
PERL_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index b7f91d15e883..8dc2a0d6c6fe 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: p5-Gnome2-VFS
-# Date created: Jan 2, 2004
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= Gnome2-VFS
PORTVERSION= 1.081
@@ -25,7 +20,7 @@ RUN_DEPENDS= p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
USE_GNOME= gnomevfs2
-USE_PKGCONFIG= build
+USES= pkgconfig
PERL_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index f9360ef3e80b..65128e97a996 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: p5-Gtk2-Html2
-# Date created: Apr 20, 2004
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= Gtk2-Html2
PORTVERSION= 0.03
@@ -25,7 +20,7 @@ RUN_DEPENDS= p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
USE_GNOME= libgtkhtml
-USE_PKGCONFIG= build
+USES= pkgconfig
PERL_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 61e842c7d743..06cbf74239db 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20 ltverhack referencehack
-USE_PKGCONFIG= build
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 353e112a29b3..e33ab4df2f29 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -11,11 +11,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Implements Pango library with a PDF backend for PDF output
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= pango
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile
index 53caad09fec3..d922a04bf51c 100644
--- a/x11-toolkits/phat/Makefile
+++ b/x11-toolkits/phat/Makefile
@@ -13,10 +13,9 @@ COMMENT= Collection of GTK+ widgets geared toward pro-audio apps
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
-USE_GNOME= gtk20 libgnomecanvas gnomehack
+USES= pathfix pkgconfig
+USE_GNOME= gtk20 libgnomecanvas
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 88ab4c9ea318..9b3418f3e9ee 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-ope
USE_BZIP2= yes
USE_PYTHON= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= pygtk2
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 151e5624e1c9..cd94ccf4816c 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: py-libsexy
-# Date created: 09 December 2006
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= sexy
PORTVERSION= 0.1.9
@@ -21,7 +17,7 @@ LIB_DEPENDS= sexy.2:${PORTSDIR}/x11-toolkits/libsexy
USE_AUTOTOOLS= libtool
USE_GNOME= pygtk2
USE_PYTHON= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index f41160ef3fd7..ad0172f87df2 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= yes
USE_GCC= any
HAS_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= ${PREFIX}/lib/qt4
USE_XORG= xrender xrandr xinerama inputproto xfixes \
sm xcursor xext x11 ice xi xt
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 9204151f30ce..a615f41ddc8c 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -17,11 +17,10 @@ LICENSE= GPLv2
LIB_DEPENDS= rep.16:${PORTSDIR}/lang/librep
USE_XZ= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= build
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/sakura/Makefile b/x11-toolkits/sakura/Makefile
index d9e60e8c0f2f..4bf03fb1c803 100644
--- a/x11-toolkits/sakura/Makefile
+++ b/x11-toolkits/sakura/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: sakura
-# Date created: 2008/06/20
-# Whom: chinsan
-#
+# Created by: chinsan
# $FreeBSD$
-#
PORTNAME= sakura
PORTVERSION= 2.4.2
@@ -16,9 +12,8 @@ COMMENT= A terminal emulator based on GTK and VTE
USE_GNOME= vte
USE_GETTEXT= yes
-USES= cmake
+USES= cmake pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= build
MAN1= sakura.1
diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index c5d39bc25629..77ccecfa5ee6 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
xcb:${PORTSDIR}/x11/libxcb
USE_BZIP2= yes
-USES= cmake
-USE_PKGCONFIG= build
+USES= cmake pkgconfig
USE_ICONV= yes
USE_LUA= yes
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index a0f1c747509f..2d917d09eb10 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -17,10 +17,9 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 gconf2
post-patch:
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 220060ba37c8..ecc8f88c55b2 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PYTHON= -2.7
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
USE_AUTOTOOLS= libtool
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 9704c7dd5d27..b66f14418ccf 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Devil's Pie
-# Date created: 08 Jun 2004
-# Whom: Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
# $FreeBSD$
-#
PORTNAME= devilspie
PORTVERSION= 0.22
@@ -18,7 +14,7 @@ USE_GNOME= libwnck
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 3201f75390bc..8071a10e6190 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -16,7 +16,7 @@ COMMENT= Standalone menu and keybinding editors for enlightenment 0.16
LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm
USE_GNOME= imlib gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
SUB_STUBS= e16menuedit-0.1 e16keyedit-0.7
diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile
index 2067a00d770b..150d96c20e1c 100644
--- a/x11-wm/echinus/Makefile
+++ b/x11-wm/echinus/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
xcb:${PORTSDIR}/x11/libxcb \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= x11 xau xdmcp xext xft xrender xrandr
MAN1= echinus.1
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 8a5250c10420..989f0850abf7 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -17,12 +17,11 @@ GNU_CONFIGURE= yes
USE_GL= gl
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gtk20 libwnck pango
USE_XORG= xrender
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
MAN1= emerald.1 \
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index a5f9b95aa876..3472df704020 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -16,10 +16,9 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= intltool libxml2
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 4f9dfdf18e3e..c6c5d1f946fd 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
USE_XZ= yes
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
GNU_CONFIGURE= yes
PLIST_FILES= lib/sawfish/sawfishpager \
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 24ae9b0eeab5..4e03941760ee 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -30,7 +30,7 @@ PLIST_DIRS= %%ETCDIR%%
.if ${PORT_OPTIONS:MXFT}
USE_XORG+= xft
-USE_PKGCONFIG= build
+USES+= pkgconfig
MAKE_ENV+= EXTRA_INC="$$(pkg-config --cflags xft)" \
EXTRA_LIBS="$$(pkg-config --libs xft)"
CFLAGS+= -DXFT
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d5aa63ca8cbf..2dcd9d351484 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -27,8 +27,7 @@ OPTIONS_DEFINE= NLS XRANDR
USE_GCC= any
USE_XORG= xft xinerama xmu xpm
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 87daa5ce8107..36d9cc87edd1 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= x11 xft xpm
HAS_CONFIGURE= yes
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 6e500bfd722a..dd9bf8c7b7c4 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -1,6 +1,5 @@
# Created by: James Earl <jdearl@telus.net>
# $FreeBSD$
-#
PORTNAME= xfce4-desktop
PORTVERSION= 4.10.2
@@ -24,8 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gtk20 intltool intlhack desktopfileutils
USE_XFCE= configenv garcon libmenu libutil libexo xfconf
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_XORG= x11 sm
CONFIGURE_ARGS+=--enable-gio-unix \
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 3dea4e9ee4d7..0c524e6436fd 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -1,6 +1,5 @@
# Created by: James Earl <jdearl@telus.net>
# $FreeBSD$
-#
PORTNAME= xfce4-panel
PORTVERSION= 4.10.0
@@ -16,7 +15,7 @@ LIB_DEPENDS= wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
cairo:${PORTSDIR}/graphics/cairo \
dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
@@ -26,7 +25,6 @@ USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv garcon libexo libmenu libutil xfconf
USE_XORG= x11 sm
-USE_PKGCONFIG= build
CONFIGURE_ARGS+=--enable-gio-unix \
--disable-gtk-doc-html
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index d666907d25a0..c924ed11c2a9 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -1,6 +1,5 @@
# Created by: Matt Lancereau <matt@rimasec.net>
# $FreeBSD$
-#
PORTNAME= xfce4-session
PORTVERSION= 4.10.0
@@ -26,7 +25,7 @@ INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libmenu libutil panel xfconf
USE_XORG= x11 sm ice
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 152e0b66ede9..da098c6e7187 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: apwal
-# Date created: Nov 26, 2003
-# Whom: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-#
+# Created by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
# $FreeBSD$
-#
PORTNAME= apwal
PORTVERSION= 0.4.5
@@ -16,7 +12,7 @@ COMMENT= Simple and powerful application launcher
USE_GNOME= gtk20 libxml2
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
WRKSRC= ${WRKDIR}/${PORTNAME}/src
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 752a95653209..665892b79e81 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -18,12 +18,11 @@ LIB_DEPENDS= wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20 gtk20 pygtk2
USE_PYTHON= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
INSTALLS_ICONS= yes
USE_XORG= x11 xproto xcomposite xrender
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index f80b523e2f09..3db5b000fe6e 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -20,8 +20,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_GMAKE= yes
CONFIGURE_ARGS= --disable-introspection
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 23914724a0c4..757c20d3bc3c 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: DeCurs
-# Date created: 19 January 2002
-# Whom: Miguel Mendez <flynn@energyhq.homeip.net>
-#
+# Created by: Miguel Mendez <flynn@energyhq.homeip.net>
# $FreeBSD$
-#
PORTNAME= decurs
PORTVERSION= 0.55.1
@@ -20,7 +16,7 @@ LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20
USE_XORG= x11
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
.include <bsd.port.pre.mk>
diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index f36c6b0ed2a2..fee71544fbc7 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -17,9 +17,8 @@ LICENSE= GPLv3
LIB_DEPENDS= Desktop:${PORTSDIR}/x11/deforaos-libdesktop
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig gettext
USE_XORG= xtst
-USE_GETTEXT= yes
MAKE_ARGS+= PREFIX=${PREFIX}
.include <bsd.port.mk>
diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile
index e537c39266c9..3a9b62e41f77 100644
--- a/x11/deforaos-libdesktop/Makefile
+++ b/x11/deforaos-libdesktop/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv3
LIB_DEPENDS= System:${PORTSDIR}/devel/deforaos-libsystem
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
MAKE_ARGS+= PREFIX=${PREFIX}
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 670e7c8b852b..5b517d5afc97 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -21,8 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:${PORTSDIR}/x11/deforaos-
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
-USE_GETTEXT= yes
+USES= pkgconfig gettext
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${MANPREFIX}/man
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index 1bc75345e29d..a451124a1783 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= keyboard:${PORTSDIR}/x11/deforaos-keyboard \
sudo:${PORTSDIR}/security/sudo
USE_GNOME= gtk20 desktopfileutils
-USE_PKGCONFIG= build
-USE_GETTEXT= yes
+USES= pkgconfig gettext
INSTALLS_ICONS= yes
MAKE_ARGS+= PREFIX=${PREFIX}
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
index df3cf471bac8..8aa630237491 100644
--- a/x11/ecore-imf/Makefile
+++ b/x11/ecore-imf/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore libtool_hack
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
index 68c9cf902a74..029ba4584dfd 100644
--- a/x11/ecore-imf_evas/Makefile
+++ b/x11/ecore-imf_evas/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore evas libtool_hack
USE_EFL_ECORE= imf
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf_evas
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/x11/ecore-input/Makefile b/x11/ecore-input/Makefile
index fc97ae34048d..b458e1ce9a44 100644
--- a/x11/ecore-input/Makefile
+++ b/x11/ecore-input/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore libtool_hack
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/x11/ecore-input_evas/Makefile b/x11/ecore-input_evas/Makefile
index 9acd260cc94b..b3b0dc78dcbe 100644
--- a/x11/ecore-input_evas/Makefile
+++ b/x11/ecore-input_evas/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore evas libtool_hack
USE_EFL_ECORE= input
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input_evas
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
index af5f1e5ed036..8ff4b9e32600 100644
--- a/x11/efreet/Makefile
+++ b/x11/efreet/Makefile
@@ -15,10 +15,9 @@ LICENSE= BSD
DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= eet eina ecore libtool_hack librt_hack
USE_EFL_ECORE= file
-USE_PKGCONFIG= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-nls
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 70ce2e052301..d3f545d1788c 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -18,7 +18,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= ${PORTNAME}.1
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 28d14a792e9f..4f1090533197 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -13,7 +13,7 @@ COMMENT= Program that keeps the content of your X clipboard in memory
LICENSE= GPLv2
USE_BZIP2= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gtk20
MAKE_JOBS_SAFE= yes
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index ffbe19424391..404447e01d69 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 0415f194f1b8..95149c54da86 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -60,10 +60,9 @@ REINPLACE_ARGS= -e 's,%%DATADIR%%,${DATADIR},1' \
SUB_FILES= pkg-message
SUB_LIST= PORTSDIR=${PORTSDIR}
-USES= cmake
+USES+= cmake pkgconfig
USE_GITHUB= yes
USE_GNOME= gconf2 gnomemenus gtk20 libwnck
-USE_PKGCONFIG= build
post-patch:
${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala \
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 2c6eb2156905..1e9ec372df30 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GRaphics Over Miscellaneous Objects (Gromit)
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
DOCS= AUTHORS ChangeLog README
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 8a97fba1473d..f7bca55e05e8 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -13,10 +13,9 @@ LICENSE= GPLv2
RUN_DEPENDS= xf86-input-synaptics>0:${PORTSDIR}/x11-drivers/xf86-input-synaptics
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gconf2 libglade2 gnomedocutils
USE_GETTEXT= yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 866226a41ae5..f5e46f0f0fb8 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -12,7 +12,7 @@ COMMENT= A simple GTK-2 terminal with tabs
USE_GNOME= vte
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= libtool
PORTDOCS= README
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 003ff531fee5..073723fad28c 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE= yes
USE_EFL= imlib2
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf
-USE_PKGCONFIG= build
+USES= pkgconfig
OPTIONS_DEFINE= SHAPE SN
SHAPE_DESC= Support of XShape extension
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index fbcb2cd27b07..54f191c1d0ae 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -48,8 +48,7 @@ USE_GNOME= glib20
USE_ICONV= yes
USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen pimlibs \
akonadi automoc4 ontologies qimageblitz soprano strigi
-USES= cmake:outsource
-USE_PKGCONFIG= build
+USES= cmake:outsource pkgconfig
USE_QT4= corelib dbus declarative designer_build gui network \
opengl phonon qtestlib script sql webkit xml \
moc_build qmake_build rcc_build uic_build
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index cc02d1883436..584fb2d3df4d 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
USE_XORG= x11 xext xrender
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
OPTIONS_DEFINE= PYTHON LUA
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index 4d34d56a41fb..d503fe9a12a3 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -13,7 +13,7 @@ COMMENT= Broadcast keystrokes to multiple X windows for Gnome2
USE_XORG= xmu
USE_GNOME= libwnck libglade2 gtk20
-USE_PKGCONFIG= yes
+USES= pkgconfig
INSTALLS_ICONS= yes
post-install:
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index 782855fb48e9..c81193330321 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -11,7 +11,7 @@ COMMENT= X Colour Management Library
LICENSE= MIT
XORG_CAT= lib
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= xfixes xmu
MAN3= Xcm.3 XcmDDC.3 XcmEdidParse.3 XcmEvents.3 XcolorProfile.3 \
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index b6198c368bbb..bf32fcdb4e63 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libmenu libutil
USE_XORG= x11
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS+=--disable-gtk-doc-html
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 877d2fd6c4b1..57926a7f50ed 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_FAM= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index e80669127072..30e674df812e 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libxfce4menu
-# Date created: 7 Oktober 2008
-# Whom: Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libxfce4menu
PORTVERSION= 4.10.0
@@ -23,7 +19,7 @@ USE_GNOME= glib20 gnomehack gtk20 intltool intlhack desktopfileutils
USE_LDCONFIG= yes
USE_XFCE= configenv libutil xfconf
INSTALLS_ICONS= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --disable-gtk-doc-html \
--with-vendor-info=FreeBSD
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 89a0fe63af0f..932ce83e7920 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libxfce4util
-# Date created: 7 June 2003
-# Whom: James Earl <jdearl@telus.net>
-#
+# Created by: James Earl <jdearl@telus.net>
# $FreeBSD$
-#
PORTNAME= libxfce4util
PORTVERSION= 4.10.0
@@ -22,7 +18,7 @@ USE_GNOME= glib20 gnomehack intltool intlhack
USE_PERL5= yes
USE_LDCONFIG= yes
USE_XFCE= configenv
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS+=--disable-gtk-doc-html
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 025652003314..a95138c8f05d 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= libglade2 vte
USE_PYTHON_BUILD= yes
USE_GETTEXT= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_AUTOTOOLS= libtool:env
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index e9026f933fa4..39da93b7004f 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -12,10 +12,9 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A fast and customizable dockbar
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= gnomeprefix gconf2 libwnck
USE_WX= 2.8
-USE_PKGCONFIG= yes
WX_CONF_ARGS= absolute
WRKSRC= ${WRKDIR}/trunk
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index ad784dfeaafe..739e6fcf859b 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -22,9 +22,8 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
xcb:${PORTSDIR}/x11/libxcb \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
-USES= cmake
+USES= cmake pkgconfig
USE_XORG= ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt
-USE_PKGCONFIG= build
USE_RC_SUBR= slim
SUB_FILES= pkg-message
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index c5cf41e35d18..120b7b9bf73f 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wmblob
-# Date created: Thu Feb 6 12:24:23 MSK 2003
-# Whom: Denis Shaposhnikov <dsh@vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh@vlink.ru>
# $FreeBSD$
-#
PORTNAME= wmblob
PORTVERSION= 1.0.3
@@ -17,7 +13,7 @@ COMMENT= Showing moving blobs
USE_XORG= xpm
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
MAN1= wmblob.1
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index dbba3d0e255e..5447c13e0a95 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: wmDrawer
-# Date created: Apr 6, 2003
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= wmdrawer
PORTVERSION= 0.10.5
@@ -21,7 +16,7 @@ COMMENT= A dockapp which provides a drawer to launch applications
USE_GNOME= gdkpixbuf
USE_GMAKE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ENV+= DOCSDIR=${DOCSDIR}
MAKE_ENV+= ${CONFIGURE_ENV}
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 6f982cfd09c6..9a9ca2c7f0a6 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -23,8 +23,7 @@ DESKTOP_ENTRIES= "Workrave" "RSI prevention tool" \
false
USE_XORG= x11 xmu recordproto xtst xext
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomeprefix intlhack gconf2 intltool
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index db2bd3f61248..e57cc34d6c5b 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 intltool intlhack glib20 desktopfileutils
USE_XFCE= configenv libexo libmenu libutil panel xfconf
USE_XORG= xtst
-USE_PKGCONFIG= build
+USES= pkgconfig
INSTALLS_ICONS= yes
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 8c3af5b5d309..89e98a1a17dc 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfce4-conf
-# Date created: 28 August 2008
-# Whom: Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xfce4-conf
PORTVERSION= 4.10.0
@@ -27,7 +23,7 @@ USE_LDCONFIG= yes
USE_PERL5_BUILD= yes
USE_XFCE= configenv libutil
USE_XORG= x11
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS+=--disable-gtk-doc-html
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index abe2873d72dd..0faf8e938f68 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -1,6 +1,5 @@
# Created by: Martin Wilke (miwi@FreeBSD.org)
# $FreeBSD$
-#
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.8.1
@@ -22,7 +21,7 @@ USE_GMAKE= yes
INSTALLS_ICONS= yes
USE_GNOME= glib20 gtk20 intltool intlhack
USE_XFCE= configenv libexo libmenu libutil panel
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= xfce4-screenshooter.1
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 21dbc448131a..9fdeb9e0c27e 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= gnomehack gtk20 glib20 intltool intlhack vte \
libxml2 desktopfileutils
USE_XFCE= configenv libmenu
USE_XORG= x11
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --without-gnome-default-appsdir
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 6013f3472a0f..de313a3ecba8 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 intltool intlhack
USE_XFCE= configenv panel libexo libgui libutil
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --disable-debug
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index cc00e6b9c5bc..f5ddfe14799a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes
CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_XORG= xpm
USE_GL= yes
USE_GMAKE= yes
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index fd97d140606c..918086f7ba8f 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: xvattr
-# Date created: Jan 15, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= xvattr
PORTVERSION= 1.3
@@ -21,7 +16,7 @@ GTK1_DESC= GTK1 support (Default is GTK2)
USE_XORG= x11 xv
WANT_GNOME= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME} bin/g${PORTNAME}
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0