Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,

e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.

18 files changed, 41 insertions, 23 deletions

diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
index c723b6bb53a..e0ef075cbf4 100644
--- a/x11/controlcenter/buildlink2.mk
+++ b/x11/controlcenter/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/03/29 05:05:47 jlam Exp $
 
 .if !defined(CONTROLCENTER_BUILDLINK2_MK)
 CONTROLCENTER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			controlcenter
+BUILDLINK_PKGBASE.controlcenter?=	control-center
 BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.4nb5
 BUILDLINK_PKGSRCDIR.controlcenter?=	../../x11/controlcenter
 DEPENDS+=	${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
index 57e4990d9a5..38f77e43e98 100644
--- a/x11/gnome--/buildlink2.mk
+++ b/x11/gnome--/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/03/29 05:05:48 jlam Exp $
 
 .if !defined(GNOMEMM_BUILDLINK2_MK)
 GNOMEMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnomemm
+BUILDLINK_PKGBASE.gnomemm?=	gnome--
 BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.4nb1
 BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
 
diff --git a/x11/gtk+extra/buildlink2.mk b/x11/gtk+extra/buildlink2.mk
index a5a4b0415fb..c9eae5b64b5 100644
--- a/x11/gtk+extra/buildlink2.mk
+++ b/x11/gtk+extra/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:54:01 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/29 05:05:49 jlam Exp $
 
 .if !defined(GTKEXTRA_BUILDLINK2_MK)
 GTKEXTRA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtkextra
+BUILDLINK_PKGBASE.gtkextra?=	gtk+extra
 BUILDLINK_DEPENDS.gtkextra?=	gtk+extra>=0.99.17nb2
 BUILDLINK_PKGSRCDIR.gtkextra?=	../../x11/gtk+extra
 
diff --git a/x11/gtk--/buildlink2.mk b/x11/gtk--/buildlink2.mk
index 437193b595c..f71b4193d5b 100644
--- a/x11/gtk--/buildlink2.mk
+++ b/x11/gtk--/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:54:02 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/03/29 05:05:49 jlam Exp $
 
 .if !defined(GTKMM_BUILDLINK2_MK)
 GTKMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtkmm
+BUILDLINK_PKGBASE.gtkmm?=	gtk--
 BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.10nb3
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtk--
 
diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk
index 501683d590f..f732c189a7f 100644
--- a/x11/gtk/buildlink2.mk
+++ b/x11/gtk/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/01/15 20:50:15 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/03/29 05:05:49 jlam Exp $
 
 .if !defined(GTK_BUILDLINK2_MK)
 GTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk
+BUILDLINK_PKGBASE.gtk?=		gtk+
 BUILDLINK_DEPENDS.gtk?=		gtk+>=1.2.10
 BUILDLINK_RECOMMENDED.gtk?=	gtk+>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index e867a63eb00..96450ca6b89 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/03/09 22:15:01 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/03/29 05:05:50 jlam Exp $
 
 .if !defined(GTK2_BUILDLINK2_MK)
 GTK2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk2
+BUILDLINK_PKGBASE.gtk2?=	gtk2+
 BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.2.4nb2
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
diff --git a/x11/py-Pmw/buildlink2.mk b/x11/py-Pmw/buildlink2.mk
index 33016503f7f..75f4ec13672 100644
--- a/x11/py-Pmw/buildlink2.mk
+++ b/x11/py-Pmw/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pypmw
-BUILDLINK_DEPENDS.pypmw?=	${PYPKGPREFIX}-Pmw-*
+BUILDLINK_PKGBASE.pypmw?=	${PYPKGPREFIX}-Pmw
+BUILDLINK_DEPENDS.pypmw?=	${PYPKGPREFIX}-Pmw-[0-9]*
 BUILDLINK_PKGSRCDIR.pypmw?=	../../x11/py-Pmw
diff --git a/x11/py-Tk/buildlink2.mk b/x11/py-Tk/buildlink2.mk
index 28afb692626..4b81eb1218e 100644
--- a/x11/py-Tk/buildlink2.mk
+++ b/x11/py-Tk/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/10 19:29:31 minskim Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/29 05:05:50 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pytk
-BUILDLINK_DEPENDS.pytk?=	${PYPKGPREFIX}-Tk-*
+BUILDLINK_PKGBASE.pytk?=	${PYPKGPREFIX}-Tk
+BUILDLINK_DEPENDS.pytk?=	${PYPKGPREFIX}-Tk-[0-9]*
 BUILDLINK_PKGSRCDIR.pytk?=	../../x11/py-Tk
 
 .include "../../x11/tk/buildlink2.mk"
diff --git a/x11/py-qt2-sip/buildlink2.mk b/x11/py-qt2-sip/buildlink2.mk
index c8f59bfffaf..d5e1a56cac4 100644
--- a/x11/py-qt2-sip/buildlink2.mk
+++ b/x11/py-qt2-sip/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/20 23:28:21 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:50 jlam Exp $
 
 .if !defined(PY_QT2_SIP_BUILDLINK2_MK)
 PY_QT2_SIP_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_QT2_SIP_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt2sip
+BUILDLINK_PKGBASE.pyqt2sip?=	${PYPKGPREFIX}-qt2-sip
 BUILDLINK_DEPENDS.pyqt2sip?=	${PYPKGPREFIX}-qt2-sip-[0-9]*
 BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
 
diff --git a/x11/py-qt2/buildlink2.mk b/x11/py-qt2/buildlink2.mk
index d22e7461381..86919f78d8b 100644
--- a/x11/py-qt2/buildlink2.mk
+++ b/x11/py-qt2/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:57 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt2
+BUILDLINK_PKGBASE.pyqt2?=	${PYPKGPREFIX}-qt2
 BUILDLINK_DEPENDS.pyqt2?=	${PYPKGPREFIX}-qt2-[0-9]*
 BUILDLINK_PKGSRCDIR.pyqt2?=	../../x11/py-qt2
diff --git a/x11/py-qt3-base/buildlink2.mk b/x11/py-qt3-base/buildlink2.mk
index c60bf52b3a0..c8a940c2134 100644
--- a/x11/py-qt3-base/buildlink2.mk
+++ b/x11/py-qt3-base/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:03 jmc Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
 
 .if !defined(PY_QT3_BASE_BUILDLINK2_MK)
 PY_QT3_BASE_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_QT3_BASE_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt3base
+BUILDLINK_PKGBASE.pyqt3base?=	${PYPKGPREFIX}-qt3-base
 BUILDLINK_DEPENDS.pyqt3base?=	${PYPKGPREFIX}-qt3-base>=3.7nb1
 BUILDLINK_PKGSRCDIR.pyqt3base?=	../../x11/py-qt3-base
 
diff --git a/x11/py-qt3-modules/buildlink2.mk b/x11/py-qt3-modules/buildlink2.mk
index e507b024fb3..0842ea91e9b 100644
--- a/x11/py-qt3-modules/buildlink2.mk
+++ b/x11/py-qt3-modules/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:04 jmc Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:50 jlam Exp $
 
 .if !defined(PY_QT3_MODULES_BUILDLINK2_MK)
 PY_QT3_MODULES_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_QT3_MODULES_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt3modules
+BUILDLINK_PKGBASE.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules
 BUILDLINK_DEPENDS.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules>=3.7nb1
 BUILDLINK_PKGSRCDIR.pyqt3modules?=	../../x11/py-qt3-modules
 
diff --git a/x11/py-qt3-qscintilla/buildlink2.mk b/x11/py-qt3-qscintilla/buildlink2.mk
index 1d1aa635810..18a8c37a01e 100644
--- a/x11/py-qt3-qscintilla/buildlink2.mk
+++ b/x11/py-qt3-qscintilla/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:05 jmc Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:51 jlam Exp $
 
 .if !defined(PY_QT3_SCINTILLA_BUILDLINK2_MK)
 PY_QT3_SCINTILLA_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_QT3_SCINTILLA_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt3scintilla
+BUILDLINK_PKGBASE.pyqt3scintilla?=	${PYPKGPREFIX}-qt3-qscintilla
 BUILDLINK_DEPENDS.pyqt3scintilla?=	${PYPKGPREFIX}-qt3-qscintilla>=3.7nb1
 BUILDLINK_PKGSRCDIR.pyqt3scintilla?=	../../x11/py-qt3-qscintilla
 
diff --git a/x11/py-qt3-sip/buildlink2.mk b/x11/py-qt3-sip/buildlink2.mk
index 8f9d4315869..ccb2aa53b95 100644
--- a/x11/py-qt3-sip/buildlink2.mk
+++ b/x11/py-qt3-sip/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/08/19 04:35:05 jmc Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:52 jlam Exp $
 
 .if !defined(PY_QT3_SIP_BUILDLINK2_MK)
 PY_QT3_SIP_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_QT3_SIP_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt3sip
+BUILDLINK_PKGBASE.pyqt3sip?=	${PYPKGPREFIX}-qt3-sip
 BUILDLINK_DEPENDS.pyqt3sip?=	${PYPKGPREFIX}-qt3-sip>=3.7nb1
 BUILDLINK_PKGSRCDIR.pyqt3sip?=	../../x11/py-qt3-sip
 
diff --git a/x11/py-wxWindows/buildlink2.mk b/x11/py-wxWindows/buildlink2.mk
index 9754198be0e..c7149d36687 100644
--- a/x11/py-wxWindows/buildlink2.mk
+++ b/x11/py-wxWindows/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/26 02:28:02 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:53 jlam Exp $
 
 .if !defined(PYWXWINDOWS_BUILDLINK2_MK)
 PYWXWINDOWS_BUILDLINK2_MK=	# defined
@@ -6,7 +6,8 @@ PYWXWINDOWS_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pywxWindows
-BUILDLINK_DEPENDS.pywxWindows?=		${PYPKGPREFIX}-wxWindows-*
+BUILDLINK_PKGBASE.pywxWindows?=		${PYPKGPREFIX}-wxWindows
+BUILDLINK_DEPENDS.pywxWindows?=		${PYPKGPREFIX}-wxWindows-[0-9]*
 BUILDLINK_RECOMMENDED.pywxWindows?=	${PYPKGPREFIX}-wxWindows>=2.4.2.4nb4
 BUILDLINK_PKGSRCDIR.pywxWindows?=	../../x11/py-wxWindows
 
diff --git a/x11/qt2-designer/buildlink2.mk b/x11/qt2-designer/buildlink2.mk
index 7f7f743e1d2..53bdc2adaf8 100644
--- a/x11/qt2-designer/buildlink2.mk
+++ b/x11/qt2-designer/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:41 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:54 jlam Exp $
 
 .if !defined(QT2_DESIGNER_BUILDLINK2_MK)
 QT2_DESIGNER_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=	qt2-designer
-BUILDLINK_DEPENDS.qt2-designer?= \
+BUILDLINK_PACKAGES+=			qt2-designer
+BUILDLINK_PKGBASE.qt2-designer?=	qt2-designer{,-kde}
+BUILDLINK_DEPENDS.qt2-designer?=	\
 		{qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2}
 BUILDLINK_PKGSRCDIR.qt2-designer?=	../../x11/qt2-designer
 
diff --git a/x11/qt3-qscintilla/buildlink2.mk b/x11/qt3-qscintilla/buildlink2.mk
index 77d07d90451..963e1ec8d8c 100644
--- a/x11/qt3-qscintilla/buildlink2.mk
+++ b/x11/qt3-qscintilla/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/22 17:25:25 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:55 jlam Exp $
 
 .if !defined(QT3_SCINTILLA_BUILDLINK2_MK)
 QT3_SCINTILLA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-scintilla
+BUILDLINK_PKGBASE.qt3-scintilla?=	qt3-qscintilla
 BUILDLINK_DEPENDS.qt3-scintilla?=	qt3-qscintilla-[0-9]*
 BUILDLINK_PKGSRCDIR.qt3-scintilla?=	../../x11/qt3-qscintilla
 
diff --git a/x11/xview-lib/buildlink2.mk b/x11/xview-lib/buildlink2.mk
index 03ea1955dc3..9fe15f5ecc7 100644
--- a/x11/xview-lib/buildlink2.mk
+++ b/x11/xview-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:50 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:56 jlam Exp $
 
 .if !defined(XVIEW_BUILDLINK2_MK)
 XVIEW_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		xview
+BUILDLINK_PKGBASE.xview?=	xview-lib
 BUILDLINK_DEPENDS.xview?=	xview-lib>=3.2.1
 BUILDLINK_PKGSRCDIR.xview?=	../../x11/xview-lib