34 files changed, 42 insertions, 89 deletions

diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index a0385e627c3f..257b8f9a0dd4 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	coda-server-6
-# Date created:				9 september 2003
-# Whom:					Tim Robbins
-
+# Created by: Tim Robbins
 # $FreeBSD$
 
 PORTNAME=	coda
@@ -21,9 +18,9 @@ LIB_DEPENDS=	lwp.2:${PORTSDIR}/devel/lwp \
 		rpc2.9:${PORTSDIR}/devel/rpc2 \
 		rvmlwp.3:${PORTSDIR}/devel/rvm
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	yes
 
 CONFIGURE_ARGS+=	--enable-${CODA_SUITE}
 
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
index f834c89505b8..3736a249f153 100644
--- a/net/ecore-con/Makefile
+++ b/net/ecore-con/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore libtool_hack
-USE_PKGCONFIG=	yes
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_con
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 9cadd3f9390e..146235652223 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -11,10 +11,9 @@ COMMENT=	A free implementation of Remote Desktop Protocol
 LICENSE=	AL2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USES=		cmake
+USES=		cmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	FreeRDP
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index d7e2e1088803..1e2499fddd2a 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -43,9 +43,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5_BUILD=yes
-USES=		bison:both
+USES=		bison:both pkgconfig
 USE_GCC=	any
