45 files changed, 118 insertions, 48 deletions

diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 81e4b7b58e1d..22336150f433 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -17,12 +17,13 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 
 LICENSE=	LGPL21
 
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 OPTIONS_DEFINE=	NLS
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index f9078e23499b..6dd23d2d8993 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -16,11 +16,13 @@ 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
 
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 01b8ecb46139..68eaa971767c 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -15,7 +15,9 @@ DISTNAME=	sidplay-libs-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate
 
-USE_GNOME=	gnomehack pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	builders/hardsid-builder/configure \
diff --git a/cad/adms/Makefile b/cad/adms/Makefile
index 9f0efe748859..5a337d617219 100644
--- a/cad/adms/Makefile
+++ b/cad/adms/Makefile
@@ -18,7 +18,9 @@ COMMENT=	A model generator for SPICE simulators
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GNOME=	glib20 pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	glib20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index e00c7c8ad919..4df6e1bcc7ec 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -17,8 +17,10 @@ COMMENT=	Disk Based Hashtables
 
 CONFLICTS=	dbh-[2-9]*
 
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 7f25f1c41b3e..f5ea81d20756 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -14,9 +14,11 @@ 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=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/bufferpool/Makefile b/devel/bufferpool/Makefile
index bfc7153b2f68..b533dc7c195e 100644
--- a/devel/bufferpool/Makefile
+++ b/devel/bufferpool/Makefile
@@ -13,10 +13,12 @@ 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_GNOME=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
 
 .include <bsd.port.mk>
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index e7694a7e44b6..8ca3a8a7f611 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -18,6 +18,7 @@ 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 \
@@ -31,7 +32,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-clanJavaScript --disable-docs
 USE_GMAKE=	yes
 USE_XORG=	x11 xmu xi
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 USE_SDL=	gfx
 USE_GL=		yes
diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index 83f5411fb14a..84782567dda8 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -13,14 +13,14 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Code generator for Compiz Fusion Plugins
 
-# This annoys me...
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-USE_GNOME=	pkgconfig libxslt
+USE_GNOME=	libxslt
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 0c73e0bb42a8..981fcdedbd51 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -16,7 +16,9 @@ COMMENT=	A simple, powerful configuration-file parser
 
 LICENSE=	LGPL21
 
-USE_GNOME=	gnomehack pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index 27e7e3aee191..c04b91aa233e 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -14,8 +14,10 @@ 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=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 07963cfe7933..348e218b1d14 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -15,12 +15,13 @@ 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
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 438b61bc9811..35b3a1e9e221 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -16,8 +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 pkgconfig
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 PLIST_SUB=	ASSA_VERSION=${PORTVERSION:R:R}
 
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index 9bc069f91eea..2d4a13f88866 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -14,7 +14,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The C++ Debugging Support Library
 
-USE_GNOME=	gnomehack pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-alloc --disable-location --disable-threading \
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile
index 06d336d26a9d..d87df5dca3e3 100644
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@@ -18,11 +18,13 @@ 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 pkgconfig
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index b33cb77a046b..e3e52c89d897 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -19,12 +19,14 @@ 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
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index 144951dcaf6a..c521a0ae040c 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -16,12 +16,14 @@ 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
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
 MAN3=		vstr.3 vstr_const.3
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index e7df66513130..b605d2cbc1b7 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -14,9 +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 pkgconfig
+USE_GNOME=	gtk20 gnomeprefix
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 6539d3aab142..bc6b77330ada 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -16,12 +16,13 @@ COMMENT=	A library to provide transparent read access to zipped files
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		pkg-config>0:${PORTSDIR}/devel/pkg-config
 
 OPTIONS_DEFINE=	SDL
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 3d429883e0f0..270b427de160 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -15,7 +15,9 @@ MASTER_SITES=	SF/purify/Default/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Management utility for the PureFTPd
 
-USE_GNOME=	pkgconfig gnomehack libglade2
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack libglade2
 USE_FAM=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 2ef0aa33ff90..f7b228c66940 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -14,12 +14,14 @@ 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_GNOME=	pkgconfig ltverhack
+USE_GNOME=	ltverhack
 CONFIGURE_ARGS+=	--without-pam --disable-pgsql --disable-bonjour
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/games/libfov/Makefile b/games/libfov/Makefile
index 43b0aa4183d2..62d83b6ee53c 100644
--- a/games/libfov/Makefile
+++ b/games/libfov/Makefile
@@ -13,7 +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
 
-USE_GNOME=	gnomehack pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 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 4bb752323f74..b21a040b86e7 100644
--- a/games/pets/Makefile
+++ b/games/pets/Makefile
@@ -15,9 +15,11 @@ 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 pkgconfig
+USE_GNOME=	gtk20
 
 SUB_FILES=	pkg-message
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0728fc53f8c1..26402676fd4b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -17,9 +17,11 @@ 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_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libltdl
 # For some reason, using our libtool breaks the build into pieces:
 #USE_AUTOTOOLS+=	libtool
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index fed16b0cfcee..f5c529d230cf 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -17,10 +17,11 @@ 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 pkgconfig
+USE_GNOME=	gnomehack
 USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize automake
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index fc60403999f1..2a545fe24d8f 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -14,8 +14,10 @@ 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 pkgconfig
+USE_GNOME=	gnomehack
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 1c164f879f47..61ee84f08bf1 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -14,8 +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=	pkgconfig gtk20 libwnck libxml2
+USE_GNOME=	gtk20 libwnck libxml2
 USE_XORG=	x11 xmu
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include/libxml2
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index 9e302198aaa5..e665734bf6b5 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -17,7 +17,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction library that sits between apps and visual plugin
 
-USE_GNOME=	gnomehack pkgconfig
+BUILD_DEPENDS=	pkg-config>0:${PORTSDIR}/devel/pkg-config
+
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 473374fcd5ad..292028a4e61a 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -16,6 +16,7 @@ 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
@@ -24,7 +25,7 @@ EMF_DESC=	Enable emf interface
 MING_DESC=	Enable swf interface
 PLOTUTILS_DESC=	Enable libplot interface
 
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_GHOSTSCRIPT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 0dc1249a5e7f..2ee8ee37a67d 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -16,6 +16,7 @@ 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 \
@@ -27,7 +28,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_XZ=		yes
-USE_GNOME=	gtk20 glib20 pkgconfig
+USE_GNOME=	gtk20 glib20
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
 CXXFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 0969a35f9e37..914b703cb9ee 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -15,11 +15,13 @@ 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
 
 USE_BZIP2=	yes
-USE_GNOME=	pkgconfig glib20 gtk20 libxml2
+USE_GNOME=	glib20 gtk20 libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 2277f6da1188..8b44bff69eeb 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -24,6 +24,7 @@ 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 \
@@ -34,7 +35,7 @@ EFENCE_DESC=	Electric Fence (require profiling)
 ASS_DESC=	libASS subtitle provider
 HUNSPELL_DESC=	Hunspell support
 
-USE_GNOME=	intltool pkgconfig
+USE_GNOME=	intltool
 USE_WX=		2.8
 WX_COMPS=	wx contrib
 WX_UNICODE=	yes
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 22397db1d962..b0ef06bb0eb6 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -16,7 +16,8 @@ COMMENT=	General purpose media decoding library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat \
+		pkg-config>0:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	gavl.1:${PORTSDIR}/multimedia/gavl
 
 OPTIONS_DEFINE=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
@@ -29,7 +30,7 @@ DVDREAD_DESC=	libdvdread support
 GMERLIN_DESC=	gmerlin support
 SAMBA_DESC=	Samba support using libsmbclient
 
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cpuflags=none --without-doxygen
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 9828407a5af3..bdac2d27b167 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -15,10 +15,11 @@ 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
 
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/netembryo/Makefile b/net/netembryo/Makefile
index 50bd4b5e847c..9f1fac89867f 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -15,10 +15,12 @@ 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_GNOME=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
 
 .include <bsd.port.mk>
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 0287e18b3986..e225d6aa32e0 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -14,12 +14,13 @@ 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
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig glib20 gnomehack
+USE_GNOME=	glib20 gnomehack
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index c4bbab8fad26..d4db4e62df65 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -16,8 +16,10 @@ 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 pkgconfig
+USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 5b3a6c31aa33..a6d438103b71 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -19,12 +19,13 @@ 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
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 7d757ce2e9df..b38fce32a9a3 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -14,12 +14,13 @@ 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_GNOME=	glib20 pkgconfig
+USE_GNOME=	glib20
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		libopenvas-config.1
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index b531b318d194..c8bd38f7a1a7 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -16,6 +16,7 @@ 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
@@ -25,7 +26,7 @@ CONFIGURE_ENV=	GMSGFMT=${PREFIX}/bin/msgfmt DATADIRNAME=share
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool pkgconfig
+USE_GNOME=	intltool
 USE_XFCE=	configenv libexo libgui
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index 132287d70022..8c9ebcbc2eba 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -17,11 +17,12 @@ 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
 
-USE_GNOME=	gnomehack libxml2 pkgconfig
+USE_GNOME=	gnomehack libxml2
 USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-silent-rules
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index a9719f054ea2..597bfb056599 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -17,9 +17,10 @@ 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 pkgconfig
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 4a3585726018..9313b78f645f 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -16,10 +16,11 @@ 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 pkgconfig
+USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index cce3ad2cb8d9..5ae13de6230c 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -15,6 +15,7 @@ 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 \
@@ -31,7 +32,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_XORG=	xft xinerama xmu xpm
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 623947f1a70b..3fee018a8387 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -15,8 +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 pkgconfig gconf2 libwnck
+USE_GNOME=	gnomehack gnomeprefix gconf2 libwnck
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute