aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/ace/Makefile2
-rw-r--r--devel/allegro-devel/Makefile3
-rw-r--r--devel/avro-c/Makefile3
-rw-r--r--devel/bufferpool/Makefile9
-rw-r--r--devel/clanlib/Makefile3
-rw-r--r--devel/clanlib1/Makefile3
-rw-r--r--devel/clanlib22/Makefile3
-rw-r--r--devel/codeblocks/Makefile2
-rw-r--r--devel/compiz-bcop/Makefile8
-rw-r--r--devel/dbus-sharp-glib/Makefile3
-rw-r--r--devel/dbus-sharp/Makefile7
-rw-r--r--devel/deforaos-libsystem/Makefile2
-rw-r--r--devel/desktop-file-utils/Makefile2
-rw-r--r--devel/dotconf/Makefile10
-rw-r--r--devel/ecore-file/Makefile2
-rw-r--r--devel/ecore-ipc/Makefile2
-rw-r--r--devel/ecore-main/Makefile3
-rw-r--r--devel/eet/Makefile3
-rw-r--r--devel/eio/Makefile3
-rw-r--r--devel/eris/Makefile3
-rw-r--r--devel/flatzebra/Makefile2
-rw-r--r--devel/g-wrap/Makefile2
-rw-r--r--devel/gamin/Makefile2
-rw-r--r--devel/geany-plugins/files/Makefile.common2
-rw-r--r--devel/geany/Makefile3
-rw-r--r--devel/gio-fam-backend/Makefile2
-rw-r--r--devel/glib-java/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/glibmm-reference/Makefile8
-rw-r--r--devel/glibmm/Makefile2
-rw-r--r--devel/gnome-js-common/Makefile8
-rw-r--r--devel/gob2/Makefile8
-rw-r--r--devel/gobject-introspection/Makefile3
-rw-r--r--devel/gsettings-desktop-schemas/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile3
-rw-r--r--devel/hs-gio/Makefile2
-rw-r--r--devel/hs-glib/Makefile2
-rw-r--r--devel/hwloc/Makefile2
-rw-r--r--devel/jclassinfo/Makefile10
-rw-r--r--devel/json-glib/Makefile8
-rw-r--r--devel/jzmq/Makefile2
-rw-r--r--devel/libIDL/Makefile3
-rw-r--r--devel/libYGP/Makefile3
-rw-r--r--devel/libassa/Makefile3
-rw-r--r--devel/libassetml/Makefile2
-rw-r--r--devel/libbonobo/Makefile3
-rw-r--r--devel/libcwd/Makefile10
-rw-r--r--devel/libffi/Makefile3
-rw-r--r--devel/libg19draw/Makefile8
-rw-r--r--devel/libgee/Makefile2
-rw-r--r--devel/libgee06/Makefile2
-rw-r--r--devel/liblangtag/Makefile3
-rw-r--r--devel/liblognorm/Makefile3
-rw-r--r--devel/liblouisxml/Makefile6
-rw-r--r--devel/libopensync/Makefile3
-rw-r--r--devel/liborcus/Makefile3
-rw-r--r--devel/libpafe/Makefile7
-rw-r--r--devel/libthai/Makefile3
-rw-r--r--devel/libtifiles2/Makefile3
-rw-r--r--devel/libwfut/Makefile9
-rw-r--r--devel/libxs/Makefile3
-rw-r--r--devel/lua-lgi/Makefile2
-rw-r--r--devel/lua-sysctl/Makefile2
-rw-r--r--devel/mercator/Makefile3
-rw-r--r--devel/ndesk-dbus-glib/Makefile9
-rw-r--r--devel/ndesk-dbus/Makefile9
-rw-r--r--devel/ndesk-options/Makefile2
-rw-r--r--devel/obby/Makefile9
-rw-r--r--devel/orbitcpp/Makefile8
-rw-r--r--devel/p5-ExtUtils-PkgConfig/Makefile2
-rw-r--r--devel/pkgconf/Makefile3
-rw-r--r--devel/pkgconf/distinfo4
-rw-r--r--devel/protobuf/Makefile3
-rw-r--r--devel/py-cld/Makefile2
-rw-r--r--devel/py-fusefs/Makefile3
-rw-r--r--devel/py-gobject/Makefile3
-rw-r--r--devel/py-gobject3/Makefile3
-rw-r--r--devel/py-orbit/Makefile2
-rw-r--r--devel/py-qt4-dbussupport/Makefile2
-rw-r--r--devel/qt4-corelib/Makefile2
-rw-r--r--devel/qt4-qt3support/Makefile2
-rw-r--r--devel/ros/Makefile2
-rw-r--r--devel/rpc2/Makefile8
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/rvm/Makefile8
-rw-r--r--devel/talloc/Makefile2
-rw-r--r--devel/tevent/Makefile2
-rw-r--r--devel/thunar-vcs-plugin/Makefile3
-rw-r--r--devel/ucommon/Makefile3
-rw-r--r--devel/valgrind-snapshot/Makefile3
-rw-r--r--devel/valgrind/Makefile3
-rw-r--r--devel/varconf/Makefile3
-rw-r--r--devel/vstr/Makefile9
-rw-r--r--devel/wininfo/Makefile8
-rw-r--r--devel/xfce4-dev-tools/Makefile8
-rw-r--r--devel/zziplib/Makefile7
97 files changed, 122 insertions, 261 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 07f53488181d..d11546542945 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -16,12 +16,12 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
+USES= pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack libidl ltverhack referencehack
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index f7b41fe4db55..11844f4a0c7d 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -20,9 +20,9 @@ CONFLICTS= ace+tao-5*
WRKSRC= ${WRKDIR}/ACE_wrappers
+USES= pkgconfig
USE_BZIP2= yes
USE_PERL5_BUILD=yes
-USE_PKGCONFIG= build
USE_GMAKE= yes
MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \
CROSS-COMPILE=1
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 9428b3d7333b..501314c368ae 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -11,10 +11,9 @@ MAINTAINER= nemysis@gmx.ch
COMMENT= Cross-platform library for games and multimedia programming
USE_GMAKE= yes
-USES= cmake
+USES= cmake pkgconfig
USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
WANT_GNOME= yes
USE_GL= gl glu
diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile
index cc7dbdb5d4a2..1ac71976c8d4 100644
--- a/devel/avro-c/Makefile
+++ b/devel/avro-c/Makefile
@@ -12,9 +12,8 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= g.veniamin@googlemail.com
COMMENT= Data serialization system for ANSI C
-USES= cmake
+USES= cmake pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c
diff --git a/devel/bufferpool/Makefile b/devel/bufferpool/Makefile
index 5d5b5b450bb2..12c8cca34634 100644
--- a/devel/bufferpool/Makefile
+++ b/devel/bufferpool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bufferpool
-# Date created: 7 November 2007
-# Whom: Emmanuel Richiardone (err@tollari.org)
-#
+# Created by: Emmanuel Richiardone (err@tollari.org)
# $FreeBSD$
-#
PORTNAME= bufferpool
PORTVERSION= 0.0.4
@@ -17,7 +13,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
-USES= pathfix
+USES= pathfix pkgconfig
.include <bsd.port.mk>
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index e4eac76a6196..b1a9dbf2abcb 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -26,10 +26,9 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
USE_GMAKE= yes
USE_GCC= 4.6+
USE_XORG= x11
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
USE_GL= yes
-USE_PKGCONFIG= yes
USE_SQLITE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile
index 117fa1351bab..bb1b5c6b00de 100644
--- a/devel/clanlib1/Makefile
+++ b/devel/clanlib1/Makefile
@@ -24,11 +24,10 @@ LATEST_LINK= ${PORTNAME}1
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_XORG= x11 xi
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
USE_SDL= gfx
USE_GL= yes
-USE_PKGCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
diff --git a/devel/clanlib22/Makefile b/devel/clanlib22/Makefile
index 2f54389b8825..5dfeb0fc67eb 100644
--- a/devel/clanlib22/Makefile
+++ b/devel/clanlib22/Makefile
@@ -26,10 +26,9 @@ LATEST_LINK= ${PORTNAME}22
USE_GMAKE= yes
USE_XORG= x11
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
USE_GL= yes
-USE_PKGCONFIG= yes
USE_SQLITE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 4a5a6bf437f7..bfb6168d009e 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -19,10 +19,10 @@ LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \
rsync:${PORTSDIR}/net/librsync
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
+USES= pkgconfig
USE_WX= 2.8
WANT_UNICODE= yes
USE_GNOME= gnomehack desktopfileutils
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index 34807ccf6776..8df796c7eb95 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: compiz-bcop
-# Date created: 2007-08-15
-# Whom: Robert Noland <rnoland@FreeBSD.org>
-#
+# Created by: Robert Noland <rnoland@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= compiz-bcop
PORTVERSION= 0.8.4
@@ -19,8 +15,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GNOME= libxslt
-USE_PKGCONFIG= yes
post-patch:
@${REINPLACE_CMD} \
diff --git a/devel/dbus-sharp-glib/Makefile b/devel/dbus-sharp-glib/Makefile
index 25cf4d44362d..a166f866e416 100644
--- a/devel/dbus-sharp-glib/Makefile
+++ b/devel/dbus-sharp-glib/Makefile
@@ -11,9 +11,8 @@ COMMENT= D-Bus for .NET: GLib integration module
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
.include <bsd.port.mk>
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 3f7c5ae03e5c..224398d5515b 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: dbus-sharp
-# Date Created: 20041011
-# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
#
@@ -19,8 +17,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.mk>
diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index de0ba19a8272..d387749d4f40 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -14,8 +14,8 @@ COMMENT= DeforaOS core system library
LICENSE= GPLv3
+USES= pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
MAKE_ARGS+= PREFIX=${PREFIX}
post-patch:
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index a9de60394431..203bc71a5127 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A couple of command line utilities for working with desktop entries
+USES= pkgconfig
USE_GNOME= glib20
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-lispdir
CONFIGURE_ENV= EMACS="no"
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index cc3fe0dce005..f9fecba84ab8 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for: dotconf
-# Date created: Jan 28, 2001
-# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= dotconf
PORTVERSION= 1.3
@@ -16,8 +11,7 @@ COMMENT= A simple, powerful configuration-file parser
LICENSE= LGPL21
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
index bb867a7b14ab..d548915481b9 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/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_file
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
index 96ad7dc427f7..02c5046890d4 100644
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_EFL= ecore libtool_hack
USE_EFL_ECORE= con
-USE_PKGCONFIG= yes
+USES= pkgconfig
USE_LDCONFIG= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_ipc
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 8b7dcd2f0eed..91d353f323bd 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -17,10 +17,9 @@ LICENSE= BSD
DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= eina libtool_hack
USE_ICONV= yes
-USE_PKGCONFIG= yes
USE_LDCONFIG= yes
EXAMPLESDIR= ${PREFIX}/share/examples/ecore
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 0d3e1072ffab..68006202b8a9 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= eina librt_hack libtool_hack
USE_OPENSSL= yes
-USE_PKGCONFIG= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" OPENSSL_LIBS="-lssl"
diff --git a/devel/eio/Makefile b/devel/eio/Makefile
index f19f8c308d3d..4372e72c7374 100644
--- a/devel/eio/Makefile
+++ b/devel/eio/Makefile
@@ -15,9 +15,8 @@ LICENSE= LGPL21
DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= eina eet ecore libtool_hack
-USE_PKGCONFIG= yes
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 8bb8f0561afa..b8ddaabe8be3 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
CXXFLAGS+= -include wchar.h
CONFIGURE_ARGS+="CXXFLAGS=${CXXFLAGS}"
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index aa1bf94c6652..3c3292f55f83 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -12,9 +12,9 @@ COMMENT= A generic game engine for 2D double-buffering animation
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_SDL= sdl mixer image
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 867761853f6e..77f60bb8edef 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -19,12 +19,12 @@ RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile \
INFO= g-wrap
+USES= pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack
-USE_PKGCONFIG= build
NOT_FOR_ARCHS= ia64 powerpc
CFLAGS+= -fPIC
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index e9e58c68c60b..02a0ab80ec7c 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES= http://people.gnome.org/~veillard/gamin/sources/
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A file and directory monitoring system
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME?= gnomehack _glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 9fa41cd66d17..6a1b5acad0a9 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS+= libtool
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME+= gtk20
# geany-plugins-l10n is not a plugin, thus special treatment
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index ed9061737c2d..80f59f8286c5 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -17,8 +17,7 @@ INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 6996cacb5c3f..cc6846d7aa99 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -23,7 +23,7 @@ USE_XZ= yes
BUILD_WRKSRC= ${WRKSRC}/gio/fam
INSTALL_WRKSRC= ${BUILD_WRKSRC}
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gnomehack _glib20
USE_FAM= yes
USE_GMAKE= yes
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 6eec3866c30a..d3bb365bb933 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -20,7 +20,7 @@ USE_JAVA= yes
JAVA_VERSION= 1.6+
JAVA_OS= native
USE_GNOME= gnomehack glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}
CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
GLIB_API_VERSION= 0.4
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 103dd28d82b6..125b60e1736e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT= yes
USE_ICONV= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GNOME= gnomehack ltverhack
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index c06dd5521015..a363355710af 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: glibmm-reference
-# Date created: 09 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
# $FreeBSD$
-#
PORTREVISION= 0
@@ -12,7 +8,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/gl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
DOCSDIR= ${PREFIX}/share/doc/glibmm-2.4
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index c1f48b20de6c..247b18a1cdaf 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack glib20 ltverhack libsigc++20
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PERL5= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
index dd3ffc668f78..6c471c7ceb01 100644
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: gnome-js-common
-# Date created: 19 July 2009
-# Whom: Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/devel/gnome-js-common/Makefile,v 1.3 2010/01/01 03:30:52 avl Exp $
-#
PORTNAME= gnome-js-common
PORTVERSION= 0.1.2
@@ -21,7 +17,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack intltool
-USE_PKGCONFIG= build
+USES= pkgconfig
PORTDOCS= AUTHORS COPYING INSTALL NEWS README ChangeLog
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index c2b1f5284c3d..9e3e9601be2c 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gob2
-# Date created: 09 November 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gob2
PORTVERSION= 2.0.17
@@ -17,7 +13,7 @@ COMMENT= A preprocessor for making GObjects with inline C
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 7df445f6dfd4..7d217ca64846 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -15,12 +15,11 @@ COMMENT= Generate interface introspection data for GObject libraries
BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo
LIB_DEPENDS= ffi.6:${PORTSDIR}/devel/libffi
-USES= bison pathfix
+USES= bison pathfix pkgconfig
USE_XZ= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehier glib20 ltverhack
-USE_PKGCONFIG= build
USE_PYTHON= -2.7
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 96aeacf2e02e..1f363108f101 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -15,12 +15,12 @@ RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11
LICENSE= LGPL21
+USES= pkgconfig
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
USE_GNOME= gnomehack intltool glib20
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 6a1ecbb1823f..dc0101015da5 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -20,12 +20,11 @@ OPTIONS_DEFINE= DOXYGEN MEMDEBUG
MEMDEBUG_DESC= Enable memory debugger statistic
.endif
+USES= pathfix pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
USE_OPENSSL= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-release="yes" \
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index f9b843a2ab5e..4e837cb4530e 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -13,8 +13,8 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
+USES= pkgconfig
USE_CABAL= glib>=0.12.0 mtl
-USE_PKGCONFIG= build
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index 266282782ce8..83af4b0354df 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -13,9 +13,9 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
+USES= pkgconfig
USE_CABAL= gtk2hs-buildtools
USE_GNOME= glib20
-USE_PKGCONFIG= build
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index bb0fadfa5bb6..851d22e0496b 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= pciaccess:${PORTSDIR}/devel/libpciaccess
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-static \
--enable-libxml2
+USES= pkgconfig
USE_BZIP2= yes
-USE_PKGCONFIG= build
USE_ICONV= yes
USE_LDCONFIG= yes
USE_GNOME= libxml2 gnomehack
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index e67d66400ec6..b661d8957ff3 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: jclassinfo
-# Date created: May 5, 2004
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= jclassinfo
PORTVERSION= 0.19.1
@@ -15,11 +10,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Shows information about Java class, dependencies, and more
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
MAN1= jclassinfo.1
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index f77eb3b36ee7..07f03730ed14 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: json-glib
-# Date created: 25 December 2008
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/devel/json-glib/Makefile,v 1.22 2012/09/01 23:02:09 mezz Exp $
-#
PORTNAME= json-glib
PORTVERSION= 0.14.2
@@ -17,10 +13,10 @@ COMMENT= JSON (RFC 4627) interface for Glib
BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+USES= pkgconfig
USE_GMAKE= yes
USE_XZ= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile
index 78e63dce8e20..87c8c13a94c6 100644
--- a/devel/jzmq/Makefile
+++ b/devel/jzmq/Makefile
@@ -11,11 +11,11 @@ COMMENT= Java bindings for ZeroMQ
LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq
+USES= pkgconfig
USE_AUTOTOOLS= autoconf:env libtool automake:env
USE_GMAKE= yes
USE_JAVA= 1.4+
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --with-zeromq=${LOCALBASE}
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index cc1d9206ccb7..b5ca50dbda4f 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -12,12 +12,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for creating trees of CORBA IDL files
-USES= bison pathfix
+USES= bison pathfix pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= glib20
-USE_PKGCONFIG= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 152e2f4e1cbb..0d94c8f4bf6b 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
USE_BZIP2= yes
USE_GCC= 4.6+
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
USE_GETTEXT= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-gmp\
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index ea985682aabe..bc35cce88366 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -12,9 +12,8 @@ MAINTAINER= rodrigo@bebik.net
COMMENT= An C++ networking library and application framework
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
PLIST_SUB= ASSA_VERSION=${PORTVERSION:R:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/(\.[[:digit:]])$//}
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 192405a79cd6..b0d48ffdae28 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -13,10 +13,10 @@ COMMENT= Devel Library to share image and audio files between projects
BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
+USES= pkgconfig
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2
-USE_PKGCONFIG= build
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index a29de4dc7791..c43240140bf7 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -18,14 +18,13 @@ USE_BZIP2= yes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USES= bison pathfix
+USES= bison pathfix pkgconfig
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_GNOME= intlhack libxml2 orbit2 referencehack
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile
index b9ecc3de7939..33b311e839f9 100644
--- a/devel/libcwd/Makefile
+++ b/devel/libcwd/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: libcwd
-# Date created: Nov 10, 2003
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= libcwd
PORTVERSION= 1.0.4
@@ -14,9 +9,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= The C++ Debugging Support Library
-USES= pathfix
+USES= pathfix pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-alloc --disable-location --disable-threading \
--disable-pch
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 356b8faf7feb..796dafa2f0a4 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS:= ${TEST_DEPENDS}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
PLIST_SUB= PORTVERSION=${PORTVERSION}
INFO= libffi
diff --git a/devel/libg19draw/Makefile b/devel/libg19draw/Makefile
index 805798b3050d..00a385396673 100644
--- a/devel/libg19draw/Makefile
+++ b/devel/libg19draw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libg19draw
-# Date created: Apr 15 2011
-# Whom: Armin Pirkovitsch <armin@frozen-zone.org>
-#
+# Created by: Armin Pirkovitsch <armin@frozen-zone.org>
# $FreeBSD$
-#
PORTNAME= libg19draw
PORTVERSION= 1.0.0
@@ -20,7 +16,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -pthread"
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
PLIST_FILES= include/libg19draw.h \
lib/libg19draw.a \
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 70dd8e3cf831..a6cc6f1bcccf 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -17,7 +17,7 @@ CONFIGURE_ARGS= --enable-introspection=yes
USE_GMAKE= yes
USE_XZ= yes
USE_GNOME= glib20 gnomehier gnomehack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/libgee06/Makefile b/devel/libgee06/Makefile
index 9c53f15af852..d139c1b87c49 100644
--- a/devel/libgee06/Makefile
+++ b/devel/libgee06/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS= --enable-introspection=yes
USE_GMAKE= yes
USE_XZ= yes
USE_GNOME= glib20 gnomehier gnomehack
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile
index be8e352edaa1..9ad99b786939 100644
--- a/devel/liblangtag/Makefile
+++ b/devel/liblangtag/Makefile
@@ -17,8 +17,7 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
.include <bsd.port.mk>
diff --git a/devel/liblognorm/Makefile b/devel/liblognorm/Makefile
index a86eb76d631f..36f45d40d071 100644
--- a/devel/liblognorm/Makefile
+++ b/devel/liblognorm/Makefile
@@ -13,8 +13,7 @@ LICENSE= GPLv2
LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \
estr:${PORTSDIR}/devel/libestr
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 173ae8479ccd..7a9f6825632e 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: liblouisxml
-# Date created: 06 Feb 2009
-# Whom: Wen Heping <wenheping@gmail.com>
+# Created by: Wen Heping <wenheping@gmail.com>
# $FreeBSD$
PORTNAME= liblouisxml
@@ -15,9 +13,9 @@ LIB_DEPENDS= louis.2:${PORTSDIR}/devel/liblouis \
xml2.5:${PORTSDIR}/textproc/libxml2
GNU_CONFIGURE= yes
+USES= pkgconfig
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
INFO= liblouisxml-guide
MAN1= msword2brl.1 xml2brl.1
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index a5ab3606603b..cfb4ed2a9c81 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= exslt:${PORTSDIR}/textproc/libxslt
CONFLICTS= libopensync-0.22*
USE_SQLITE= 3
-USE_PKGCONFIG= yes
USE_BZIP2= yes
-USES= cmake
+USES= cmake pkgconfig
CMAKE_ARGS+= -Wno-dev
USE_GNOME= glib20 libxml2
USE_PYTHON= yes
diff --git a/devel/liborcus/Makefile b/devel/liborcus/Makefile
index 27efce7973be..4861c84bef63 100644
--- a/devel/liborcus/Makefile
+++ b/devel/liborcus/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS= zip:${PORTSDIR}/archivers/libzip \
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
CONFIGURE_ARGS= --disable-spreadsheet-model --disable-werror \
--with-boost-system=boost_system
diff --git a/devel/libpafe/Makefile b/devel/libpafe/Makefile
index 2ec3720b7127..093973cbeabd 100644
--- a/devel/libpafe/Makefile
+++ b/devel/libpafe/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: libpafe
-# Date created: 21 February 2010
-# Whom: Hajimu UMEMOTO <ume@FreeBSD.org>
-#
+# Created by: Hajimu UMEMOTO <ume@FreeBSD.org>
# $FreeBSD$
PORTNAME= libpafe
@@ -18,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
PLIST_FILES= bin/felica_dump bin/pasori_test \
include/libpafe/felica_command.h \
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 984098f4afc2..947162157f10 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= datrie:${PORTSDIR}/devel/libdatrie
USE_XZ= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
OPTIONS_DEFINE= DOXYGEN
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 210b53b90f79..95d989ad254a 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -16,8 +16,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
OPTIONS_DEFINE= NLS
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index 6854f437aba1..cb0669a540b1 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libwfut
-# Date created: 4th April 2007
-# Whom: Oliver Lehmann
-#
+# Created by: Oliver Lehmann
# $FreeBSD$
-#
PORTNAME= libwfut
PORTVERSION= 0.2.2
@@ -18,8 +14,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
CONFIGURE_ARGS+=--without-python
GNU_CONFIGURE= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
MAN1= wfut.1
diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index a5ca767f0c3b..a3c6e1bc650b 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -10,8 +10,7 @@ MAINTAINER= g.veniamin@googlemail.com
COMMENT= Open source lightweight messaging layer
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
OPTIONS_DEFINE= DEBUG DOCS PLUGINS ZMQ
diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile
index 264b506653fc..95b1c85ac33d 100644
--- a/devel/lua-lgi/Makefile
+++ b/devel/lua-lgi/Makefile
@@ -15,9 +15,9 @@ USE_GITHUB= yes
GH_ACCOUNT= pavouk
GH_COMMIT= 1bbf1bc
+USES= pkgconfig
USE_LUA= 5.1+
USE_GMAKE= yes
-USE_PKGCONFIG= build
CPPFLAGS+= -I${LOCALBASE}/include/${LUA_SUBDIR}
diff --git a/devel/lua-sysctl/Makefile b/devel/lua-sysctl/Makefile
index a0efb9c0e1dd..317fe72f5246 100644
--- a/devel/lua-sysctl/Makefile
+++ b/devel/lua-sysctl/Makefile
@@ -8,7 +8,7 @@ MAINTAINER= lua@FreeBSD.org
COMMENT= A small sysctl(3) interface for lua
USE_GITHUB= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_LUA= yes
PLIST_FILES= %%LUA_MODSHAREDIR%%/sysctl.lua \
%%LUA_MODLIBDIR%%/sysctl/core.so
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index 281fbf52f9b0..a4d7556f91ed 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -11,8 +11,7 @@ COMMENT= A procedural terrain library
LIB_DEPENDS= wfmath-1.0.1:${PORTSDIR}/math/wfmath
-USES= pathfix
-USE_PKGCONFIG= yes
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
index a0ac96ac44cf..23845b694609 100644
--- a/devel/ndesk-dbus-glib/Makefile
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: ndesk-dbus-glib
-# Date created: 14 January 2008
-# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
-#
+# Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/devel/ndesk-dbus-glib/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $
-#
PORTNAME= ndesk-dbus-glib
PORTVERSION= 0.4.1
@@ -19,8 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/deve
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
USE_GMAKE= yes
-USE_PKGCONFIG= build
-USES= pathfix
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
DOCS= AUTHORS COPYING README
diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile
index 9cba9fd92626..857c09724a5b 100644
--- a/devel/ndesk-dbus/Makefile
+++ b/devel/ndesk-dbus/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: ndesk-dbus
-# Date created: 14 January 2008
-# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
-#
+# Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/devel/ndesk-dbus/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $
-#
PORTNAME= ndesk-dbus
PORTVERSION= 0.6.1a
@@ -18,8 +14,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
USE_GMAKE= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
DOCS= AUTHORS COPYING README
diff --git a/devel/ndesk-options/Makefile b/devel/ndesk-options/Makefile
index 18ce94082129..2d5116021bbe 100644
--- a/devel/ndesk-options/Makefile
+++ b/devel/ndesk-options/Makefile
@@ -12,7 +12,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
GNU_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_GMAKE= yes
post-patch:
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index eb1d1b1f235d..a7bfdc9c3ede 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: obby
-# Date created: 2005-10-14
-# Whom: Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
# $FreeBSD$
-#
PORTNAME= obby
PORTVERSION= 0.4.8
@@ -18,8 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
net6:${PORTSDIR}/net/net6
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 1f3a09966153..25cbe7c4640a 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: orbitcpp
-# Date created: 30 August 2001
-# Whom: Thomas Hentschel <thomas at hentschel dot net>
-#
+# Created by: Thomas Hentschel <thomas at hentschel dot net>
# $FreeBSD$
-#
PORTNAME= orbitcpp
PORTVERSION= 1.3.9
@@ -16,7 +12,7 @@ COMMENT= C++ bindings for ORBit, a CORBA 2.2-compliant ORB
USE_BZIP2= yes
USE_GNOME= gnomehack ltverhack orbit2
-USE_PKGCONFIG= build
+USES= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index 60c9c4ee102f..7d88fa9b74ad 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simplistic interface to pkg-config
LICENSE= LGPL3
-USE_PKGCONFIG= both
+USES= pkgconfig:both
PERL_CONFIGURE= yes
MAN3= ExtUtils::PkgConfig.3
diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
index 222a2a13618e..f7aae6899665 100644
--- a/devel/pkgconf/Makefile
+++ b/devel/pkgconf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pkgconf
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.9.2
CATEGORIES= devel
MASTER_SITES= http://rabbit.dereferenced.org/~nenolod/distfiles/ \
http://files.etoilebsd.net/pkgconf/
diff --git a/devel/pkgconf/distinfo b/devel/pkgconf/distinfo
index 4ed17e69110a..914f4a1febfc 100644
--- a/devel/pkgconf/distinfo
+++ b/devel/pkgconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkgconf-0.9.1.tar.bz2) = 8fafb60fab89b8f8c5407370bbb6b00ab70778d9f6336f388a37803a9907f936
-SIZE (pkgconf-0.9.1.tar.bz2) = 82129
+SHA256 (pkgconf-0.9.2.tar.bz2) = e8c7ea4f12823383d2c95580d4497bd085aa10ce5979b6d22307b52febc4bfd3
+SIZE (pkgconf-0.9.2.tar.bz2) = 82140
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index aa306f178a53..d01ab982d9d2 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -13,8 +13,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
-USES+= pathfix
+USES= pathfix pkgconfig
ONLY_FOR_ARCHS= i386 amd64
tests: build
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index 92f8a6d21c33..d87cc6a41a16 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -16,7 +16,7 @@ LICENSE= BSD
LIB_DEPENDS= cld:${PORTSDIR}/devel/cld
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= chromium_compact_language_detector
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 8afe731abcb0..5ccd55e78de9 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -11,9 +11,8 @@ DISTNAME= fuse-python-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE Python bindings
-USES= fuse
+USES= fuse pkgconfig
USE_PYTHON= yes
-USE_PKGCONFIG= yes
USE_PYDISTUTILS=easy_install
USE_ICONV= yes
PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 7e2b7a35b643..3eb3b64ed50d 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -24,12 +24,11 @@ LIB_DEPENDS+= ffi:${PORTSDIR}/devel/libffi
RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-USES= pathfix
+USES= pathfix pkgconfig
USE_XZ= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_PYTHON= 2.5+
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-docs --disable-introspection --with-ffi
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index e15e9e4c0fd4..0809cccc94ab 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -26,10 +26,9 @@ RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}3
USE_XZ= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_GNOME= glib20
USE_PYTHON= 2.5+
-USE_PKGCONFIG= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 75a54dc9e209..f68d4b177e97 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -16,10 +16,10 @@ COMMENT= Python bindings for ORBit2
CONFLICTS= py*-omniorb-[0-9]*
+USES= pkgconfig
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack orbit2
-USE_PKGCONFIG= build
USE_PYTHON= yes
GNU_CONFIGURE= yes
ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index ecebc089ba26..9fb272cc0998 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_PYTHON= 2.5+
USE_QT4= corelib qmake_build moc_build
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index cb57b70b0cd2..136d5b5c3e53 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -12,9 +12,9 @@ COMMENT= Qt core library
LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu
+USES= pkgconfig
USE_GNOME= _glib20
USE_GCC= any
-USE_PKGCONFIG= build
USE_QT4= qmake_build moc_build
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 59d3b404b71b..f831270cf775 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt3 compatibility library
-USE_PKGCONFIG= build
+USES= pkgconfig
USE_QT4= qmake_build moc_build corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/ros/Makefile b/devel/ros/Makefile
index 180acdc0917b..29bc70f59cd6 100644
--- a/devel/ros/Makefile
+++ b/devel/ros/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml \
USE_PYTHON= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
# rosmake does its own threading
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 408848a738b8..2a1eb2284d2a 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rpc2
-# Date created: Wed Mar 22 19:06:45 EST 2000
-# Whom: jaharkes
-#
+# Created by: jaharkes
# $FreeBSD$
-#
PORTNAME= rpc2
PORTVERSION= 2.10
@@ -18,8 +14,8 @@ COMMENT= An interprocess communication library
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
+USES= pkgconfig
USE_GMAKE= yes
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 1e40145b0e6a..cf164618a839 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -13,8 +13,8 @@ LICENSE= LGPL20
OPTIONS_DEFINE= DOCS
+USES= pkgconfig
USE_OPENSSL= yes
-USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLINC} \
--with-ssl-libs=-L${OPENSSLLIB} \
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index b57a9491f454..e7ae919bcaa2 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rvm
-# Date created: Thu Apr 6 21:30:52 EDT 2000
-# Whom: jaharkes
-#
+# Created by: jaharkes
# $FreeBSD$
-#
PORTNAME= rvm
PORTVERSION= 1.17
@@ -18,10 +14,10 @@ COMMENT= A persistent VM library
LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp
+USES= pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 9b5797ac4481..8178a549002e 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -15,13 +15,13 @@ LICENSE= LGPL3
CONFLICTS= samba33-3.*
+USES= pkgconfig
USE_PYTHON_BUILD= -2.7
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
WAF_TOOL= buildtools/bin/waf
CONFIGURE_SCRIPT= ${WAF_TOOL} configure
CONFIGURE_LOG= bin/config.log
-USE_PKGCONFIG= build
MAKE_JOBS_SAFE= yes
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index d0d15ea9c882..33d060f6e8b1 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -21,7 +21,7 @@ HAS_CONFIGURE= yes
WAF_TOOL= buildtools/bin/waf
CONFIGURE_SCRIPT= ${WAF_TOOL} configure
CONFIGURE_LOG= bin/config.log
-USE_PKGCONFIG= build
+USES= pkgconfig
MAKE_JOBS_SAFE= yes
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 3aaaa4d9fa23..74ddd2e50155 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -1,6 +1,5 @@
# Created by: Sergey V. Dyatko <sergey.dyatko@gmail.com>
# $FreeBSD$
-#
PORTNAME= thunar-vcs-plugin
PORTVERSION= 0.1.4
@@ -20,7 +19,7 @@ GNU_CONFIGURE= yes
USE_GNOME= desktopfileutils gnomehack gtk20 glib20 intltool intlhack
USE_XFCE= configenv libexo libutil thunar
INSTALLS_ICONS= yes
-USE_PKGCONFIG= build
+USES= pkgconfig
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index b5e4c4cea47c..6440a19fef71 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -12,9 +12,8 @@ COMMENT= Very lightweight C++ design pattern library
LICENSE= LGPL3
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--bindir=${PREFIX}/bin/${PORTNAME}
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile
index e7fc4dba8fe0..078d53a260cd 100644
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@@ -35,11 +35,10 @@ MPI_DESC= Enable build of MPI wrappers
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 6ddf9ba62cf7..2eab91b3cb73 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -33,11 +33,10 @@ MPI_DESC= Enable build of MPI wrappers
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index a50424b5652f..6c7b994ef80f 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -13,8 +13,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USES= pathfix
-USE_PKGCONFIG= build
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
.include <bsd.port.options.mk>
diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile
index 424bf158696e..2f2ae6619e46 100644
--- a/devel/vstr/Makefile
+++ b/devel/vstr/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: vstr
-# Date created: 11 February 2004
-# Whom: Robert Schlotterbeck <robert@rs.tarrant.tx.us>
-#
+# Created by: Robert Schlotterbeck <robert@rs.tarrant.tx.us>
# $FreeBSD$
-#
PORTNAME= vstr
PORTVERSION= 1.0.15
@@ -21,9 +17,8 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_CSTD= gnu89
-USES= pathfix
+USES= pathfix pkgconfig
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
MAN3= vstr.3 vstr_const.3
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index 9c97d0a8825b..ece28361c108 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: X Window Information
-# Date created: 11 Jun 2004
-# Whom: Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
# $FreeBSD$
-#
PORTNAME= wininfo
PORTVERSION= 0.7
@@ -18,7 +14,7 @@ USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \
xcomposite x11 xres
USE_GNOME= gtk20 gnomeprefix
GNU_CONFIGURE= yes
-USE_PKGCONFIG= yes
+USES= pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index a13614f3bf0c..15616edf6998 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfce4-dev-tools
-# Date created: 19 April 2006
-# Whom: Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xfce4-dev-tools
PORTVERSION= 4.10.0
@@ -20,6 +16,6 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined
USE_GNOME= glib20
-USE_PKGCONFIG= build
+USES= pkgconfig
.include <bsd.port.mk>
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 9c009f9fbcf9..640331482f3e 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for: zziplib
-# Date created: 3 January 2001
-# Whom: George Reid <greid@ukug.uk.freebsd.org>
+# Created by: George Reid <greid@ukug.uk.freebsd.org>
#
# $FreeBSD$
#
@@ -21,10 +19,9 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
OPTIONS_DEFINE= SDL
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_PYTHON_BUILD= yes
USE_AUTOTOOLS= libtool
-USE_PKGCONFIG= yes
CONFIGURE_ENV= ac_cv_path_XMLTO=":"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes