aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES15
-rw-r--r--Mk/bsd.gnome.mk6
-rw-r--r--Mk/bsd.port.mk21
-rw-r--r--UPDATING10
-rw-r--r--archivers/libcomprex/Makefile2
-rw-r--r--archivers/py-liblzma/Makefile3
-rw-r--r--astro/cfitsio/Makefile2
-rw-r--r--audio/ardour/Makefile4
-rw-r--r--audio/gogglesmm/Makefile2
-rw-r--r--audio/libbs2b/Makefile2
-rw-r--r--audio/libmtp/Makefile3
-rw-r--r--audio/libsidplay2/Makefile3
-rw-r--r--audio/lv2core/Makefile3
-rw-r--r--audio/opus-tools/Makefile3
-rw-r--r--audio/sidplay2/Makefile1
-rw-r--r--audio/slv2/Makefile4
-rw-r--r--cad/adms/Makefile3
-rw-r--r--chinese/sunpinyin/Makefile2
-rw-r--r--comms/cwdaemon/Makefile2
-rw-r--r--comms/qtel/Makefile2
-rw-r--r--comms/tilp2/Makefile2
-rw-r--r--converters/gbase/Makefile3
-rw-r--r--databases/animenfo-client-gtk/Makefile3
-rw-r--r--databases/dbh10/Makefile3
-rw-r--r--databases/hk_classes/Makefile4
-rw-r--r--databases/mysqlcppapi/Makefile3
-rw-r--r--databases/sqlite2/Makefile3
-rw-r--r--devel/Makefile2
-rw-r--r--devel/ace/Makefile3
-rw-r--r--devel/bufferpool/Makefile3
-rw-r--r--devel/clanlib/Makefile2
-rw-r--r--devel/compiz-bcop/Makefile2
-rw-r--r--devel/dotconf/Makefile3
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config70
-rw-r--r--devel/jclassinfo/Makefile3
-rw-r--r--devel/libYGP/Makefile2
-rw-r--r--devel/libassa/Makefile3
-rw-r--r--devel/libcwd/Makefile3
-rw-r--r--devel/liblouisxml/Makefile2
-rw-r--r--devel/monotone/Makefile5
-rw-r--r--devel/pkgconf/Makefile58
-rw-r--r--devel/pkgconf/distinfo4
-rw-r--r--devel/pkgconf/pkg-descr12
-rw-r--r--devel/pkgconf/pkg-plist6
-rw-r--r--devel/py-fusefs/Makefile2
-rw-r--r--devel/ros/Makefile3
-rw-r--r--devel/rpc2/Makefile2
-rw-r--r--devel/rudiments/Makefile3
-rw-r--r--devel/rvm/Makefile2
-rw-r--r--devel/valgrind-snapshot/Makefile3
-rw-r--r--devel/valgrind/Makefile3
-rw-r--r--devel/vstr/Makefile3
-rw-r--r--devel/wininfo/Makefile3
-rw-r--r--devel/zziplib/Makefile4
-rw-r--r--dns/dnsmasq/Makefile4
-rw-r--r--emulators/vice/Makefile6
-rw-r--r--finance/opentaxsolver/Makefile2
-rw-r--r--ftp/pureadmin/Makefile3
-rw-r--r--ftp/wzdftpd/Makefile3
-rw-r--r--games/alienarena/Makefile2
-rw-r--r--games/ioquake3/Makefile3
-rw-r--r--games/libfov/Makefile3
-rw-r--r--games/pets/Makefile3
-rw-r--r--games/poker-engine/Makefile4
-rw-r--r--games/poker-eval/Makefile3
-rw-r--r--games/py-poker-eval/Makefile2
-rw-r--r--games/stonesoup/Makefile2
-rw-r--r--games/warzone2100/files/patch-configure22
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/agg/Makefile2
-rw-r--r--graphics/djview4/Makefile2
-rw-r--r--graphics/fv/Makefile2
-rw-r--r--graphics/gexiv2/Makefile4
-rw-r--r--graphics/giblib/Makefile3
-rw-r--r--graphics/grafx2/Makefile2
-rw-r--r--graphics/gsnapshot/Makefile3
-rw-r--r--graphics/libvisual/Makefile3
-rw-r--r--graphics/pngwriter/Makefile3
-rw-r--r--graphics/pstoedit/Makefile2
-rw-r--r--graphics/rawtherapee/Makefile2
-rw-r--r--graphics/sswf/Makefile2
-rw-r--r--graphics/swftools/Makefile2
-rw-r--r--graphics/tif22pnm/Makefile3
-rw-r--r--japanese/ochusha/Makefile3
-rw-r--r--java/icedtea-web/Makefile5
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--mail/firetray/Makefile5
-rw-r--r--math/freemat/Makefile2
-rw-r--r--misc/linm/Makefile3
-rw-r--r--misc/mc-light/Makefile2
-rw-r--r--misc/mc/Makefile3
-rw-r--r--multimedia/aegisub/Makefile2
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile4
-rw-r--r--multimedia/handbrake/Makefile4
-rw-r--r--multimedia/libkate/Makefile3
-rw-r--r--multimedia/sabbu/Makefile2
-rw-r--r--net-im/climm/Makefile2
-rw-r--r--net-im/libjingle/Makefile2
-rw-r--r--net-im/mbpurple/Makefile4
-rw-r--r--net-mgmt/bwm-ng/Makefile2
-rw-r--r--net-mgmt/collectd/Makefile2
-rw-r--r--net-mgmt/collectd5/Makefile2
-rw-r--r--net-p2p/gkremldk/Makefile2
-rw-r--r--net/coda6_server/Makefile1
-rw-r--r--net/freeswitch-core-devel/Makefile2
-rw-r--r--net/freeswitch-core/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/netembryo/Makefile3
-rw-r--r--net/radvd/Makefile2
-rw-r--r--net/samba34/Makefile4
-rw-r--r--net/samba35/Makefile4
-rw-r--r--net/samba36/Makefile4
-rw-r--r--net/tapidbus/Makefile2
-rw-r--r--print/cups-base/Makefile3
-rw-r--r--print/gnomephotoprinter/Makefile4
-rw-r--r--print/libijs/Makefile3
-rw-r--r--print/panda/Makefile2
-rw-r--r--security/libotr/Makefile2
-rw-r--r--security/openvas-libraries/Makefile2
-rw-r--r--security/suricata/Makefile4
-rw-r--r--security/trousers/Makefile3
-rw-r--r--security/xmlsec1/Makefile2
-rw-r--r--sysutils/archivemount/Makefile1
-rw-r--r--sysutils/etoile-system/Makefile2
-rw-r--r--sysutils/fusefs-afuse/Makefile2
-rw-r--r--sysutils/fusefs-libs/Makefile3
-rw-r--r--sysutils/fusefs-ntfs/Makefile1
-rw-r--r--sysutils/hardlink/Makefile2
-rw-r--r--sysutils/iextract/Makefile1
-rw-r--r--sysutils/moosefs-client/Makefile5
-rw-r--r--sysutils/netdump-server/Makefile3
-rw-r--r--sysutils/nut22/Makefile3
-rw-r--r--sysutils/rsyslog5-relp/Makefile2
-rw-r--r--sysutils/rsyslog5-rfc3195/Makefile3
-rw-r--r--sysutils/rsyslog6-devel-relp/Makefile3
-rw-r--r--sysutils/rsyslog6-devel-rfc3195/Makefile3
-rw-r--r--sysutils/xfburn/Makefile2
-rw-r--r--textproc/gmetadom/Makefile2
-rw-r--r--textproc/libmrss/Makefile2
-rw-r--r--textproc/scim-openvanilla/Makefile4
-rw-r--r--textproc/soothsayer/Makefile4
-rw-r--r--textproc/xmlwrapp/Makefile2
-rw-r--r--www/apache20/Makefile2
-rw-r--r--www/httpsqs/Makefile3
-rw-r--r--www/lighttpd/Makefile2
-rw-r--r--www/openvrml/Makefile4
-rw-r--r--x11-clocks/buici-clock/Makefile2
-rw-r--r--x11-fm/tdfsb/Makefile2
-rw-r--r--x11-toolkits/fltk2/Makefile2
-rw-r--r--x11-toolkits/fxscintilla/Makefile2
-rw-r--r--x11-toolkits/py-sexy/Makefile2
-rw-r--r--x11-wm/skippy-xd/Makefile4
-rw-r--r--x11-wm/skippy/Makefile3
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11/keyboardcast/Makefile3
-rw-r--r--x11/simdock/Makefile3
157 files changed, 404 insertions, 216 deletions
diff --git a/CHANGES b/CHANGES
index ad010e4fbc22..db2415b0826c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,21 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20120726:
+AUTHOR: bapt@FreeBSD.org
+
+ * new macro USE_PKGCONFIG has been introduce in place of
+ USE_GNOME= pkgconfig
+
+ USE_PKGCONFIG= yes and USE_PKGCONFIG= build
+ for build only dependency
+
+ USE_PKGCONFIG= run
+ for run only dependency
+
+ USE_PKGCONFIG= both
+ for both build and run dependency
+
20120715:
AUTHOR: beat@FreeBSD.org
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index b9691150069e..3ea508bb274f 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -446,9 +446,9 @@ gtksourceview2_LIB_DEPENDS= gtksourceview-2.0.0:${PORTSDIR}/x11-toolkits/gtksour
gtksourceview2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
-pkgconfig_DETECT= ${LOCALBASE}/bin/pkg-config
-pkgconfig_BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+pkgconfig_DETECT= ${LOCALBASE}/bin/pkgconf
+pkgconfig_BUILD_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf
+pkgconfig_RUN_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf
libgsf_LIB_DEPENDS= gsf-1.114:${PORTSDIR}/devel/libgsf
libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index c065cf2608b7..afc2f22cfe55 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -530,6 +530,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
#
# USE_NCURSES - If set, this port relies on the ncurses package.
#
+# USE_PKGCONFIG - Implies that the port uses pkg-config in one way or another:
+# 'build', 'run', 'both', implying build,
+# runtime, and both build/run dependencies
+#
# Conflict checking. Use if your port cannot be installed at the same time as
# another package.
#
@@ -1639,6 +1643,23 @@ EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself
BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
CONFIGURE_ENV+= MAKE=${GMAKE}
.endif
+.if defined(USE_PKGCONFIG)
+.if ${USE_PKGCONFIG:L} == yes
+USE_PKGCONFIG= build
+.endif
+.if ${USE_PKGCONFIG:L} == run
+RUN_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf
+.endif
+.if ${USE_PKGCONFIG:L} == build
+BUILD_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf
+CONFIGURE_ENV+= PKG_CONFIG=pkgconf
+.endif
+.if ${USE_PKGCONFIG:L} == both
+RUN_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf
+BUILD_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf
+CONFIGURE_ENV+= PKG_CONFIG=pkgconf
+.endif
+.endif
.if defined(USE_GCC) || defined(USE_FORTRAN)
.include "${PORTSDIR}/Mk/bsd.gcc.mk"
diff --git a/UPDATING b/UPDATING
index 799d8d84c80f..69c1b7b5c444 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20120726:
+ AFFECTS: users of devel/pkg-config
+ AUTHOR: bapt@FreeBSD.org
+
+ devel/pkg-config has been replaced by devel/pkgconf
+
+ # portmaster -o devel/pkg-config devel/pkgconf
+ or
+ # portupgrade -o devel/pkg-config devel/pkgconf
+
20120725:
AFFECTS: users of chinese/fcitx
AUTHOR: lichray@gmail.com
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 22336150f433..23a5da8f641a 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -17,7 +17,7 @@ COMMENT= Transparently handles automatic compression and decompression of files
LICENSE= LGPL21
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
#LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
OPTIONS_DEFINE= NLS
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index fa7c06208a91..2af0b0abc1c4 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -16,8 +16,7 @@ DISTNAME= ${PYDISTUTILS_PKGNAME}-${PORTVERSION}
MAINTAINER= naylor.b.david@gmail.com
COMMENT= Python binding for the LZMA compression library
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
+USE_PKGCONFIG= yes
USE_BZIP2= yes
USE_PYTHON= 2.6+
USE_PYDISTUTILS=yes
diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile
index 65056791ebc5..d52ee26c409a 100644
--- a/astro/cfitsio/Makefile
+++ b/astro/cfitsio/Makefile
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for reading and writing files in FITS data format
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= f2c:${PORTSDIR}/lang/f2c
OPTIONS_DEFINE= DOCS
@@ -26,6 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= ac_cv_prog_FC="f2c"
ALL_TARGET= shared
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
.include <bsd.port.options.mk>
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index ba4bb5037336..6bb54065382a 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -98,7 +98,9 @@ SCONS_ENV+= FPU_OPTIMIZATION=0
CFLAGS:= ${CFLAGS:N-fno-strict-aliasing}
post-patch:
- ${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/SConstruct
+ ${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" \
+ -e "s|soundtouch-1.4|soundtouch-1.6|g" \
+ ${WRKSRC}/SConstruct
${REINPLACE_CMD} -e "s|alsa_pcm|oss|g" ${WRKSRC}/templates/*.template
post-install:
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 6b2afc5c30df..5fef9cfdd9b3 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -16,7 +16,6 @@ COMMENT= Music collection manager and player
LICENSE= GPLv3
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \
tag.1:${PORTSDIR}/audio/taglib \
sqlite3.8:${PORTSDIR}/databases/sqlite3
@@ -35,6 +34,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --mandir=${PREFIX}/man --prefix=${PREFIX}
MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_XZ= yes
INSTALLS_ICONS= yes
MAN1= gogglesmm.1
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index b9d15d2328f9..38a13f51418e 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF/bs2b/bs2b/${PORTVERSION}
MAINTAINER= liangtai.s4@gmail.com
COMMENT= Bauer Stereophonic-to-Binaural DSP
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \
ogg:${PORTSDIR}/audio/libogg \
FLAC:${PORTSDIR}/audio/flac \
@@ -23,6 +22,7 @@ LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= CFLAGS=`pkg-config --cflags sndfile` \
LDFLAGS=`pkg-config --libs-only-L sndfile`
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index 6dd23d2d8993..0b8b7825e45f 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -16,8 +16,6 @@ COMMENT= Media Transfer Protocol (MTP) library
LICENSE= LGPL21
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
OPTIONS_DEFINE= MTPZ
OPTIONS_DEFAULT= MTPZ
MTPZ_DESC= Enable functionality to connect to MTPZ devices
@@ -26,6 +24,7 @@ USE_GNOME= gnomehack
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 68eaa971767c..4c68292f68d1 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -15,11 +15,10 @@ DISTNAME= sidplay-libs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to play Commodore 64 SID-tunes cycle accurate
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
+USE_PKGCONFIG= yes
LIBTOOLFILES= builders/hardsid-builder/configure \
builders/resid-builder/configure \
libsidplay/configure \
diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile
index 2a3a6a5d738e..f59d1a4fc572 100644
--- a/audio/lv2core/Makefile
+++ b/audio/lv2core/Makefile
@@ -16,10 +16,9 @@ COMMENT= LV2 Core Package
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_BZIP2= yes
USE_PYTHON_BUILD= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index a8682d525024..c25d70321070 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -17,9 +17,8 @@ COMMENT= Encode, inspect, and decode Opus files
LIB_DEPENDS= ogg.8:${PORTSDIR}/audio/libogg \
opus:${PORTSDIR}/audio/opus
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/opusdec bin/opusenc bin/opusinfo
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
index ee07cda1341e..f1f2beab1ca6 100644
--- a/audio/sidplay2/Makefile
+++ b/audio/sidplay2/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS= sidplay2.1:${PORTSDIR}/audio/libsidplay2
MAN1= sidplay2.1
PLIST_FILES= bin/sidplay2
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 046c2b8b4f5f..73e47281901b 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -16,14 +16,14 @@ COMMENT= LV2 Application Support Library
LICENSE= GPLv2 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \
rdf.0:${PORTSDIR}/textproc/redland
USE_BZIP2= yes
USE_PYTHON_BUILD= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/cad/adms/Makefile b/cad/adms/Makefile
index 5a337d617219..11292cf261da 100644
--- a/cad/adms/Makefile
+++ b/cad/adms/Makefile
@@ -18,11 +18,10 @@ COMMENT= A model generator for SPICE simulators
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= glib20
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile
index dc7315a01664..4d7c8de35dcc 100644
--- a/chinese/sunpinyin/Makefile
+++ b/chinese/sunpinyin/Makefile
@@ -22,7 +22,6 @@ LICENSE= LGPL21 CDDL
LICENSE_COMB= dual
LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE
LICENSE_FILE_CDDL= ${WRKSRC}/OPENSOLARIS.LICENSE
@@ -31,6 +30,7 @@ USE_XZ= yes
USE_SCONS= yes
SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GMAKE= yes
post-patch:
diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile
index 9424a318b765..6bd588051f7a 100644
--- a/comms/cwdaemon/Makefile
+++ b/comms/cwdaemon/Makefile
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= db
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio cw (Morse code) keyer daemon
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= cw:${PORTSDIR}/comms/unixcw
INSTALL_TARGET= install-exec
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/doc
MAN8= cwdaemon.8
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index c2887a769b37..fe40c589d064 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -15,7 +15,6 @@ DISTNAME= svxlink-${PORTVERSION}
MAINTAINER= shurd@sasktel.net
COMMENT= Qt EchoLink Client and SvrLink audio server
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= sigc-1.2:${PORTSDIR}/devel/libsigc++12 \
speex:${PORTSDIR}/audio/speex \
gcrypt:${PORTSDIR}/security/libgcrypt \
@@ -39,6 +38,7 @@ MANCOMPRESSED= yes
USE_GMAKE= yes
USE_QT_VER= 3
USE_TCL= yes
+USE_PKGCONFIG= yes
USE_RC_SUBR= svxlink remotetrx
USE_LDCONFIG= ${LOCALBASE}/lib ${LOCALBASE}/lib/svxlink
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 9a05cd544b6f..6934d6f2e408 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -16,7 +16,6 @@ COMMENT= TI Linking Program
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= ticables2.5:${PORTSDIR}/comms/libticables2 \
tifiles2.8:${PORTSDIR}/devel/libtifiles2 \
ticalcs2.10:${PORTSDIR}/comms/libticalcs2 \
@@ -25,6 +24,7 @@ LIB_DEPENDS= ticables2.5:${PORTSDIR}/comms/libticables2 \
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_GNOME= gtk20 libglade2
.if !defined(WITHOUT_NLS)
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 50ee215a10d6..91762c9615f1 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -16,11 +16,10 @@ COMMENT= A program to convert between the 4 common bases used in programming
LICENSE= ART10
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
OPTIONS_DEFINE= GTK2
PLIST_FILES= bin/${PORTNAME}
+USE_PKGCONFIG= yes
.include <bsd.port.options.mk>
diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile
index da960cdd1805..0aa4ef984fd8 100644
--- a/databases/animenfo-client-gtk/Makefile
+++ b/databases/animenfo-client-gtk/Makefile
@@ -17,13 +17,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dinoex@FreeBSD.org
COMMENT= AnimeNfo client with GTK support
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
LICENSE= GPLv2
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gtk20
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
CFLAGS+= ${CPPFLAGS}
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 4df6e1bcc7ec..53dfc9d6ccc9 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -17,12 +17,11 @@ COMMENT= Disk Based Hashtables
CONFLICTS= dbh-[2-9]*
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
LATEST_LINK= dbh10
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 1852a8cf14b4..ed4f5de3759c 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES= SF/hk-classes/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Library for rapid development of database applications
-BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
xml2.5:${PORTSDIR}/textproc/libxml2
@@ -21,6 +20,7 @@ USE_BZIP2= yes
USE_ICONV= yes
USE_PYTHON= yes
USE_GETTEXT= yes
+USE_PKGCONFIG= yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
USE_AUTOTOOLS= libtool
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index f5ea81d20756..c55eb42ab75c 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fork of mysql++ C++ API for MySQL
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GNOME= gnomehack
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 7c4386d65f5b..3539d91d7dd4 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -15,11 +15,10 @@ MASTER_SITES= http://www.sqlite.org/
MAINTAINER= ports@FreeBSD.org
COMMENT= An SQL database engine in a C library
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GMAKE= YES
USE_AUTOTOOLS= libtool
USE_LDCONFIG= YES
+USE_PKGCONFIG= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
diff --git a/devel/Makefile b/devel/Makefile
index 54c8e52b1795..e3e7994478c4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3070,7 +3070,7 @@
SUBDIR += pipestatus
SUBDIR += pire
SUBDIR += pit
- SUBDIR += pkg-config
+ SUBDIR += pkgconf
SUBDIR += plan9port
SUBDIR += pmd
SUBDIR += pmk
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index 1d8f036a4f24..1f4f4a662569 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -15,8 +15,6 @@ DISTNAME= ACE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= The Adaptive Communication Environment for C++
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
OPTIONS_DEFINE= SSL TRIO X11 FLTK TK QT4
OPTIONS_DEFAULT=SSL
TRIO_DESC= Enable trio support
@@ -34,6 +32,7 @@ MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \
CROSS-COMPILE=1
MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/bufferpool/Makefile b/devel/bufferpool/Makefile
index b533dc7c195e..597f7300f4fa 100644
--- a/devel/bufferpool/Makefile
+++ b/devel/bufferpool/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES= http://lscube.org/files/downloads/bufferpool/
MAINTAINER= ports@FreeBSD.org
COMMENT= Bufferpool - the memory management library Feng and Felix depend upon
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GNOME= gnomehack
.include <bsd.port.mk>
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 8ca3a8a7f611..51d0f40977b8 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -18,7 +18,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform game SDK
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
mikmod:${PORTSDIR}/audio/libmikmod \
@@ -36,6 +35,7 @@ USE_GNOME= gnomehack
USE_LDCONFIG= yes
USE_SDL= gfx
USE_GL= yes
+USE_PKGCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index 84782567dda8..34807ccf6776 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Code generator for Compiz Fusion Plugins
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
@@ -21,6 +20,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= libxslt
+USE_PKGCONFIG= yes
post-patch:
@${REINPLACE_CMD} \
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 981fcdedbd51..8b44ccc1e5c4 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -16,9 +16,8 @@ COMMENT= A simple, powerful configuration-file parser
LICENSE= LGPL21
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 7d7b840672a3..92bd2df9068b 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-common
PORTVERSION= 2.28.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
new file mode 100644
index 000000000000..877b592e85dc
--- /dev/null
+++ b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
@@ -0,0 +1,70 @@
+https://bugs.gentoo.org/show_bug.cgi?id=427432
+https://bugzilla.gnome.org/show_bug.cgi?id=680363
+
+--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200
++++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200
+@@ -77,6 +77,7 @@
+ vc_min_version=$4
+ vc_source=$5
+ vc_status=1
++ vc_option="--version"
+
+ vc_checkprog=`eval echo "\\$$vc_variable"`
+ if [ -n "$vc_checkprog" ]; then
+@@ -89,11 +90,19 @@
+ else
+ vc_comparator=">="
+ fi
++ # The most reliable way to check pkg-config version is to query the actual
++ # virtual
++ # pkg-config package entry's modversion. This works in all known
++ # implementations.
++
++ if test "x$vc_package" = "xpkg-config"; then
++ vc_option="--modversion pkg-config"
++ fi
+ printbold "checking for $vc_package $vc_comparator $vc_min_version..."
+ for vc_checkprog in $vc_checkprogs; do
+ echo $ECHO_N " testing $vc_checkprog... " $ECHO_C
+- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
+- vc_actual_version=`$vc_checkprog --version | head -n 1 | \
++ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then
++ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \
+ sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'`
+ if compare_versions $vc_min_version $vc_actual_version; then
+ echo "found $vc_actual_version"
+https://bugs.gentoo.org/show_bug.cgi?id=427432
+https://bugzilla.gnome.org/show_bug.cgi?id=680363
+
+--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200
++++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200
+@@ -77,6 +77,7 @@
+ vc_min_version=$4
+ vc_source=$5
+ vc_status=1
++ vc_option="--version"
+
+ vc_checkprog=`eval echo "\\$$vc_variable"`
+ if [ -n "$vc_checkprog" ]; then
+@@ -89,11 +90,19 @@
+ else
+ vc_comparator=">="
+ fi
++ # The most reliable way to check pkg-config version is to query the actual
++ # virtual
++ # pkg-config package entry's modversion. This works in all known
++ # implementations.
++
++ if test "x$vc_package" = "xpkg-config"; then
++ vc_option="--modversion pkg-config"
++ fi
+ printbold "checking for $vc_package $vc_comparator $vc_min_version..."
+ for vc_checkprog in $vc_checkprogs; do
+ echo $ECHO_N " testing $vc_checkprog... " $ECHO_C
+- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
+- vc_actual_version=`$vc_checkprog --version | head -n 1 | \
++ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then
++ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \
+ sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'`
+ if compare_versions $vc_min_version $vc_actual_version; then
+ echo "found $vc_actual_version"
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index f6b88adedb47..3374f0f8d017 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Shows information about Java class, dependencies, and more
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAN1= jclassinfo.1
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 348e218b1d14..14dd28b12b2b 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -15,7 +15,6 @@ DISTNAME= libYGP-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet another General Purpose library
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
boost_filesystem:${PORTSDIR}/devel/boost-libs
@@ -23,6 +22,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GETTEXT= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-gmp\
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 35b3a1e9e221..dbfadc796d8e 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -16,11 +16,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.([[:digit:]])$/-\1/}
MAINTAINER= ports@FreeBSD.org
COMMENT= An C++ networking library and application framework
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
PLIST_SUB= ASSA_VERSION=${PORTVERSION:R:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/(\.[[:digit:]])$//}
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 2d4a13f88866..0732dc64362e 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= The C++ Debugging Support Library
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-alloc --disable-location --disable-threading \
--disable-pch
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index b309177c9ca8..173ae8479ccd 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -11,13 +11,13 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= wenheping@gmail.com
COMMENT= Library Provide Complete Braille Transcription Services
-BUILD_DEPENDS= ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= louis.2:${PORTSDIR}/devel/liblouis \
xml2.5:${PORTSDIR}/textproc/libxml2
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
INFO= liblouisxml-guide
MAN1= msword2brl.1 xml2brl.1
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 1d791c1f245b..7b02f5b32f40 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -90,6 +90,11 @@ post-patch:
${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
.endif
+ ${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \
+ -e "s/\"idn/\"libidn/g" \
+ -e "s/\"pcre/\"libpcre/g" \
+ -e "s/\"botan/\"botan-1.8/g" \
+ ${WRKSRC}/configure
post-install:
${MKDIR} ${PREFIX}/share/zsh/site-functions
diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
new file mode 100644
index 000000000000..9326504b1ec9
--- /dev/null
+++ b/devel/pkgconf/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for: pkgconf
+# Date created: 2012-07-22
+# Whom: Baptiste Daroussin <bapt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= pkgconf
+PORTVERSION= 0.8.3
+CATEGORIES= devel
+MASTER_SITES= http://nenolod.net/~nenolod/distfiles/
+
+MAINTAINER= bapt@FreeBSD.org
+COMMENT= pkg-config compatible utility which does not depend on glib
+
+LICENSE= BSD
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig \
+ --with-system-libdir=/usr/lib \
+ --with-system-includedir=/usr/include
+USE_BZIP2= yes
+
+CONFLICTS_INSTALL= pkg-config-*
+
+post-install:
+ ${LN} -sf ${PREFIX}/bin/pkgconf ${PREFIX}/bin/pkg-config
+
+.include <bsd.port.mk>
+# New ports collection makefile for: pkgconf
+# Date created: 2012-07-22
+# Whom: Baptiste Daroussin <bapt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= pkgconf
+PORTVERSION= 0.8.3
+CATEGORIES= devel
+MASTER_SITES= http://nenolod.net/~nenolod/distfiles/
+
+MAINTAINER= bapt@FreeBSD.org
+COMMENT= pkg-config compatible utility which does not depend on glib
+
+LICENSE= BSD
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig \
+ --with-system-libdir=/usr/lib \
+ --with-system-includedir=/usr/include
+USE_BZIP2= yes
+
+CONFLICTS_INSTALL= pkg-config-*
+
+post-install:
+ ${LN} -sf ${PREFIX}/bin/pkgconf ${PREFIX}/bin/pkg-config
+
+.include <bsd.port.mk>
diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo
new file mode 100644
index 000000000000..eb4346ccd4c9
--- /dev/null
+++ b/devel/pkgconf/distinfo
@@ -0,0 +1,4 @@
+SHA256 (pkgconf-0.8.3.tar.bz2) = befb1b11a4845514248c69fd6dc3e991603fbd1acbbcb6db76bd5e30c657b8b1
+SIZE (pkgconf-0.8.3.tar.bz2) = 80112
+SHA256 (pkgconf-0.8.3.tar.bz2) = befb1b11a4845514248c69fd6dc3e991603fbd1acbbcb6db76bd5e30c657b8b1
+SIZE (pkgconf-0.8.3.tar.bz2) = 80112
diff --git a/devel/pkgconf/pkg-descr b/devel/pkgconf/pkg-descr
new file mode 100644
index 000000000000..fa913ccd8690
--- /dev/null
+++ b/devel/pkgconf/pkg-descr
@@ -0,0 +1,12 @@
+pkgconf is a program which helps to configure compiler and linker flags for
+development frameworks. It is similar to pkg-config, but was written from
+scratch in Summer of 2011 to replace pkg-config, which now needs itself to build
+itself.
+
+WWW: https://github.com/pkgconf/pkgconf
+pkgconf is a program which helps to configure compiler and linker flags for
+development frameworks. It is similar to pkg-config, but was written from
+scratch in Summer of 2011 to replace pkg-config, which now needs itself to build
+itself.
+
+WWW: https://github.com/pkgconf/pkgconf
diff --git a/devel/pkgconf/pkg-plist b/devel/pkgconf/pkg-plist
new file mode 100644
index 000000000000..80939d7110a4
--- /dev/null
+++ b/devel/pkgconf/pkg-plist
@@ -0,0 +1,6 @@
+bin/pkgconf
+bin/pkg-config
+share/aclocal/pkg.m4
+bin/pkgconf
+bin/pkg-config
+share/aclocal/pkg.m4
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 1d9257bb60e5..afbecc59769a 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -15,10 +15,10 @@ DISTNAME= fuse-python-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE Python bindings
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs
USE_PYTHON= yes
+USE_PKGCONFIG= yes
USE_PYDISTUTILS=easy_install
USE_ICONV= yes
PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \
diff --git a/devel/ros/Makefile b/devel/ros/Makefile
index 4463a27e2ec5..49c6ebebdc62 100644
--- a/devel/ros/Makefile
+++ b/devel/ros/Makefile
@@ -17,8 +17,6 @@ LICENSE= BSD
STACKNAME= ${PORTNAME:S/ros-//}
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
CFLAGS+= -I${LOCALBASE}/include
LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \
gtest:${PORTSDIR}/devel/googletest
@@ -37,6 +35,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml \
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
# rosmake does its own threading
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 35ecdd4c7cf7..408848a738b8 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -16,10 +16,10 @@ MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= An interprocess communication library
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
USE_GMAKE= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 1158dcdf5123..45229c1dddcb 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -15,10 +15,9 @@ COMMENT= A utility C++ class library for daemons, clients, servers, and more
LICENSE= LGPL20
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_OPENSSL= yes
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
PTHREADLIB="${PTHREAD_LIBS}"
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index d9b9b82420cc..b57a9491f454 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -16,12 +16,12 @@ MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A persistent VM library
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile
index d87df5dca3e3..4ec65bb76f08 100644
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@@ -18,13 +18,12 @@ COMMENT= A (memory) debugging and profiling tool
CONFLICTS= valgrind-[0-9]*
LATEST_LINK= valgrind-snapshot
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index e3e52c89d897..3fa3c06af927 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -19,8 +19,6 @@ CONFLICTS= valgrind-snapshot-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
OPTIONS_DEFINE= MPI
MPI_DESC= Enable build of MPI wrappers
@@ -30,6 +28,7 @@ USE_GNOME= gnomehack
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index c521a0ae040c..770dbedd3e05 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -16,8 +16,6 @@ MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= General purpose string library for C
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
@@ -25,6 +23,7 @@ USE_GMAKE= yes
USE_CSTD= gnu89
USE_GNOME= gnomehack
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAN3= vstr.3 vstr_const.3
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index b605d2cbc1b7..9c97d0a8825b 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -14,12 +14,11 @@ MASTER_SITES= http://www.freedesktop.org/software/wininfo/
MAINTAINER= ports@FreeBSD.org
COMMENT= A window information utility
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \
xcomposite x11 xres
USE_GNOME= gtk20 gnomeprefix
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index bc6b77330ada..3fd537b0b455 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -16,8 +16,7 @@ COMMENT= A library to provide transparent read access to zipped files
LICENSE= LGPL21 MPL
LICENSE_COMB= dual
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
OPTIONS_DEFINE= SDL
@@ -25,6 +24,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack
USE_PYTHON_BUILD= yes
USE_AUTOTOOLS= libtool
+USE_PKGCONFIG= yes
CONFIGURE_ENV= ac_cv_path_XMLTO=":"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 2ca44538d706..9c66f98caa72 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -46,7 +46,7 @@ CFLAGS+= -DNO_IPV6
.endif
.if ${PORT_OPTIONS:MNLS}
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
PLIST_SUB+= NLS=""
ALL_TARGET= all-i18n
@@ -62,7 +62,7 @@ LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
.if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
CFLAGS+= -DHAVE_DBUS
.endif
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index c538374ebfb2..87d6e0dae18b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -17,8 +17,7 @@ COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- pkg-config:${PORTSDIR}/devel/pkg-config
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
gif:${PORTSDIR}/graphics/giflib \
mp3lame:${PORTSDIR}/audio/lame
@@ -32,6 +31,7 @@ LICENSE= GPLv2
USE_XORG= xpm ice sm xext xv xt x11 xmu
USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
USE_GMAKE= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
MAKE_ENV+= MAKEINFOFLAGS="--no-split"
@@ -55,8 +55,6 @@ USE_XORG+= xaw
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+= PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 --disable-dependency-tracking
MAN1= vice.1 c1541.1 petcat.1
MLINKS= vice.1 x64.1 \
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 16a2f07760bd..b2cf9e958bff 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -24,7 +24,7 @@ UPPORTNAME= OpenTaxSolver
.if !defined(WITHOUT_X11)
USE_GL= yes
USE_XORG= xmu xext x11
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
CPPFLAGS+= $$(pkg-config --cflags-only-I glu xext xmu)
LDFLAGS+= $$(pkg-config --libs-only-L glu xext xmu)
SUB_LIST+= X11=
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 270b427de160..d8943c847f35 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -15,9 +15,8 @@ MASTER_SITES= SF/purify/Default/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Management utility for the PureFTPd
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack libglade2
+USE_PKGCONFIG= yes
USE_FAM= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index f7b228c66940..f63835478fdd 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-0.8
MAINTAINER= ports@FreeBSD.org
COMMENT= Modular FTP server configurable online using SITE commands
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
USE_RC_SUBR= wzdftpd.sh
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GNOME= ltverhack
CONFIGURE_ARGS+= --without-pam --disable-pgsql --disable-bonjour
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index d17410f3a461..c70780c53379 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -50,7 +50,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
.if defined(WITH_CLIENT)
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 2714337f1e7b..698d37643ac9 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -16,9 +16,8 @@ EXTRACT_SUFX?= .zip
MAINTAINER?= kamikaze@bsdforen.de
COMMENT?= Cleaned-up and enhanced version of Quake 3
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
-
USE_GMAKE= yes
+USE_PKGCONFIG= yes
.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*-server}
# Server config
diff --git a/games/libfov/Makefile b/games/libfov/Makefile
index 62d83b6ee53c..264181e63205 100644
--- a/games/libfov/Makefile
+++ b/games/libfov/Makefile
@@ -13,10 +13,9 @@ MASTER_SITES= http://libfov.googlecode.com/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= C library for calculating fields of view on low resolution rasters
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack
USE_AUTOTOOLS= libtool
+USE_PKGCONFIG= yes
CONFIGURE_ENV= ac_cv_prog_doxygen=no ac_cv_path_SDL_CONFIG=no
USE_LDCONFIG= yes
diff --git a/games/pets/Makefile b/games/pets/Makefile
index b21a040b86e7..5655481ee556 100644
--- a/games/pets/Makefile
+++ b/games/pets/Makefile
@@ -15,11 +15,10 @@ MASTER_SITES= http://www.loria.fr/~rougier/pub/Software/
MAINTAINER= ports@FreeBSD.org
COMMENT= Funny pets to follow your mouse pointer
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
WRKSRC= ${WRKDIR}/pet-${PORTVERSION}
USE_GNOME= gtk20
+USE_PKGCONFIG= yes
SUB_FILES= pkg-message
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index f912adb82fb0..8e2291116a75 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -17,8 +17,7 @@ COMMENT= A python library that implements poker rules
BUILD_DEPENDS= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
${PYTHON_SITELIBDIR}/pokereval.py:${PORTSDIR}/games/py-poker-eval \
${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
- ${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+ ${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
RUN_DEPENDS= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
${PYTHON_SITELIBDIR}/pokereval.py:${PORTSDIR}/games/py-poker-eval \
@@ -29,6 +28,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USE_PYTHON= 2.5-2.7
+USE_PKGCONFIG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/poker-eval/Makefile b/games/poker-eval/Makefile
index 526ba2ae4c27..c43e8e4a5471 100644
--- a/games/poker-eval/Makefile
+++ b/games/poker-eval/Makefile
@@ -18,11 +18,10 @@ COMMENT= A C library to evaluate poker hands
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index c5a56b3cf8b0..f45e9d8a5fc5 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -16,13 +16,13 @@ DISTNAME= py${PORTNAME}-${PORTVERSION:E}.0
MAINTAINER= ports@FreeBSD.org
COMMENT= Python adaptor for the poker-eval toolkit
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= poker-eval.1:${PORTSDIR}/games/poker-eval
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USE_PYTHON= 2.5-2.7
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= aclocal autoconf automake libtool
ACLOCAL_ARGS= -I config
CONFIGURE_ARGS= PYTHON=""
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 6cdd98201f76..fe978ab7d671 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -71,7 +71,7 @@ CONFLICTS+= ${PORTNAME}-[0-9]*
MAKE_ARGS+= TILES=y
PLIST_SUB+= SDL=""
PKGNAMESUFFIX= -sdl
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
USE_SDL= sdl image
diff --git a/games/warzone2100/files/patch-configure b/games/warzone2100/files/patch-configure
new file mode 100644
index 000000000000..6804debfd238
--- /dev/null
+++ b/games/warzone2100/files/patch-configure
@@ -0,0 +1,22 @@
+--- ./configure.orig 2012-07-25 12:01:59.220711135 +0200
++++ ./configure 2012-07-25 12:02:30.934712586 +0200
+@@ -8603,7 +8603,7 @@
+
+
+ for ac_prog in pkg-config; do
+- ac_prog_version_check=`$ac_prog --version | head -n 1 | sed 's/([^)]*)//g;s/^[a-zA-Z\.\ \-\/]*//;s/ .*$//'`
++ ac_prog_version_check=`$ac_prog --modversion pkg-config | head -n 1 | sed 's/([^)]*)//g;s/^[a-zA-Z\.\ \-\/]*//;s/ .*$//'`
+ ac_prog_major_check=`echo $ac_prog_version_check | cut -d. -f1`
+ ac_prog_minor_check=`echo $ac_prog_version_check | sed s/[-,a-z,A-Z].*// | cut -d. -f2`
+ ac_prog_micro_check=`echo $ac_prog_version_check | sed s/[-,a-z,A-Z].*// | cut -d. -f3`
+--- ./configure.orig 2012-07-25 12:01:59.220711135 +0200
++++ ./configure 2012-07-25 12:02:30.934712586 +0200
+@@ -8603,7 +8603,7 @@
+
+
+ for ac_prog in pkg-config; do
+- ac_prog_version_check=`$ac_prog --version | head -n 1 | sed 's/([^)]*)//g;s/^[a-zA-Z\.\ \-\/]*//;s/ .*$//'`
++ ac_prog_version_check=`$ac_prog --modversion pkg-config | head -n 1 | sed 's/([^)]*)//g;s/^[a-zA-Z\.\ \-\/]*//;s/ .*$//'`
+ ac_prog_major_check=`echo $ac_prog_version_check | cut -d. -f1`
+ ac_prog_minor_check=`echo $ac_prog_version_check | sed s/[-,a-z,A-Z].*// | cut -d. -f2`
+ ac_prog_micro_check=`echo $ac_prog_version_check | sed s/[-,a-z,A-Z].*// | cut -d. -f3`
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index c1a30134385e..ab997a3bfcb1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -16,10 +16,9 @@ MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Image processing tools
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_XZ= yes
USE_PERL5= yes
+USE_PKGCONFIF= yes
USE_GNOME= gnomehack
USE_AUTOTOOLS= libltdl
# For some reason, using our libtool breaks the build into pieces:
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index f5c529d230cf..2b58e515962a 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -17,13 +17,13 @@ COMMENT= A High Quality Rendering Engine for C++
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_XORG= x11
USE_GNOME= gnomehack
USE_SDL= sdl
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= aclocal autoheader autoconf libtoolize automake
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --foreign --add-missing --ignore-deps
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index cbbdb8931fe9..c9c90958c517 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -16,11 +16,11 @@ COMMENT= Standalone Djvu viewer and plugin based on Qt4 toolkit
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre
GNU_CONFIGURE= yes
USE_QT4= gui network rcc_build uic_build moc_build qmake_build
+USE_PKGCONFIG= yes
QT_NONSTANDARD= yes
CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \
--x-libraries="${LOCALBASE}/lib"
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index 8de82e1cb7e5..ce5835e2a0b6 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -17,12 +17,12 @@ COMMENT= A viewer of hdr/pfm images
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
USE_GL= glut
USE_GMAKE= yes
+USE_PKGCONFIG= yes
ALL_TARGET= ${PORTNAME}
MAKE_JOBS_SAFE= yes
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index cd1cf78b0782..66ba62cd86ab 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -16,14 +16,14 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= GObject-based wrapper around the Exiv2 library
BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
- gm4:${PORTSDIR}/devel/m4 \
- pkg-config:${PORTSDIR}/devel/pkg-config
+ gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2
USE_BZIP2= yes
USE_GNOME= glib20
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 2a545fe24d8f..b9a1ae2f64c8 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility library that includes a wrapper for imlib2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_EFL= imlib2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|: install-docsDATA|:|g' ${WRKSRC}/Makefile.in
diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile
index 366c281961cd..175da9254066 100644
--- a/graphics/grafx2/Makefile
+++ b/graphics/grafx2/Makefile
@@ -38,7 +38,7 @@ USE_SDL+= ttf
.endif
.if defined(WITH_LUA)
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
USE_LUA= 5.1
.else
MAKE_ARGS+= NOLUA=1
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 61ee84f08bf1..401d3eddb6d9 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A gtk+ based screen capture
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
USE_GNOME= gtk20 libwnck libxml2
USE_XORG= x11 xmu
+USE_PKGCONFIG= yes
CFLAGS+= -fPIC -I${LOCALBASE}/include/libxml2
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index e665734bf6b5..2f860e1ef043 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -17,11 +17,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction library that sits between apps and visual plugin
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_GNOME= gnomehack
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index 6443e203daae..ae630d2e4344 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -15,10 +15,11 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ library for creating PNG images
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
+USE_PKGCONFIG= yes
+
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src
CXXFLAGS+= `pkg-config --cflags freetype2 libpng15` -I${LOCALBASE}/include
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 292028a4e61a..add2c9f20d82 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -16,7 +16,6 @@ COMMENT= Convert PostScript to other vector graphic formats
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
OPTIONS_DEFINE= MAGICK EMF MING PLOTUTILS DOCS EXAMPLES
@@ -26,6 +25,7 @@ MING_DESC= Enable swf interface
PLOTUTILS_DESC= Enable libplot interface
USE_GNOME= gnomehack
+USE_PKGCONFIG= yes
USE_GHOSTSCRIPT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 2ee8ee37a67d..f8f79d3b164b 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -16,7 +16,6 @@ COMMENT= A powerful RAW image processing application
LICENSE= GPLv3
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
iptcdata.3:${PORTSDIR}/graphics/libiptcdata \
jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -30,6 +29,7 @@ MAKE_JOBS_SAFE= yes
USE_XZ= yes
USE_GNOME= gtk20 glib20
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
CXXFLAGS+= -I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index 1b8933fd9cd7..acd1337ca6a6 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= A library and script language tool to create Flash movies
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2
@@ -23,6 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BISON= build
USE_ICONV= yes
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index f61170ddc736..f4dccbc0102d 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -17,7 +17,6 @@ COMMENT= SWF manipulation and generation utilities
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib \
@@ -29,6 +28,7 @@ OPTIONS_DEFINE= LAME PDF
USE_GL= glut
USE_GMAKE= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_lib_zzip_zzip_file_open=no
diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile
index ffdbb8153474..33a4aeb103e1 100644
--- a/graphics/tif22pnm/Makefile
+++ b/graphics/tif22pnm/Makefile
@@ -18,7 +18,8 @@ COMMENT= Converts TIFF- sampled images to PNM image
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+
+USE_PKGCONFIG= yes
PROJECTHOST= sam2p
LICENSE= GPLv2
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 914b703cb9ee..28fd40a3dc82 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR= ochusha/16560
MAINTAINER= ports@FreeBSD.org
COMMENT= A GUI BBS browser for 2ch.net
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
MAN1= ochusha.1
MANCOMPRESSED= no
@@ -25,6 +23,7 @@ USE_GNOME= glib20 gtk20 libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
+USE_PKGCONFIG= yes
DESKTOP_ENTRIES="Ochusha" "A GUI BBS browser for 2ch.net" \
"${LOCALBASE}/share/ochusha/ochusha32.xpm" \
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index 4c1943239c18..ee4b86a667d7 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -40,10 +40,11 @@ PLIST_FILES= bin/itweb-javaws bin/itweb-settings \
PORTDATA= about.jar about.jnlp netx.jar
PORTDOCS= netx
-BUILD_DEPENDS+= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
- ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS+= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+USE_PKGCONFIG= yes
+
CONFIGURE_ARGS+=--with-ecj=no --with-jdk-home="${JAVA_HOME}"
.include <bsd.port.pre.mk>
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 4a3bb16e8234..343caa278583 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
LIB_DEPENDS+= gnutls-openssl.27:${PORTSDIR}/security/gnutls
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LICENSE_COMB= multi
LICENSE= GPLv3 LGPL3
@@ -35,6 +34,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
USE_ICONV= yes
+USE_PKGCONFIG= yes
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
diff --git a/mail/firetray/Makefile b/mail/firetray/Makefile
index 1cb0ad8932c8..c7802681793f 100644
--- a/mail/firetray/Makefile
+++ b/mail/firetray/Makefile
@@ -15,13 +15,12 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= avg@icyb.net.ua
COMMENT= System tray add-on for firefox, thunderbird, seamonkey, etc
-PATCH_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr \
- pkg-config:${PORTSDIR}/devel/pkg-config
+PATCH_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_ZIP= yes
USE_GECKO= libxul
USE_SCONS= yes
-USE_GNOME= pkgconfig
+USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
EXTRACT_AFTER_ARGS= -d ${WRKSRC}
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 7a62b33cf8ff..13bbb4e22e99 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -21,7 +21,6 @@ COMMENT= An environment for rapid engineering and scientific processing
LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \
pcre.1:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LICENSE= GPLv2
@@ -35,6 +34,7 @@ USE_FORTRAN= yes
FFLAGS+= -O2
USE_GL= yes
+USE_PKGCONFIG= yes
USE_CMAKE= yes
USE_QT4= gui network opengl moc_build rcc_build uic_build \
qmake_build xml svg
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 8214f604e262..5d3cb04b5813 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -16,10 +16,9 @@ DISTNAME= linm_${LINM_VER}-1
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Mdir, mc-style terminal file manager
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
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 53df20299b3d..e9ebf14dabfd 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -15,7 +15,6 @@ DISTNAME= mc-${PORTVERSION:S/.p9/-pre9/}
MAINTAINER= ports@FreeBSD.org
COMMENT= A lightweight Midnight Commander clone
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk
CONFLICTS= mc-4.7*
@@ -26,6 +25,7 @@ MC_IN_MC_DESC= Allow run mc inside mc (useful for mcedit)
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 1a217ef9c388..4da09e08b799 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -20,10 +20,9 @@ COMMENT= Midnight Commander, a free Norton Commander Clone
CONFLICTS= mc-light-4*
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
USE_GMAKE= yes
USE_GNOME= glib20
+USE_PKGCONFIG= yes
USE_PERL5= yes
USE_XZ= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 8b44bff69eeb..15220773c3aa 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -24,7 +24,6 @@ COMMENT= A cross-platform subtitle editor
LICENSE= BSD
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
OPTIONS_DEFINE= DEBUG PROFILE GCOV EFENCE ASS ALSA OPENAL PORTAUDIO PULSEAUDIO \
@@ -37,6 +36,7 @@ HUNSPELL_DESC= Hunspell support
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/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index b0ef06bb0eb6..4e606df3d3f3 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -16,8 +16,7 @@ COMMENT= General purpose media decoding library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS= gavl.1:${PORTSDIR}/multimedia/gavl
OPTIONS_DEFINE= A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
@@ -35,6 +34,7 @@ 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/handbrake/Makefile b/multimedia/handbrake/Makefile
index 5a6c9e968d6a..36e213dd5b4b 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -33,11 +33,11 @@ DIST_SUBDIR= handbrake
MAINTAINER= ports@FreeBSD.org
COMMENT= A DVD to MPEG-4 ripper and encoder
-BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam \
- pkg-config:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_GMAKE= yes
+USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool aclocal
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 35b141490f04..5eb3afb129e1 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -16,14 +16,13 @@ COMMENT= Codec for karaoke and text encapsulation for Ogg
LICENSE= BSD
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \
png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= pkgconfig
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
CFLAGS+= "-I${LOCALBASE}/include"
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index b65b14154d4b..8cd0a332b6ad 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Program used to time subtitles
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
sndfile:${PORTSDIR}/audio/libsndfile
@@ -22,6 +21,7 @@ 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/net-im/climm/Makefile b/net-im/climm/Makefile
index fe064b6f744c..a4f11c6e6cf8 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -71,7 +71,7 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \
--with-libgcrypt-prefix=${LOCALBASE}
CONFIGURE_ENV+= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel \
gnutls:${PORTSDIR}/security/gnutls \
gcrypt:${PORTSDIR}/security/libgcrypt \
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 7b28814f94b4..13307f52a47e 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
ilbc.0:${PORTSDIR}/net/ilbc \
ortp.8:${PORTSDIR}/net/linphone-base \
@@ -27,6 +26,7 @@ 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/mbpurple/Makefile b/net-im/mbpurple/Makefile
index 6b7cbaf25b59..8ef4cc9953da 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -13,12 +13,12 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= dougb@FreeBSD.org
COMMENT= Integrate twitter with pidgin (AKA microblog-purple)
-BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
RUN_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
PROJECTHOST= microblog-purple
USE_GMAKE= yes
+USE_PKGCONFIG= yes
post-patch:
@${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.Dist
diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile
index 062e9d99bb62..66df22801824 100644
--- a/net-mgmt/bwm-ng/Makefile
+++ b/net-mgmt/bwm-ng/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES= http://www.gropp.org/bwm-ng/
MAINTAINER= tdb@FreeBSD.org
COMMENT= A small and simple bandwidth monitor
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
MAN1= bwm-ng.1
PLIST_FILES= bin/bwm-ng
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 88ef019f88d8..62d8f0deaf1d 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -240,7 +240,7 @@ PLIST_SUB+= NUTUPS="@comment "
.endif
.if defined(WITH_INTERFACE)
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
CONFIGURE_ARGS+=--enable-interface
LIB_DEPENDS+= statgrab.8:${PORTSDIR}/devel/libstatgrab
PLIST_SUB+= INTERFACE=""
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 39a806ecfa0a..0cd98badcb0b 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -246,7 +246,7 @@ PLIST_SUB+= NUTUPS="@comment "
.endif
.if defined(WITH_INTERFACE)
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
CONFIGURE_ARGS+=--enable-interface
LIB_DEPENDS+= statgrab.8:${PORTSDIR}/devel/libstatgrab
PLIST_SUB+= INTERFACE=""
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index f30a01e04fd4..43218f1ced63 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -19,12 +19,12 @@ COMMENT= Shows current mldonkey donwload/upload rates and allows setting them
LICENSE= GPLv2
BUILD_DEPENDS= \
- pkg-config:${PORTSDIR}/devel/pkg-config \
${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_JOBS_SAFE= yes
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 3be810de8d83..a0385e627c3f 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_PKGCONFIG= yes
CONFIGURE_ARGS+= --enable-${CODA_SUITE}
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index d3751f8d2025..cc2cbe5b8fe0 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -34,7 +34,6 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.tar.bz2
MAINTAINER= r.neese@gmail.com
COMMENT= FreeSwitch SoftSwitch Port
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff \
@@ -49,6 +48,7 @@ USE_AUTOTOOLS= autoconf:env automake:env libtool:env
USE_PERL5_BUILD=yes
USE_BISON= both
+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 1373b71af681..65acf40c09c2 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -34,7 +34,6 @@ EXTRACT_ONLY= ${BASE_PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= r.neese@gmail.com
COMMENT= FreeSwitch SoftSwitch Port
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff \
@@ -48,6 +47,7 @@ USE_AUTOTOOLS= autoconf:env automake:env libtool:env
USE_PERL5_BUILD=yes
USE_BISON= both
+USE_PKGCONFIG= yes
USE_GMAKE= yes
SUB_FILES= pkg-install pkg-message
USE_RC_SUBR= freeswitch
diff --git a/net/net6/Makefile b/net/net6/Makefile
index bdac2d27b167..544cbce56c6e 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -15,7 +15,6 @@ COMMENT= Network access framework for IPv4/IPv6
LICENSE= GPLv2
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
gnutls.47:${PORTSDIR}/security/gnutls
@@ -23,6 +22,7 @@ USE_GNOME= gnomehack
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 9f1fac89867f..46ad12ee9916 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -15,12 +15,11 @@ COMMENT= A network abstraction library used by for feng, libnemesi, felix
LICENSE= LGPL21
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GNOME= gnomehack
.include <bsd.port.mk>
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index fe4e5f8166a8..1bc27a796b64 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -13,12 +13,12 @@ MASTER_SITES= http://www.litech.org/radvd/dist/
MAINTAINER= dhn@FreeBSD.org
COMMENT= A Linux/BSD IPv6 router advertisement daemon
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= daemon.0:${PORTSDIR}/devel/libdaemon
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=
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 4b3c3b34053f..161b31054985 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -72,9 +72,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+= PKG_CONFIG="${PKG_CONFIG}"
-BUILD_DEPENDS+= ${PKG_CONFIG}:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
# Let process generate meaningful backtrace on a core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
# Always use external libtalloc
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 31ceac51caef..1de11db2b2cf 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -80,9 +80,7 @@ CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+= PKG_CONFIG="${PKG_CONFIG}"
-BUILD_DEPENDS+= ${PKG_CONFIG}:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
# Let process generate meaningful backtrace on a core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
# tdb
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index f44648578cca..46593eeaf2db 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -83,9 +83,7 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+= PKG_CONFIG="${PKG_CONFIG}"
-BUILD_DEPENDS+= ${PKG_CONFIG}:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
# Let process generate meaningful backtrace on a core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
# tdb
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index e225d6aa32e0..9c13650c3b2e 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= SF/tapioca-voip/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction layer for interprocess communication
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
@@ -22,6 +21,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 85a22de8dba4..76178591974a 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -133,10 +133,9 @@ CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap
.if ${PORT_OPTIONS:MGNUTLS}
CONFIGURE_ARGS+= --disable-openssl --enable-gnutls
-CONFIGURE_ENV+= PKGCONFIG="${LOCALBASE}/bin/pkg-config"
LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
.else
CONFIGURE_ARGS+= --disable-gnutls --enable-openssl
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index 52f28ec5b038..e39ccce492eb 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -23,4 +23,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+post-patch:
+ @${REINPLACE_CMD} -s "s/PKGCONFIG --version/PKGCONFIG --modversion pkg-config/g" \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index d4db4e62df65..f6583caa0467 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -16,13 +16,12 @@ DIST_SUBDIR= ghostscript
MAINTAINER= ports@FreeBSD.org
COMMENT= C library that supports plugin printer driver for Ghostscript
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
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/panda/Makefile b/print/panda/Makefile
index a6d438103b71..ca81fdb917c4 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -19,7 +19,6 @@ COMMENT= A PDF generation library
LICENSE= GPLv2 LGPL21
LICENSE_COMB= dual
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
@@ -31,6 +30,7 @@ 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/security/libotr/Makefile b/security/libotr/Makefile
index d53a8f6f6abd..8383609285e2 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -20,7 +20,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= dougb@FreeBSD.org
COMMENT= The portable OTR Messaging Library and toolkit
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error \
gcrypt:${PORTSDIR}/security/libgcrypt
@@ -28,6 +27,7 @@ MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= autoconf libtool
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAN1= otr_toolkit.1
MLINKS= otr_toolkit.1 otr_parse.1 \
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index b38fce32a9a3..878096443a1f 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -14,12 +14,12 @@ MASTER_SITES= http://wald.intevation.org/frs/download.php/600/
MAINTAINER= ports@FreeBSD.org
COMMENT= Libraries for OpenVAS
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \
gcrypt.18:${PORTSDIR}/security/libgcrypt
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_GNOME= glib20
MAKE_JOBS_UNSAFE= yes
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index a504d8686554..fe296bafc997 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -21,10 +21,10 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \
yaml:${PORTSDIR}/textproc/libyaml \
htp:${PORTSDIR}/devel/libhtp
-BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
- pkg-config:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
USE_AUTOTOOLS= automake autoconf libtool
+USE_PKGCONFIG= yes
USE_RC_SUBR= suricata
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index edfb90a6692c..78e7695920be 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -14,12 +14,11 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= nork@FreeBSD.org
COMMENT= The open-source TCG Software Stack
-BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/pkg.m4:${PORTSDIR}/devel/pkg-config
-
USE_GMAKE= YES
USE_ICONV= YES
USE_OPENSSL= YES
USE_LDCONFIG= YES
+USE_PKGCONFIG= YES
USE_AUTOTOOLS= autoconf automake libtool
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 14b203122c71..a2105899c504 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -17,7 +17,6 @@ MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
MAINTAINER= johans@FreeBSD.org
COMMENT= XML Security Library
-RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
BUILD_DEPENDS:= ${RUN_DEPENDS}
OPTIONS_DEFINE= GNUTLS NSS
@@ -28,6 +27,7 @@ USE_OPENSSL= yes
USE_GNOME= gnomehack lthack libxslt
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAN1= xmlsec1.1 xmlsec1-config.1
CFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 2b10671f406b..5e913ffd3b6a 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -24,6 +24,7 @@ GNU_CONFIGURE= yes
NO_INSTALL_MANPAGES= yes
USE_GMAKE= yes
USE_ICONV= yes
+USE_PKGCONFIG= yes
USE_GCC= 4.2+
.include <bsd.port.mk>
diff --git a/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index 5634f716da3f..12e1fbc1fc14 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -18,7 +18,6 @@ PORTSCOUT= limit:^0\.2
MAINTAINER= ports@FreeBSD.org
COMMENT= Etoile Project System Tool
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
DEPRECATED= API no longer supported
@@ -29,6 +28,7 @@ USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
+USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/System
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index 35ecb399fecd..bd62a390ee66 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE= yes
PORTDOCS= AUTHORS ChangeLog README
PLIST_FILES= bin/${PORTNAME}
+USE_PKGCONFIG= yes
+
MAN1= afuse.1
.if !defined(NOPORTDOCS)
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 51c98e5a7ec4..65c2a84e1762 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -14,12 +14,11 @@ DISTNAME= fuse-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE allows filesystem implementation in userspace
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin
CFLAGS+= ${PTHREAD_CFLAGS}
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
USE_ICONV= yes
CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 21e2179fcd95..424d1f675194 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -25,6 +25,7 @@ CONFLICTS_INSTALL= ntfsprogs-*
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/hardlink/Makefile b/sysutils/hardlink/Makefile
index 6bd25417369e..4630309195ac 100644
--- a/sysutils/hardlink/Makefile
+++ b/sysutils/hardlink/Makefile
@@ -17,7 +17,7 @@ COMMENT= Replace file copies using hardlinks
LICENSE= MIT
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
MAN1= hardlink.1
PLIST_FILES= bin/hardlink
diff --git a/sysutils/iextract/Makefile b/sysutils/iextract/Makefile
index 43613528ad4d..2d21e929cae9 100644
--- a/sysutils/iextract/Makefile
+++ b/sysutils/iextract/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS= YGP.0:${PORTSDIR}/devel/libYGP
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
+USE_PKGCONFIG= yes
LDFLAGS+= ${PTHREAD_LIBS}
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 3071f001db5e..6d302c17e435 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -16,10 +16,11 @@ COMMENT= Moosefs client tools
DISTINFO_FILE= ${.CURDIR}/../moosefs-master/distinfo
-BUILD_DEPENDS= ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config \
- ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
+BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+USE_PKGCONFIG= yes
+
MAN1= mfstools.1 mfscheckfile.1 mfsdirinfo.1 mfsfileinfo.1 \
mfsfilerepair.1 mfsgetgoal.1 mfsgettrashtime.1 \
mfsrgetgoal.1 mfsrgettrashtime.1 mfsrsetgoal.1 \
diff --git a/sysutils/netdump-server/Makefile b/sysutils/netdump-server/Makefile
index 317e89b0abd2..b145a55d19e0 100644
--- a/sysutils/netdump-server/Makefile
+++ b/sysutils/netdump-server/Makefile
@@ -16,7 +16,8 @@ COMMENT= RedHat server part of netdump/netconsole package for Linux
LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \
glib:${PORTSDIR}/devel/glib20
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+
+USE_PKGCONFIG= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 5f97df6bfabe..e50cfe404029 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,12 +16,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Network UPS Tools
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
NO_LATEST_LINK= yes
diff --git a/sysutils/rsyslog5-relp/Makefile b/sysutils/rsyslog5-relp/Makefile
index 097271146148..fa248bb11457 100644
--- a/sysutils/rsyslog5-relp/Makefile
+++ b/sysutils/rsyslog5-relp/Makefile
@@ -9,8 +9,8 @@ COMMENT= RELP input/output module for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog5
MNAME= relp
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp
+USE_PKGCONFIG= yes
CONFIGURE_ARGS+=--enable-relp
diff --git a/sysutils/rsyslog5-rfc3195/Makefile b/sysutils/rsyslog5-rfc3195/Makefile
index bff68245ad1c..c87028d2ec0c 100644
--- a/sysutils/rsyslog5-rfc3195/Makefile
+++ b/sysutils/rsyslog5-rfc3195/Makefile
@@ -9,9 +9,10 @@ COMMENT= RFC3195 input support for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog5
MNAME= rfc3195
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
+USE_PKGCONFIG= yes
+
CONFIGURE_ARGS+=--enable-rfc3195
PLIST_FILES+= lib/rsyslog/im3195.la \
diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile
index 80743442e24f..9ce6cc8988a7 100644
--- a/sysutils/rsyslog6-devel-relp/Makefile
+++ b/sysutils/rsyslog6-devel-relp/Makefile
@@ -9,9 +9,10 @@ COMMENT= RELP input/output module for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog6-devel
MNAME= relp
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp
+USE_PKGCONFIG= yes
+
CONFIGURE_ARGS+=--enable-relp
PLIST_FILES+= lib/rsyslog/imrelp.la \
diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile
index 9b5b72b74caf..e32ba5bd514a 100644
--- a/sysutils/rsyslog6-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog6-devel-rfc3195/Makefile
@@ -9,9 +9,10 @@ COMMENT= RFC3195 input support for rsyslog
MASTERDIR= ${.CURDIR}/../rsyslog6-devel
MNAME= rfc3195
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging
+USE_PKGCONFIG= yes
+
CONFIGURE_ARGS+=--enable-rfc3195
PLIST_FILES+= lib/rsyslog/im3195.la \
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index c8bd38f7a1a7..1cab713614d9 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -16,7 +16,6 @@ DIST_SUBDIR= xfce4
MAINTAINER= ports@FreeBSD.org
COMMENT= CD/DVD burning tool for Xfce
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= burn.4:${PORTSDIR}/devel/libburn \
isofs.6:${PORTSDIR}/devel/libisofs
RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
@@ -28,6 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= intltool
USE_XFCE= configenv libexo libgui
+USE_PKGCONFIG= yes
USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index 8bfdaf3ad7ad..556457492d3b 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -16,7 +16,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}b
MAINTAINER= ports@FreeBSD.org
COMMENT= A Collection of DOM Implementations
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gdome.8:${PORTSDIR}/textproc/gdome2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -26,6 +25,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
OPTIONS= OCAML "OCAML language support" off
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 13a27fcc528f..5ff41eb27853 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES= http://www.autistici.org/bakunin/libmrss/
MAINTAINER= clsung@FreeBSD.org
COMMENT= A C library for parsing, writing, and creating RSS
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
nxml.18:${PORTSDIR}/textproc/libnxml
@@ -25,6 +24,7 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
WANT_GNOME= yes
pre-patch:
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index b048ef24f636..3524cb8776c7 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= SCIM OpenVanilla input method (IM)/output filter (OF) framework
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
- ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+ ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
@@ -27,6 +26,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= OV_MODULEDIR=${PREFIX}/lib/openvanilla/
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index 723c948d1823..007fd0e3ffcc 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES= # none known, please fix
MAINTAINER= ports@FreeBSD.org
COMMENT= Intelligent predictive text entry platform
-BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man
USE_SQLITE= 3
USE_AUTOTOOLS= libtool
@@ -25,6 +24,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
MAN1= soothsayer_demo.1 soothsayer_demo_text.1 \
soothsayer_simulator.1 text2ngram.1
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index 8c9ebcbc2eba..cdf6479ba079 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -17,7 +17,6 @@ COMMENT= A modern style C++ library for working with XML data
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= boost_iostreams.4:${PORTSDIR}/devel/boost-libs
OPTIONS= XSLT "build libxsltwrap library (requires libxslt)" off
@@ -27,6 +26,7 @@ USE_PERL5_BUILD=yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-silent-rules
USE_LDCONFIG= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index a3aebe09e606..35621fc528e7 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -156,7 +156,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-openssl-9.8up.patch
.endif
.if ${OSVERSION} < 700014 && ${ARCH} == i386
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
.endif
.if defined(WITH_THREADS)
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index a9fe50fb32b3..68ecfb0b1e37 100644
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@@ -18,8 +18,7 @@ LICENSE= BSD
LIB_DEPENDS+= tokyocabinet:${PORTSDIR}/databases/tokyocabinet \
event-2.0:${PORTSDIR}/devel/libevent2
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
-
+USE_PKGCONFIG= yes
MAKE_ENV= LIBS="${PTHREAD_LIBS}"
PLIST_FILES= bin/${PORTNAME}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 1a1ab0e6eaef..05b6bd1e43e1 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -19,13 +19,13 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
.endif
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= lthack
USE_GMAKE= yes
+USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
#.if !defined(_BUILDING_LIGHTTPD_MODULE)
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 3cc64174ea14..d62648c771dd 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= VRML97 runtime and browser
-BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
- pkg-config:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
js.1:${PORTSDIR}/lang/spidermonkey \
jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -28,6 +27,7 @@ USE_GNOME= gnomehack 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/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index e34abf939af3..964d1315dc6c 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -16,7 +16,6 @@ COMMENT= Xlib implementation of an attractive, configurable clock
LICENSE= GPLv2 # (or later)
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -24,6 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XORG= x11 xext
USE_BISON= build
USE_GMAKE= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 2b2eea4c5348..dd0c14c99a46 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -17,11 +17,11 @@ COMMENT= A 3D filesystem browser
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg
USE_GL= glut
USE_SDL= image sdl
+USE_PKGCONFIG= yes
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index 37720634cd57..28677715fb3b 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+= --enable-cairo
LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
# XXX:
# FLTK2's configure check currently depends on pkg-config being available...
-BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+USE_PKGCONFIG= yes
.else
CONFIGURE_ARGS+= --disable-cairo
.endif
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 597bfb056599..dc4a00d7f5f2 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -17,13 +17,13 @@ COMMENT= A Fox toolkit reimplementation of Scintilla editing widget
LICENSE= LGPL21 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
USE_GNOME= gnomehack
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/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 9313b78f645f..151e5624e1c9 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -16,12 +16,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Libsexy bindings for Python
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= sexy.2:${PORTSDIR}/x11-toolkits/libsexy
USE_AUTOTOOLS= libtool
USE_GNOME= pygtk2
USE_PYTHON= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile
index 8b7c1f2d8244..582339a057b4 100644
--- a/x11-wm/skippy-xd/Makefile
+++ b/x11-wm/skippy-xd/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= http://cdn.thegraveyard.org/releases/skippy/
MAINTAINER= ports@FreeBSD.org
COMMENT= A full-screen X11 task-switcher like Apple's Expose
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
- pkg-config>0:${PORTSDIR}/devel/pkg-config
+BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_XORG= x11 xft xcomposite xdamage xfixes xrender xinerama xext xmu
+USE_PKGCONFIG= yes
PLIST_FILES= bin/skippy-xd \
%%DATADIR%%/skippy-xd.rc-default
PLIST_DIRS= %%DATADIR%%
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index c8b15ec87274..0e8461e4b535 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES= http://cdn.thegraveyard.org/releases/skippy/
MAINTAINER= ports@FreeBSD.org
COMMENT= A full-screen X11 task-switcher like Apple's Expose
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
USE_XORG= x11 xext xinerama xft xmu
USE_BZIP2= yes
USE_EFL= imlib2
+USE_PKGCONFIG= yes
PLIST_FILES= bin/skippy \
%%DATADIR%%/skippyrc-default
PLIST_DIRS= %%DATADIR%%
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 5ae13de6230c..11812f380202 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -15,7 +15,6 @@ DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT?= GNUstep-compliant NeXTstep window manager clone
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib \
png15:${PORTSDIR}/graphics/png \
jbig:${PORTSDIR}/graphics/jbigkit \
@@ -35,6 +34,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack
USE_XORG= xft xinerama xmu xpm
USE_GETTEXT= yes
+USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index 30ca0ef5aab4..e64d43822c34 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES= http://desrt.mcmaster.ca/code/keyboardcast/
MAINTAINER= eimar.koort@gmail.com
COMMENT= Broadcast keystrokes to multiple X windows for Gnome2
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-
USE_XORG= xmu
USE_GNOME= libwnck libglade2 gtk20
+USE_PKGCONFIG= yes
INSTALLS_ICONS= yes
post-install:
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 3fee018a8387..8f24bd9e3f10 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -15,11 +15,10 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fast and customizable dockbar
-BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
-
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gconf2 libwnck
USE_WX= 2.8
+USE_PKGCONFIG= yes
WX_CONF_ARGS= absolute
WRKSRC= ${WRKDIR}/trunk