11 files changed, 12 insertions, 21 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index c6382519ce70..f63016744284 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -22,8 +22,7 @@ BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 CONFLICTS=	amule-[0-9]*
 
 USE_BZIP2=	yes
-USES=		bison
-USE_PKGCONFIG=	yes
+USES=		bison pkgconfig
 USE_GMAKE=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index ef0b1a51d5c7..e301e35f7b0e 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -22,8 +22,7 @@ BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 CONFLICTS=	amule-devel-[0-9]*
 
 USE_BZIP2=	yes
-USES=		bison
-USE_PKGCONFIG=	yes
+USES=		bison pkgconfig
 USE_GMAKE=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index 43218f1ced63..00d617d1a546 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	GKrellM MLDonkey plugin
-# Date created:		Sat Mar 25 05:17:51 UTC 2006
-# Whom:                 Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gkremldk
 PORTVERSION=	0.9.8
@@ -22,9 +18,9 @@ BUILD_DEPENDS=	\
 		${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf
-USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_JOBS_SAFE=	yes
diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile
index fb629d98e6b4..f5ae3a0973d9 100644
--- a/net-p2p/libtorrent-devel/Makefile
+++ b/net-p2p/libtorrent-devel/Makefile
@@ -18,8 +18,7 @@ CONFLICTS=	libtorrent-[0-9]* \
 		rblibtorrent-devel-[0-9]*
 
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar-16/Makefile
index 5d20151af292..18ea4cec91d3 100644
--- a/net-p2p/libtorrent-rasterbar-16/Makefile
+++ b/net-p2p/libtorrent-rasterbar-16/Makefile
@@ -20,11 +20,10 @@ LIB_DEPENDS+=	boost_date_time:${PORTSDIR}/devel/boost-libs \
 		GeoIP:${PORTSDIR}/net/GeoIP
 
 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=	pathfix pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_PKGCONFIG=	build
 
 CONFIGURE_ARGS+=	--disable-debug \
 		--disable-static \
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 6217d9f4dd05..4afeb6dce133 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -18,8 +18,7 @@ CONFLICTS?=	libtorrent-devel-[0-9]* \
 		rblibtorrent-devel-[0-9]*
 
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
-USE_PKGCONFIG=	build
+USES=	pathfix pkgconfig
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index 3345c0ac03e1..481024bba392 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
 		nettle:${PORTSDIR}/security/nettle \
 		p11-kit:${PORTSDIR}/security/p11-kit
 
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_NCURSES=	yes
 USE_GNOME=	glib20
 USE_GMAKE=	yes
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 0bd8bcec8b48..cdab4e4ad3be 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		torrent-rasterbar.7:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16
 
 HAS_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_QT4=	corelib network qmake_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 
diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile
index f89c8ed706a2..f698409ca004 100644
--- a/net-p2p/rtorrent-devel/Makefile
+++ b/net-p2p/rtorrent-devel/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	rtorrent-[0-9]*
 USE_GCC=	4.2+
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 LDFLAGS+=	-pthread
 CONFIGURE_ARGS=	--disable-debug
 
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 1bb970ea7417..a79e73f51d17 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	rtorrent-devel-[0-9]*
 USE_GCC=	4.2+
 
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 LDFLAGS+=	-pthread
 CONFIGURE_ARGS=	--disable-debug
 
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index cbc5f367a647..dc902a160993 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -28,7 +28,7 @@ GEN_LIB_DEPENDS=curl.6:${PORTSDIR}/ftp/curl \
 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
 
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include