-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 0b2a96c59d09..8858f41b7487 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -44,9 +44,8 @@ WRKSRC=		${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5_BUILD=yes
-USES=		bison:both
+USES=		bison:both pkgconfig
 USE_GCC=	any
-USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
 SUB_FILES=	pkg-install pkg-message
 USE_RC_SUBR=	freeswitch
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index f2dbc2fd081c..1a35b51e8bd4 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -16,11 +16,10 @@ COMMENT=	A popup style message communication tool for GNOME2
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack intltool \
 		libgnomeui libbonobo desktopfileutils gnomepanel
 USE_GSTREAMER=	vorbis
-USE_PKGCONFIG=	build
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 958529284339..797928446372 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -15,9 +15,9 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib-2
 
+USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index efb2166c5bf0..b496f9eed239 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library for writing servers
 
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index 7911c3b5da87..281c340777d4 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -23,9 +23,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_XZ=		yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index b2ffc944dd97..37c39697b186 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_XZ=		yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index d74259a4cb1b..7343d3199653 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -19,13 +19,12 @@ RUN_DEPENDS=	gupnp>=0.18:${PORTSDIR}/net/gupnp
 
 CONFIGURE_ARGS=	--enable-introspection=yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XZ=		yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ --define-variable=/d' ${WRKSRC}/configure
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index ecd1de5c70d4..1e09399961c5 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_PYTHON=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index d8ea5b14d799..0195ca336212 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -22,10 +22,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 USE_PYTHON=	yes
 USE_XZ=		yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/tools/gupnp-binding-tool
diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile
index 0d4287c4a9b0..40a21a25c916 100644
--- a/net/libcmis/Makefile
+++ b/net/libcmis/Makefile
@@ -16,11 +16,10 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit \
 		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
 
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	build
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--disable-werror --with-boost=${LOCALBASE} --without-man
diff --git a/net/libfixbuf/Makefile b/net/libfixbuf/Makefile
index f7fbd3ab0e68..4fc116d1022e 100644
--- a/net/libfixbuf/Makefile
+++ b/net/libfixbuf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libfixbuf
-# Date created:		2008-04-13
-# Whom:			David Thiel <lx@redundancy.redundancy.org>
-#
+# Created by: David Thiel <lx@redundancy.redundancy.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libfixbuf
 PORTVERSION=	1.0.2
@@ -15,8 +11,8 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Library for using the IP Flow Information Export protocol
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net/libnfs/Makefile b/net/libnfs/Makefile
index 476d68bd0809..8c5c553335d6 100644
--- a/net/libnfs/Makefile
+++ b/net/libnfs/Makefile
@@ -13,12 +13,12 @@ LICENSE=	LGPL21 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_AUTORECONF=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
 ACLOCAL_ARGS=	-I.
 AUTOMAKE_ARGS=	--add-missing
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 1fb108c4446d..08a9f3c776d2 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -18,7 +18,7 @@ GLIB2_DESC=	Use GLIB2 for multiprocessing support
 OPTIONS_DEFAULT=	LIBNET11 GLIB2
 
 WANT_GNOME=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN3=		libnids.3
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 55d6b31ecf3b..1ac66373a65c 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   linc
-# Date Created:			12 February 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	linc
 PORTVERSION=	1.0.3
@@ -19,9 +15,9 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 5bae923b612b..041e5140ea09 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS=	--with-utempter
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 INSTALL_TARGET=	install-strip
 USE_OPENSSL=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 LATEST_LINK=	mosh-term
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index aa87a3303b86..a6eadacf0e26 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lglib-2.0
 USE_GMAKE=	yes
 USE_GNOME=	_glib20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 
 MAN8=		mtr.8
 PLIST_FILES=	sbin/mtr
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 1a7aee6c8583..82491bf3cb7e 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Server for the Linux network block device (nbd)
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-lfs --enable-syslog
 
diff --git a/net/net6/Makefile b/net/net6/Makefile
index cad9b1759ff3..9cfc1c601771 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	net6
-# Date created:				2005-10-14
-# Whom:					Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#
 
 PORTNAME=	net6
 PORTVERSION=	1.3.14
@@ -19,11 +15,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
 		gnutls.26:${PORTSDIR}/security/gnutls
 
-USES=	pathfix
+USES=	pathfix pkgconfig
 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 a0b52620f01f..8cc1b165fd1f 100644
--- a/net/netembryo/Makefile
+++ b/net/netembryo/Makefile
@@ -15,9 +15,8 @@ OPTIONS_DEFINE=	OPENSSL
 OPTIONS_DEFAULT=OPENSSL
 
 USE_BZIP2=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-silent-rules
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index 81ab0eeaa8bc..a5780b6f55e8 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	packter-agent
-# Date created:				2012-09-05
-# Whom:					Masaki TAGAWA <masaki@club.kyutech.ac.jp>
-#
+# Created by: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	packter-agent
 PORTVERSION=	2.5
@@ -18,8 +14,8 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
 
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index 1bc27a796b64..9ff22fde8ba5 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	radvd
-# Date created:				Fri Jul  6 03:17:33 EDT 2001
-# Whom:					Patrick Li <pat@databits.net>
-#
+# Created by: Patrick Li <pat@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	radvd
 PORTVERSION=	1.9.1
@@ -17,8 +13,8 @@ LIB_DEPENDS=	daemon.0:${PORTSDIR}/devel/libdaemon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=
+USES=		pkgconfig
 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 7b7752ba0f56..18dd1b9f9320 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	samba34
-# Date created:				1 May 2009
-# Whom:					timur@FreeBSD.org
-#
+# Created by: timur@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=		samba34
 PORTVERSION=		3.4.17
@@ -75,7 +71,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
 
-USE_PKGCONFIG=		yes
+USES=			pkgconfig
 # Let process generate meaningful backtrace on a core dump
 LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
 # Always use external libtalloc
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index fad488f970ea..ea830980653f 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -32,7 +32,7 @@ AUTOCONF_ARGS=		${IPATHS}
 USE_GMAKE=		yes
 USE_ICONV=		yes
 GNU_CONFIGURE=		yes
-USE_PKGCONFIG=		build
+USES=			pkgconfig
 USE_AUTOTOOLS=		autoconf autoheader
 USE_LDCONFIG=		${SAMBA_LIBDIR}
 # pkg-config is used to find talloc
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 50422fa4f5e3..7ea3cb1ec02d 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -74,7 +74,7 @@ USE_GCC=		4.2+
 USE_PYTHON=		yes
 USE_ICONV=		yes
 USE_GETTEXT=		yes
-USE_PKGCONFIG=		build
+USES=			pkgconfig
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index b8d08f1cbaf9..13c96be7943a 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	silc client
-# Date created:				Thu Nov 8 01:50:05 BRST 2001
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	silc
 PORTVERSION=	1.1.8
@@ -28,7 +24,7 @@ MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 0843aeda75ce..f693383e7142 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -10,8 +10,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An iostream based C++ socket library
 
 USE_GMAKE=	yes
-USES=	pathfix
-USE_PKGCONFIG=	yes
+USES=	pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 4ebb162e2676..82daa786738b 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 1416c730143b..990ddaecb402 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	tridiavnc-[0-9]* \
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		cmake
-USE_PKGCONFIG=	build
+USES=		cmake pkgconfig
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_AUTOTOOLS+=	autoconf:env automake:env libtool:env
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index de2e6c976ba9..e96f4e2d34d6 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -76,7 +76,7 @@ WIRESHARK_LIBS+=${PTHREAD_LIBS}
 .else
 PLIST_SUB+=	WIRESHARK="@comment wireshark not built"
 USE_GNOME+=	glib20
-USE_PKGCONFIG=	build
+USES+=		pkgconfig
 CONFIGURE_ARGS+=	--enable-wireshark=no \
 			--disable-gtktest
 .endif
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 794fc4361d29..b4dbd9b685fe 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
+USES=		pkgconfig
 USE_GNOME=	libxml2 libxslt gnomehack
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes