For ports maintained by ports@ where pkgconfig is one of the USE_GNOME deps

convert it to BUILD_DEPENDS. This avoids the problem of the bogus run dep
added by bsd.gnome.mk.

13 files changed, 36 insertions, 15 deletions

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=":"