Regenerate (fix dependency to pkgconfig).

26 files changed, 50 insertions, 89 deletions

diff --git a/audio/xfce4-mixer/buildlink2.mk b/audio/xfce4-mixer/buildlink2.mk
index 4a1172c0acb..137b3bc8743 100644
--- a/audio/xfce4-mixer/buildlink2.mk
+++ b/audio/xfce4-mixer/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:25:58 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mixer.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_MIXER_BUILDLINK2_MK)
@@ -16,11 +16,9 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-mixer=xfce4-mixer
 BUILDLINK_PREFIX.xfce4-mixer_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-mixer+=	lib/xfce4/panel-plugins/libmixer.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-mixer-buildlink
 
diff --git a/graphics/xfce4-artwork/buildlink2.mk b/graphics/xfce4-artwork/buildlink2.mk
index 0f9174304b6..3d509f91d85 100644
--- a/graphics/xfce4-artwork/buildlink2.mk
+++ b/graphics/xfce4-artwork/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:27:37 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-artwork.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_ARTWORK_BUILDLINK2_MK)
@@ -17,7 +17,6 @@ BUILDLINK_PREFIX.xfce4-artwork_DEFAULT=	${X11PREFIX}
 
 .include "../../x11/xfce4-desktop/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-artwork-buildlink
 
diff --git a/graphics/xfce4-iconbox/buildlink2.mk b/graphics/xfce4-iconbox/buildlink2.mk
index 97ed4c19649..9af87482e43 100644
--- a/graphics/xfce4-iconbox/buildlink2.mk
+++ b/graphics/xfce4-iconbox/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:52:41 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-iconbox.
 #
diff --git a/meta-pkgs/xfce4/buildlink2.mk b/meta-pkgs/xfce4/buildlink2.mk
index 868d2a73038..a31df9e61de 100644
--- a/meta-pkgs/xfce4/buildlink2.mk
+++ b/meta-pkgs/xfce4/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:29:53 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_BUILDLINK2_MK)
@@ -36,7 +36,6 @@ BUILDLINK_PREFIX.xfce4_DEFAULT=	${X11PREFIX}
 .include "../../x11/xfce4-toys/buildlink2.mk"
 .include "../../x11/xfce4-trigger-launcher/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-buildlink
 
diff --git a/print/xfce4-print/buildlink2.mk b/print/xfce4-print/buildlink2.mk
index d50fd599ef4..1fc6f372ae4 100644
--- a/print/xfce4-print/buildlink2.mk
+++ b/print/xfce4-print/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:31:32 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-print.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_PRINT_BUILDLINK2_MK)
@@ -16,10 +16,8 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-print=xfce4-print
 BUILDLINK_PREFIX.xfce4-print_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-print+=	lib/libxfprint.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-print-buildlink
 
diff --git a/sysutils/xfce4-fm-icons/buildlink2.mk b/sysutils/xfce4-fm-icons/buildlink2.mk
index 8957acb15be..2c525cd4fc0 100644
--- a/sysutils/xfce4-fm-icons/buildlink2.mk
+++ b/sysutils/xfce4-fm-icons/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:33:05 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm-icons.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_FM_ICONS_BUILDLINK2_MK)
@@ -17,7 +17,6 @@ BUILDLINK_PREFIX.xfce4-fm-icons_DEFAULT=	${X11PREFIX}
 
 .include "../../sysutils/xfce4-fm/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-fm-icons-buildlink
 
diff --git a/sysutils/xfce4-fm/buildlink2.mk b/sysutils/xfce4-fm/buildlink2.mk
index b17d2150f26..18a493bf4db 100644
--- a/sysutils/xfce4-fm/buildlink2.mk
+++ b/sysutils/xfce4-fm/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:32:34 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_FM_BUILDLINK2_MK)
@@ -27,11 +27,9 @@ BUILDLINK_FILES.xfce4-fm+=	lib/pkgconfig/xffm-1.0.pc
 BUILDLINK_FILES.xfce4-fm+=	lib/xfce4/mcs-plugins/libxffmsettings.*
 
 .include "../../databases/dbh/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-fm-buildlink
 
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink2.mk b/sysutils/xfce4-minicmd-plugin/buildlink2.mk
index 37b0ae38c59..856d3977519 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink2.mk
+++ b/sysutils/xfce4-minicmd-plugin/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:33:36 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-minicmd-plugin.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_MINICMD_PLUGIN_BUILDLINK2_MK)
@@ -18,7 +18,6 @@ BUILDLINK_FILES.xfce4-minicmd-plugin+=	lib/xfce4/panel-plugins/libminicmd.*
 
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-minicmd-plugin-buildlink
 
diff --git a/sysutils/xfce4-netload-plugin/buildlink2.mk b/sysutils/xfce4-netload-plugin/buildlink2.mk
index a4ad0f39910..d9c4fc02ac0 100644
--- a/sysutils/xfce4-netload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:34:18 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-netload-plugin.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_NETLOAD_PLUGIN_BUILDLINK2_MK)
@@ -18,7 +18,6 @@ BUILDLINK_FILES.xfce4-netload-plugin+=	lib/xfce4/panel-plugins/libnetload.*
 
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-netload-plugin-buildlink
 
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk b/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
index 47a01ff5123..169c9ac4fcb 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:34:53 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-showdesktop-plugin.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK2_MK)
@@ -18,7 +18,6 @@ BUILDLINK_FILES.xfce4-showdesktop-plugin+=	lib/xfce4/panel-plugins/libshowdeskto
 
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-showdesktop-plugin-buildlink
 
diff --git a/sysutils/xfce4-systemload-plugin/buildlink2.mk b/sysutils/xfce4-systemload-plugin/buildlink2.mk
index 6aef9ec8390..0586ea3a9f8 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:35:33 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systemload-plugin.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK2_MK)
@@ -18,7 +18,6 @@ BUILDLINK_FILES.xfce4-systemload-plugin+=	lib/xfce4/panel-plugins/libsystemload.
 
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-systemload-plugin-buildlink
 
diff --git a/sysutils/xfce4-systray/buildlink2.mk b/sysutils/xfce4-systray/buildlink2.mk
index 915407b6cc8..02d752015fe 100644
--- a/sysutils/xfce4-systray/buildlink2.mk
+++ b/sysutils/xfce4-systray/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:36:06 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systray.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_SYSTRAY_BUILDLINK2_MK)
@@ -16,11 +16,9 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systray=xfce4-systray
 BUILDLINK_PREFIX.xfce4-systray_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-systray+=	lib/xfce4/panel-plugins/libsystray.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-systray-buildlink
 
diff --git a/wm/xfce4-wm-themes/buildlink2.mk b/wm/xfce4-wm-themes/buildlink2.mk
index 8cb177769ae..16ab06b140c 100644
--- a/wm/xfce4-wm-themes/buildlink2.mk
+++ b/wm/xfce4-wm-themes/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:52:41 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-wm-themes.
 #
diff --git a/wm/xfce4-wm/buildlink2.mk b/wm/xfce4-wm/buildlink2.mk
index be57bb34f46..3b255f79d61 100644
--- a/wm/xfce4-wm/buildlink2.mk
+++ b/wm/xfce4-wm/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:37:59 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-wm.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_WM_BUILDLINK2_MK)
@@ -17,12 +17,10 @@ BUILDLINK_PREFIX.xfce4-wm_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-wm+=	lib/xfce4/mcs-plugins/margins_plugin.*
 BUILDLINK_FILES.xfce4-wm+=	lib/xfce4/mcs-plugins/xfwm4_plugin.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../x11/startup-notification/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-wm-buildlink
 
diff --git a/x11/libxfce4gui/buildlink2.mk b/x11/libxfce4gui/buildlink2.mk
index 9b5e53f27fc..a54e7250d8d 100644
--- a/x11/libxfce4gui/buildlink2.mk
+++ b/x11/libxfce4gui/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:40:06 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use libxfce4gui.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(LIBXFCE4GUI_BUILDLINK2_MK)
@@ -47,11 +47,9 @@ BUILDLINK_FILES.libxfce4gui+=	include/xfce4/libxfcegui4/xinerama.h
 BUILDLINK_FILES.libxfce4gui+=	lib/libxfcegui4.*
 BUILDLINK_FILES.libxfce4gui+=	lib/pkgconfig/libxfcegui4-1.0.pc
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/libxfce4util/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libxfce4gui-buildlink
 
diff --git a/x11/libxfce4mcs/buildlink2.mk b/x11/libxfce4mcs/buildlink2.mk
index d2636da2daf..561e96efac9 100644
--- a/x11/libxfce4mcs/buildlink2.mk
+++ b/x11/libxfce4mcs/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:40:37 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use libxfce4mcs.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(LIBXFCE4MCS_BUILDLINK2_MK)
@@ -22,10 +22,8 @@ BUILDLINK_FILES.libxfce4mcs+=	lib/libxfce4mcs-manager.*
 BUILDLINK_FILES.libxfce4mcs+=	lib/pkgconfig/libxfce4mcs-client-1.0.pc
 BUILDLINK_FILES.libxfce4mcs+=	lib/pkgconfig/libxfce4mcs-manager-1.0.pc
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/libxfce4util/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libxfce4mcs-buildlink
 
diff --git a/x11/libxfce4util/buildlink2.mk b/x11/libxfce4util/buildlink2.mk
index ab7aac56547..bbbe2cdd3d2 100644
--- a/x11/libxfce4util/buildlink2.mk
+++ b/x11/libxfce4util/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:41:17 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use libxfce4util.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(LIBXFCE4UTIL_BUILDLINK2_MK)
@@ -22,7 +22,6 @@ BUILDLINK_FILES.libxfce4util+=	lib/libxfce4util.*
 BUILDLINK_FILES.libxfce4util+=	lib/pkgconfig/libxfce4util-1.0.pc
 
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libxfce4util-buildlink
 
diff --git a/x11/xfce4-desktop/buildlink2.mk b/x11/xfce4-desktop/buildlink2.mk
index fc74e210fec..63614396f3f 100644
--- a/x11/xfce4-desktop/buildlink2.mk
+++ b/x11/xfce4-desktop/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:41:56 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-desktop.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_DESKTOP_BUILDLINK2_MK)
@@ -17,12 +17,10 @@ BUILDLINK_PREFIX.xfce4-desktop_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-desktop+=	lib/xfce4/mcs-plugins/backdrop_settings.*
 BUILDLINK_FILES.xfce4-desktop+=	lib/xfce4/mcs-plugins/workspaces_settings.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../x11/startup-notification/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-desktop-buildlink
 
diff --git a/x11/xfce4-gtk2-engines/buildlink2.mk b/x11/xfce4-gtk2-engines/buildlink2.mk
index 877d98afc59..e9212a5a578 100644
--- a/x11/xfce4-gtk2-engines/buildlink2.mk
+++ b/x11/xfce4-gtk2-engines/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:42:32 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-gtk2-engine.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_GTK2_ENGINE_BUILDLINK2_MK)
@@ -18,7 +18,6 @@ BUILDLINK_FILES.xfce4-gtk2-engine+=	lib/gtk-2.0/2.2.0/engines/libxfce.*
 
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-gtk2-engine-buildlink
 
diff --git a/x11/xfce4-mcs-manager/buildlink2.mk b/x11/xfce4-mcs-manager/buildlink2.mk
index b8a4342c7a2..dcf2f16eb98 100644
--- a/x11/xfce4-mcs-manager/buildlink2.mk
+++ b/x11/xfce4-mcs-manager/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:42:59 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mcs-manager.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_MCS_MANAGER_BUILDLINK2_MK)
@@ -17,11 +17,9 @@ BUILDLINK_PREFIX.xfce4-mcs-manager_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-mcs-manager+=	include/xfce4/xfce-mcs-manager/manager-plugin.h
 BUILDLINK_FILES.xfce4-mcs-manager+=	lib/pkgconfig/xfce-mcs-manager.pc
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/libxfce4gui/buildlink2.mk"
 .include "../../x11/libxfce4mcs/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-mcs-manager-buildlink
 
