From 5864f183210ac38620df511508ce6bfdb1d20602 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 19 Feb 2004 17:54:05 +0000
Subject: buildlink{2,3} files should not include pkgconfig/buildlink{2,3}.mk.

---
 audio/libao/buildlink2.mk               | 4 +---
 audio/libao/buildlink3.mk               | 3 +--
 audio/libogg/buildlink2.mk              | 4 +---
 audio/libsndfile/buildlink2.mk          | 4 +---
 audio/musicbrainz/buildlink2.mk         | 3 +--
 audio/musicbrainz/buildlink3.mk         | 3 +--
 databases/gnome-mime-data/buildlink2.mk | 3 +--
 devel/gconfmm/buildlink2.mk             | 3 +--
 devel/glib2/buildlink2.mk               | 3 +--
 devel/loudmouth/buildlink2.mk           | 3 +--
 devel/pango/buildlink2.mk               | 3 +--
 graphics/openquicktime/buildlink2.mk    | 3 +--
 multimedia/gstreamer/buildlink2.mk      | 3 +--
 multimedia/xine-lib/buildlink2.mk       | 3 +--
 textproc/libcroco/buildlink2.mk         | 3 +--
 x11/gtk-thinice-engine/buildlink2.mk    | 3 +--
 x11/gtk2/buildlink2.mk                  | 3 +--
 x11/libzvt/buildlink2.mk                | 3 +--
 18 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk
index 01602a972d3..6d4a5e97a08 100644
--- a/audio/libao/buildlink2.mk
+++ b/audio/libao/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/07 10:51:48 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(LIBAO_BUILDLINK2_MK)
 LIBAO_BUILDLINK2_MK=	# defined
@@ -14,8 +14,6 @@ BUILDLINK_FILES.libao+=	include/ao/os_types.h
 BUILDLINK_FILES.libao+=	lib/libao.*
 BUILDLINK_FILES.libao+=	lib/ao/*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-
 BUILDLINK_TARGETS+=	libao-buildlink
 
 libao-buildlink: _BUILDLINK_USE
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index bfe8325dfbb..31fad85bf3d 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/19 17:54:05 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -12,7 +12,6 @@ BUILDLINK_PACKAGES+=		libao
 BUILDLINK_DEPENDS.libao+=	libao>=0.8.4
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
-.  include "../../devel/pkgconfig/buildlink3.mk"
 .endif	# LIBAO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk
index 93de792c4db..5abd341ed90 100644
--- a/audio/libogg/buildlink2.mk
+++ b/audio/libogg/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/08 15:55:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(LIBOGG_BUILDLINK2_MK)
 LIBOGG_BUILDLINK2_MK=	# defined
@@ -14,8 +14,6 @@ BUILDLINK_FILES.libogg+=	include/ogg/ogg.h
 BUILDLINK_FILES.libogg+=	include/ogg/os_types.h
 BUILDLINK_FILES.libogg+=	lib/libogg.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-
 BUILDLINK_TARGETS+=		libogg-buildlink
 
 libogg-buildlink: _BUILDLINK_USE
diff --git a/audio/libsndfile/buildlink2.mk b/audio/libsndfile/buildlink2.mk
index 867fbe75d27..77c093819b9 100644
--- a/audio/libsndfile/buildlink2.mk
+++ b/audio/libsndfile/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/08/31 02:02:22 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(LIBSNDFILE_BUILDLINK2_MK)
 LIBSNDFILE_BUILDLINK2_MK=	# defined
@@ -12,8 +12,6 @@ BUILDLINK_PREFIX.libsndfile_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libsndfile+=	include/sndfile.h
 BUILDLINK_FILES.libsndfile+=	lib/libsndfile.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-
 BUILDLINK_TARGETS+=	libsndfile-buildlink
 
 libsndfile-buildlink: _BUILDLINK_USE
diff --git a/audio/musicbrainz/buildlink2.mk b/audio/musicbrainz/buildlink2.mk
index 70f93333790..d48f18fca42 100644
--- a/audio/musicbrainz/buildlink2.mk
+++ b/audio/musicbrainz/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/09 00:07:36 chris Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(MUSICBRAINZ_BUILDLINK2_MK)
 MUSICBRAINZ_BUILDLINK2_MK=	# defined
@@ -14,7 +14,6 @@ BUILDLINK_FILES.musicbrainz+=	include/musicbrainz/*/*.h
 BUILDLINK_FILES.musicbrainz+=	lib/libmusicbrainz.*
 
 .include "../../textproc/expat/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	musicbrainz-buildlink
 
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 2fb4e477734..3600ff6940f 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/02/19 17:54:05 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -12,7 +12,6 @@ BUILDLINK_PACKAGES+=			musicbrainz
 BUILDLINK_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
 BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
 
