12 files changed, 15 insertions, 27 deletions
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index d5f69676d83c..5096af157d40 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	micq
-# Date created:				11 Oct 1998
-# Whom:					mph
-#
+# Created by: mph
 # $FreeBSD$
-#
 
 PORTNAME=	climm
 PORTVERSION=	0.7.1
@@ -16,8 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	CLI-based Multi-Messenger
 
+USES=		pkgconfig
 USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -72,7 +68,6 @@ CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-xmpp --enable-ssl=gnutls \
 			--with-libgcrypt-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls"
-USE_PKGCONFIG=		yes
 LIB_DEPENDS+=		iksemel:${PORTSDIR}/textproc/iksemel \
 			gnutls:${PORTSDIR}/security/gnutls \
 			gcrypt:${PORTSDIR}/security/libgcrypt \
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 746c0e528689..c93d922d1224 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -15,12 +15,12 @@ LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
 
 CONFLICTS=	farstream-[0-9]*
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
-USE_PKGCONFIG=	build
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index ff20a784bfb8..54403f0a0d87 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -18,11 +18,11 @@ LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex \
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
 		clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
 
+USES=		pkgconfig
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
 USE_DOS2UNIX=	README
-USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ilbc=${LOCALBASE} \
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 5225df90494d..1f17d7059dcd 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	http://nice.freedesktop.org/releases/ \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library and transmitter that implements ICE-19
 
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
-USE_PKGCONFIG=	build
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-gstreamer --with-gstreamer-0.10
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index eb8b9144e51d..8073e9aef127 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,11 +19,11 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		pkgconfig
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
-USE_PKGCONFIG=	build
 USE_GNOME=	glib20
 
 MAN1=		mcabber.1
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 8e08ef1957d9..ffcd1208ea16 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	meanwhile
-# Date created:		24 June 2004
-# Whom:		 	Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	meanwhile
 PORTVERSION=	1.0.2
@@ -15,9 +11,9 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open Source implementation of the Lotus Sametime protocol
 
 USE_AUTOTOOLS=	libtool
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-doxygen=no \
diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile
index dd061725fba9..665c7478ef9a 100644
--- a/net-im/mu-conference/Makefile
+++ b/net-im/mu-conference/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	mu-conference
-# Date created:			Mon Feb  9 15:34:59 MSK 2004
-# Whom:				Denis Shaposhnikov <dsh@vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh@vlink.ru>
 # $FreeBSD$
 
 PORTNAME=	mu-conference
@@ -19,8 +16,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 		idn:${PORTSDIR}/dns/libidn
 
+USES=		pkgconfig
 USE_GNOME=	glib20
-USE_PKGCONFIG=	build
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=	MYSQL
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index d9a6d42927c2..b1a043caccc1 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
 
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
+USES=		pkgconfig
 USE_BZIP2=	yes
-USE_PKGCONFIG=	build
 USE_QT4=	gui network xml imageformats_run \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	xscrnsaver
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 7e5aaa63b195..d975e957ba21 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -15,10 +15,10 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
-USE_PKGCONFIG=	build
 
 MAN8=		telepathy-idle.8
 
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index a38da11d3192..6e588a1577f5 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -16,13 +16,13 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 
 LICENSE=	LGPL21
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
 		libxslt:build
-USE_PKGCONFIG=	build
 USE_SQLITE=	yes
 USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 78b2e4996dc5..6057107088f3 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -14,9 +14,9 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
+USES=		pkgconfig
 USE_GNOME=	libxslt:build
 USE_GSTREAMER=	yes
-USE_PKGCONFIG=	yes
 USE_PYTHON_BUILD=	2.5+
 USE_QT4=	dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 3e6e39709bb3..9832f11b8092 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -14,9 +14,9 @@ LIB_DEPENDS=	avahi-glib.1:${PORTSDIR}/net/avahi-app \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
+USEs=		pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 libxslt:build
-USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
 USE_SQLITE=	3