new devel/pkgconf added to replace devel/pkg-config. new version of pkg-config

are no more self hosting so we are stuck with 0.25 version while pkgconf provide
the same set of features as 0.27 and a compatible frontend. A symlink to
pkg-config has been added for convenience and compatibility

This also introduces a new macro to use pkgconf in your ports:
USE_PKGCONFIG

it can take the following arguments:
 - yes (meaning build only dep)
 - build (meaning build only dep)
 - run (meaning run only dep)
 - both (meaning run and build dep)

From now USE_GNOME= pkgconfig is deprecated in favour of USE_PKGCONFIG
The old gnome macro has been modified to use pkgconf but still the sameway: run
and build dep to avoid large breakage.

While here fix some ports relying on pkg-config but not specifying it, fix some
ports broken because testing wrong .pc files, and fix ports using pkg-config
--version to determine pkg-config version instead of
pkg-config --modversion pkg-config like recommanded by pkg-config

With Hat:	portmgr
Exp-runs by:	bapt (pointhat-west), beat (pointyhat)

15 files changed, 22 insertions, 14 deletions

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