diff --git a/x11/xfce4-mcs-plugins/buildlink2.mk b/x11/xfce4-mcs-plugins/buildlink2.mk
index f6a1329ba3b..67a8179cf23 100644
--- a/x11/xfce4-mcs-plugins/buildlink2.mk
+++ b/x11/xfce4-mcs-plugins/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:44:38 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mcs-plugins.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_MCS_PLUGINS_BUILDLINK2_MK)
@@ -18,10 +18,8 @@ BUILDLINK_FILES.xfce4-mcs-plugins+=	lib/xfce4/mcs-plugins/keyboard_plugin.*
 BUILDLINK_FILES.xfce4-mcs-plugins+=	lib/xfce4/mcs-plugins/mouse_plugin.*
 BUILDLINK_FILES.xfce4-mcs-plugins+=	lib/xfce4/mcs-plugins/ui_plugin.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/xfce4-mcs-manager/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-mcs-plugins-buildlink
 
diff --git a/x11/xfce4-panel/buildlink2.mk b/x11/xfce4-panel/buildlink2.mk
index 04fed7a3e3c..a6383b79e00 100644
--- a/x11/xfce4-panel/buildlink2.mk
+++ b/x11/xfce4-panel/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:58:02 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-panel.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_PANEL_BUILDLINK2_MK)
@@ -33,12 +33,10 @@ BUILDLINK_FILES.xfce4-panel+=	lib/xfce4/panel-plugins/libseparator.*
 BUILDLINK_FILES.xfce4-panel+=	lib/xfce4/panel-plugins/libswitcher.*
 BUILDLINK_FILES.xfce4-panel+=	lib/xfce4/panel-plugins/libsystembuttons.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../x11/startup-notification/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-panel-buildlink
 
diff --git a/x11/xfce4-themes/buildlink2.mk b/x11/xfce4-themes/buildlink2.mk
index 3d318e8f743..a40e3198661 100644
--- a/x11/xfce4-themes/buildlink2.mk
+++ b/x11/xfce4-themes/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:58:25 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-themes.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_THEMES_BUILDLINK2_MK)
@@ -15,11 +15,9 @@ BUILDLINK_PKGSRCDIR.xfce4-themes?=		../../x11/xfce4-themes
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-themes=xfce4-themes
 BUILDLINK_PREFIX.xfce4-themes_DEFAULT=	${X11PREFIX}
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-themes-buildlink
 
diff --git a/x11/xfce4-toys/buildlink2.mk b/x11/xfce4-toys/buildlink2.mk
index ba750bc4fa6..4aefe5ebaee 100644
--- a/x11/xfce4-toys/buildlink2.mk
+++ b/x11/xfce4-toys/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:58:49 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-toys.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_TOYS_BUILDLINK2_MK)
@@ -16,11 +16,9 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-toys=xfce4-toys
 BUILDLINK_PREFIX.xfce4-toys_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-toys+=	lib/xfce4/panel-plugins/libeyes.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-toys-buildlink
 
diff --git a/x11/xfce4-trigger-launcher/buildlink2.mk b/x11/xfce4-trigger-launcher/buildlink2.mk
index c6149a242d5..8d1891ddf18 100644
--- a/x11/xfce4-trigger-launcher/buildlink2.mk
+++ b/x11/xfce4-trigger-launcher/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:59:10 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-trigger-launcher.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_TRIGGER_LAUNCHER_BUILDLINK2_MK)
@@ -16,11 +16,9 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-trigger-launcher=xfce4-trigger-launcher
 BUILDLINK_PREFIX.xfce4-trigger-launcher_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-trigger-launcher+=	lib/xfce4/panel-plugins/libtriggerlauncher.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/xfce4-panel/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-trigger-launcher-buildlink
 
diff --git a/x11/xfce4-utils/buildlink2.mk b/x11/xfce4-utils/buildlink2.mk
index 9229bd7d2c7..5f0021b433b 100644
--- a/x11/xfce4-utils/buildlink2.mk
+++ b/x11/xfce4-utils/buildlink2.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/26 10:59:30 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-utils.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.7.
 #
 
 .if !defined(XFCE4_UTILS_BUILDLINK2_MK)
@@ -16,11 +16,9 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-utils=xfce4-utils
 BUILDLINK_PREFIX.xfce4-utils_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xfce4-utils+=	lib/xfce4/mcs-plugins/xftaskbar_plugin.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
 .include "../../x11/xscreensaver/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	xfce4-utils-buildlink