-.  include "../../devel/pkgconfig/buildlink3.mk"
 .  include "../../textproc/expat/buildlink3.mk"
 .endif # MUSICBRAINZ_BUILDLINK3_MK
 
diff --git a/databases/gnome-mime-data/buildlink2.mk b/databases/gnome-mime-data/buildlink2.mk
index 4c7a1ee4939..1a00eff625b 100644
--- a/databases/gnome-mime-data/buildlink2.mk
+++ b/databases/gnome-mime-data/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/14 22:17:36 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(GNOME_MIME_DATA_BUILDLINK2_MK)
 GNOME_MIME_DATA_BUILDLINK2_MK=	# defined
@@ -12,7 +12,6 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-mime-data=gnome-mime-data
 BUILDLINK_PREFIX.gnome-mime-data_DEFAULT=	${LOCALBASE}
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnome-mime-data-buildlink
 
diff --git a/devel/gconfmm/buildlink2.mk b/devel/gconfmm/buildlink2.mk
index 68cfff06196..d470e5bb66a 100644
--- a/devel/gconfmm/buildlink2.mk
+++ b/devel/gconfmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/19 17:54:05 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gconfmm.
 #
@@ -24,7 +24,6 @@ BUILDLINK_FILES.gconfmm+=	lib/pkgconfig/gconfmm-2.0.pc
 
 .include "../../devel/GConf2/buildlink2.mk"
 .include "../../devel/libsigc++/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/gtkmm/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gconfmm-buildlink
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 6d58dcfe098..593bd0b9f3a 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/07/13 13:51:11 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/02/19 17:54:05 wiz Exp $
 
 .if !defined(GLIB2_BUILDLINK2_MK)
 GLIB2_BUILDLINK2_MK=	# defined
@@ -19,7 +19,6 @@ BUILDLINK_FILES.glib2+=	lib/libgthread-2.0.*
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 
 .include "../../mk/pthread.buildlink2.mk"
 
diff --git a/devel/loudmouth/buildlink2.mk b/devel/loudmouth/buildlink2.mk
index b7a1f134247..989fd65a422 100644
--- a/devel/loudmouth/buildlink2.mk
+++ b/devel/loudmouth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/01/23 09:45:51 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/19 17:54:06 wiz Exp $
 #
 # This Makefile fragment is included by packages that use loudmouth.
 #
@@ -19,7 +19,6 @@ BUILDLINK_FILES.loudmouth+=	lib/libloudmouth*
 BUILDLINK_FILES.loudmouth+=	lib/pkgconfig/loudmouth-1.0.pc
 
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
 .if defined(LOUDMOUTH_USE_SSL) && !empty(LOUDMOUTH_USE_SSL:M[Yy][Ee][Ss])
 BUILDLINK_DEPENDS.gnutls=	gnutls>=1.0.0
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
index 36457e0e2e8..ef7389631fc 100644
--- a/devel/pango/buildlink2.mk
+++ b/devel/pango/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:24 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/19 17:54:06 wiz Exp $
 
 .if !defined(PANGO_BUILDLINK2_MK)
 PANGO_BUILDLINK2_MK=	# defined
@@ -13,7 +13,6 @@ BUILDLINK_FILES.pango=	include/pango-1.0/*/*
 BUILDLINK_FILES.pango+=	include/pango-1.0/*
 BUILDLINK_FILES.pango+=	lib/libpango*-1.0.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../fonts/Xft2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	pango-buildlink
diff --git a/graphics/openquicktime/buildlink2.mk b/graphics/openquicktime/buildlink2.mk
index ad7e7bcddf7..9057e0aa28c 100644
--- a/graphics/openquicktime/buildlink2.mk
+++ b/graphics/openquicktime/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:52:13 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/19 17:54:06 wiz Exp $
 #
 # This Makefile fragment is included by packages that use openquicktime.
 #
@@ -21,7 +21,6 @@ BUILDLINK_FILES.openquicktime+=	lib/quicktime_codec_jpeg.*
 BUILDLINK_FILES.openquicktime+=	lib/quicktime_codec_ms.*
 
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	openquicktime-buildlink
diff --git a/multimedia/gstreamer/buildlink2.mk b/multimedia/gstreamer/buildlink2.mk
index f5f6d19d55b..f905e3ee696 100644
--- a/multimedia/gstreamer/buildlink2.mk
+++ b/multimedia/gstreamer/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/02/14 21:19:43 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/19 17:54:07 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gstreamer.
 #
@@ -46,7 +46,6 @@ USE_X11= yes
 
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../lang/python/application.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/multimedia/xine-lib/buildlink2.mk b/multimedia/xine-lib/buildlink2.mk
index d5d43147c5b..4c2336709c3 100644
--- a/multimedia/xine-lib/buildlink2.mk
+++ b/multimedia/xine-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/02/19 17:54:07 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xine-lib.
 #
@@ -100,7 +100,6 @@ BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.*
 BUILDLINK_FILES.xine-lib+=	lib/xine/plugins/1.0.0/xineplug_vo_out_xv.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../audio/flac/buildlink2.mk"
 .include "../../audio/esound/buildlink2.mk"
diff --git a/textproc/libcroco/buildlink2.mk b/textproc/libcroco/buildlink2.mk
index cec5cc26bba..8c950ab109c 100644
--- a/textproc/libcroco/buildlink2.mk
+++ b/textproc/libcroco/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/01/04 18:00:28 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/19 17:54:07 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libcroco.
 #
@@ -25,7 +25,6 @@ BUILDLINK_FILES.libcroco+=	lib/libcrseleng.*
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libcroco-buildlink
diff --git a/x11/gtk-thinice-engine/buildlink2.mk b/x11/gtk-thinice-engine/buildlink2.mk
index 62061b1a94a..7894c1bb2fa 100644
--- a/x11/gtk-thinice-engine/buildlink2.mk
+++ b/x11/gtk-thinice-engine/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:07 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtk-thinice-engine.
 #
@@ -18,7 +18,6 @@ BUILDLINK_FILES.gtk-thinice-engine+=	lib/gtk-2.0/2.2.0/engines/libthinice.*
 BUILDLINK_FILES.gtk-thinice-engine+=	lib/pkgconfig/gtk-thinice-engine-2.pc
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gtk-thinice-engine-buildlink
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 9a2dc38c089..46438f7dc91 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/19 17:54:07 wiz Exp $
 
 .if !defined(GTK2_BUILDLINK2_MK)
 GTK2_BUILDLINK2_MK=	# defined
@@ -23,7 +23,6 @@ USE_X11=	YES
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/x11/libzvt/buildlink2.mk b/x11/libzvt/buildlink2.mk
index 11d00706092..72f1502f12a 100644
--- a/x11/libzvt/buildlink2.mk
+++ b/x11/libzvt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/19 17:54:07 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libzvt.
 #
@@ -19,7 +19,6 @@ BUILDLINK_FILES.libzvt+=	lib/libzvt-2.0.*
 BUILDLINK_FILES.libzvt+=	lib/pkgconfig/libzvt-2.0.pc
 
 .include "../../graphics/libart2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libzvt-buildlink
-- 
cgit v1.2.3