Change path from devel/pkgconfig to devel/pkg-config.

No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.

44 files changed, 88 insertions, 88 deletions

diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 47c51c4ad16..86debc557c6 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	ArX-1.0.20
@@ -40,7 +40,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR}
 .endfor
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile
index 48f170f2648..3e369086a78 100644
--- a/devel/ArX2/Makefile
+++ b/devel/ArX2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/12 18:57:05 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	ArX-2.2.2
@@ -42,6 +42,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR}
 .endfor
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 261532bf9b3..4f9bfc67eea 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.30 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=		GConf-2.10.0
@@ -34,4 +34,4 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 831f96c03c1..9e75d49d447 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=		at-spi-1.6.3
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+=    libspi-1.0.pc.in
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 80fc521649b..dcb8f03943d 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:48 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=		atk-1.10.1
@@ -31,6 +31,6 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/blib/Makefile b/devel/blib/Makefile
index 3bf978ed344..c4a12a7e9d2 100644
--- a/devel/blib/Makefile
+++ b/devel/blib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=		blib-1.0.2
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--disable-directfb
 post-extract:
 	${TOUCH} ${WRKSRC}/modules/libtool
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 457e0041ad4..7938fb2c08a 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	coconut-0.3.0
@@ -23,7 +23,7 @@ MAKE_ENV+=	AM_MAKEFLAGS="am__depfiles_maybe="
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/gnet1/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index e608a234493..428c8825b1c 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $
 
 DISTNAME=		devhelp-0.7
 PKGREVISION=		11
@@ -25,7 +25,7 @@ BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 1c5bbfd9380..65dfc0108db 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:46 wiz Exp $
 
 DISTNAME=	eel-2.10.1
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -27,7 +27,7 @@ PKGCONFIG_OVERRIDE=	eel-2.0.pc.in
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 29a538717e9..c2fa4f4752f 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	eet-0.9.9
@@ -16,7 +16,7 @@ USE_LIBTOOL=	YES
 
 PKGCONFIG_OVERRIDE=	eet.pc.in
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index a42d170a52d..7cb92ce77da 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:46 wiz Exp $
 
 DISTNAME=	g-wrap-1.9.6
 CATEGORIES=	devel
@@ -23,6 +23,6 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws
 
 .include "../../devel/glib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index 5f79405ebe5..ce60610e845 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	gail-1.8.4
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 4244d2d35b4..132e42cbbec 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:46 wiz Exp $
 #
 # Check the API before updating this package!  gal-2.5 and above should
 # get their own gal26 package!
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile
index 7c7dd93dfdc..340523a4f73 100644
--- a/devel/gal20/Makefile
+++ b/devel/gal20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	gal-1.99.11
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index e48fa53b231..7c085a4fe06 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=	gconfmm-2.0.2
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE=	gconf/gconfmm-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gconf/gconfmm-2.0-uninstalled.pc.in
 
 .include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 # gtkmm must be 2.0/2.2
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index b5329b0e799..99090453e4e 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $
 #
 
 DISTNAME=		gconfmm-2.6.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/glibmm24/buildlink3.mk"
 .include "../../x11/gtkmm24/buildlink3.mk"
diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common
index ef44ea52f45..ad61851d79d 100644
--- a/devel/glade2/Makefile.common
+++ b/devel/glade2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/07/21 16:29:46 wiz Exp $
 
 DISTNAME=	glade-2.10.0
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -21,7 +21,7 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index ed602469e80..e31f0ef7645 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2005/07/21 16:29:46 wiz Exp $
 
 DISTNAME=		glib-2.6.5
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -74,7 +74,7 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/devel/glibmm24/Makefile b/devel/glibmm24/Makefile
index 06b5f10268b..2f16a23625e 100644
--- a/devel/glibmm24/Makefile
+++ b/devel/glibmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:47 wiz Exp $
 
 DISTNAME=	glibmm-2.4.5
 PKGNAME=	glibmm24-2.4.5
@@ -19,5 +19,5 @@ USE_LANGUAGES=		c c++
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsigc++2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index 292357f3681..379d221e8b8 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:47 wiz Exp $
 #
 
 DISTNAME=		libole2-2.2.8
@@ -19,6 +19,6 @@ USE_LIBTOOL=		YES
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 7f6b5fed4c0..5bbf7aa69ba 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:47 wiz Exp $
 #
 
 DISTNAME=	gob2-2.0.11
@@ -13,5 +13,5 @@ COMMENT=	GNOME object builder for glib2
 GNU_CONFIGURE=	YES
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 35a5bb75cd9..73fe748a17b 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/06/25 01:23:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:47 wiz Exp $
 
 DISTNAME=		libbonobo-2.8.1
 PKGREVISION=		1
@@ -37,7 +37,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 0063a9dc396..a36a029f6a8 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:47 wiz Exp $
 #
 
 DISTNAME=	libbonoboui-2.8.1
@@ -31,7 +31,7 @@ BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.8.1
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 55ced764ad9..39a09201fe6 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/18 16:11:52 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:47 wiz Exp $
 #
 
 DISTNAME=	libgail-gnome-1.1.1
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE=	libgail-gnome.pc.in
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 85fa1b2e660..68452471560 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/06 18:37:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libglade-2.5.1
@@ -33,7 +33,7 @@ post-install:
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libglademm20/Makefile b/devel/libglademm20/Makefile
index b61a4d2e47b..86669217ffb 100644
--- a/devel/libglademm20/Makefile
+++ b/devel/libglademm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libglademm-2.2.0
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 # gtkmm must be 2.0/2.2
 .include "../../x11/gtkmm/buildlink3.mk"
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 7a579905f9b..a8a4d795cff 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libglademm-2.4.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../x11/gtkmm24/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index f5f3468e35c..dabe4c44274 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=	libgnome-2.10.0
@@ -58,7 +58,7 @@ GCONF2_SCHEMAS+=	desktop_gnome_typing_break.schemas
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/devel/libgnomemm20/Makefile b/devel/libgnomemm20/Makefile
index 4a4f25e1f9d..3a49ec6a53b 100644
--- a/devel/libgnomemm20/Makefile
+++ b/devel/libgnomemm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libgnomemm-2.0.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 # gtkmm must be 2.0/2.2
 .include "../../x11/gtkmm/buildlink3.mk"
diff --git a/devel/libgnomemm26/Makefile b/devel/libgnomemm26/Makefile
index 59698e8801a..7bef63a5ed1 100644
--- a/devel/libgnomemm26/Makefile
+++ b/devel/libgnomemm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libgnomemm-2.6.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../x11/gtkmm24/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index b6bf93798c1..6503ee631cb 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=	libgnomeui-2.10.0
@@ -45,7 +45,7 @@ post-configure:
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/devel/libgnomeuimm20/Makefile b/devel/libgnomeuimm20/Makefile
index 1c891c637ce..1ea726aa17a 100644
--- a/devel/libgnomeuimm20/Makefile
+++ b/devel/libgnomeuimm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libgnomeuimm-2.0.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgnomemm20/buildlink3.mk"
 .include "../../graphics/libgnomecanvasmm20/buildlink3.mk"
diff --git a/devel/libgnomeuimm26/Makefile b/devel/libgnomeuimm26/Makefile
index 777e30fd822..4ce7d501b3b 100644
--- a/devel/libgnomeuimm26/Makefile
+++ b/devel/libgnomeuimm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libgnomeuimm-2.6.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgnomemm26/buildlink3.mk"
 .include "../../graphics/libgnomecanvasmm26/buildlink3.mk"
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index 0ab109dfa70..8e9789d3a2e 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/19 17:24:27 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=	libgphoto2-2.1.6
@@ -26,6 +26,6 @@ PLIST_SUBST+=		HAVE_LIBUSB="@comment"
 .include "../../devel/libusb/buildlink3.mk"
 PLIST_SUBST+=		HAVE_LIBUSB=""
 .endif
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 94d4657ae36..4b2f138fb78 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/24 21:28:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=	libgsf-1.12.1
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/libgsf
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index a7e5c682b5e..5cb072bd2a5 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/31 17:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libidn-0.5.17
@@ -22,6 +22,6 @@ INFO_FILES=		libidn.info
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 428738eaf01..602ffad56e0 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=	libmatchbox-1.6
@@ -13,7 +13,7 @@ COMMENT=	Library for matchbox window manager for computers with small displays
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile
index bd7d4d2d0f9..35b583cb1e9 100644
--- a/devel/libntlm/Makefile
+++ b/devel/libntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:48 wiz Exp $
 #
 
 DISTNAME=		libntlm-0.3.6
@@ -15,5 +15,5 @@ USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE+=    libntlm.pc.in
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index be8a41aace1..562d9756a83 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:48 wiz Exp $
 
 DISTNAME=	libstatgrab-0.11
 CATEGORIES=	devel
@@ -40,5 +40,5 @@ PLIST_SUBST+=		SAIDAR=""
 .include "../../devel/ncurses/buildlink3.mk"
 .endif
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 43ae4a8b15f..64b39cb1ed6 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:49 wiz Exp $
 #
 
 DISTNAME=	libwnck-2.10.0
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 6aa3261f082..f37e206343f 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+=    OGRE.pc.in
 
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index 35bea38e9e5..f04b0c1237a 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:49 wiz Exp $
 #
 
 DISTNAME=	ExtUtils-PkgConfig-1.06
@@ -16,6 +16,6 @@ PERL5_REQD=	5.8
 
 PERL5_PACKLIST=	auto/ExtUtils/PkgConfig/.packlist
 
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile
index 23297c06b5d..2fde0b290d6 100644
--- a/devel/p5-glib2/Makefile
+++ b/devel/p5-glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:49 wiz Exp $
 #
 
 DISTNAME=	Glib-${DIST_VERSION}
@@ -25,6 +25,6 @@ DIST_VERSION=	1.040
 PERL5_PACKLIST=	auto/Glib/.packlist
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 6f64e21fa08..1f81bc94ed9 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/07/21 16:29:49 wiz Exp $
 #
 
 DISTNAME=		pango-1.8.1
@@ -38,7 +38,7 @@ BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/pkg-config/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"