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.

13 files changed, 26 insertions, 13 deletions

diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
index 2264c7fad59..a612b7f10c2 100644
--- a/devel/GConf/buildlink2.mk
+++ b/devel/GConf/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/03/29 05:05:34 jlam Exp $
 
 .if !defined(GCONF_BUILDLINK2_MK)
 GCONF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gconf
+BUILDLINK_PKGBASE.gconf?=	GConf
 BUILDLINK_DEPENDS.gconf?=	GConf>=1.0.9nb5
 BUILDLINK_PKGSRCDIR.gconf?=	../../devel/GConf
 
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index bcbe65a48ea..8fad68305e4 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.30 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.31 2004/03/29 05:05:34 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILDLINK_PKGBASE.gettext?=	gettext-lib
 BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 
diff --git a/devel/libgetopt/buildlink2.mk b/devel/libgetopt/buildlink2.mk
index c7e19d5c9f3..2817636a9c3 100644
--- a/devel/libgetopt/buildlink2.mk
+++ b/devel/libgetopt/buildlink2.mk
@@ -1,8 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:35 jlam Exp $
 
 .if !defined(GETOPT_BUILDLINK2_MK)
 GETOPT_BUILDLINK2_MK=	# defined
 
+BUILDLINK_PKGBASE.getopt?=	libgetopt
 BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
 BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
 
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
index 4874d99ee35..9c25e18d656 100644
--- a/devel/libsigc++/buildlink2.mk
+++ b/devel/libsigc++/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/15 19:28:06 adam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/03/29 05:05:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libsigc++.
 #
@@ -9,6 +9,7 @@
 LIBSIGCXX_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libsigcxx
+BUILDLINK_PKGBASE.libsigcxx?=		libsigc++
 BUILDLINK_DEPENDS.libsigcxx?=		libsigc++>=1.2.3nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=		../../devel/libsigc++
 
diff --git a/devel/libsigc++10/buildlink2.mk b/devel/libsigc++10/buildlink2.mk
index ec7271383a7..9d5104fccee 100644
--- a/devel/libsigc++10/buildlink2.mk
+++ b/devel/libsigc++10/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:38 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:36 jlam Exp $
 
 .if !defined(LIBSIGCXX10_BUILDLINK2_MK)
 LIBSIGCXX10_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libsigcxx10
+BUILDLINK_PKGBASE.libsigcxx10?=	libsigc++10
 BUILDLINK_DEPENDS.libsigcxx10?=	libsigc++10>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.libsigcxx10?=	../../devel/libsigc++10
 
diff --git a/devel/libtool/buildlink2.mk b/devel/libtool/buildlink2.mk
index 21030e7dd64..593c06166b9 100644
--- a/devel/libtool/buildlink2.mk
+++ b/devel/libtool/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 20:14:06 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/29 05:05:37 jlam Exp $
 
 .if !defined(LTDL_BUILDLINK2_MK)
 LTDL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		ltdl
+BUILDLINK_PKGBASE.ltdl?=	libtool-base
 BUILDLINK_DEPENDS.ltdl?=	libtool-base>=1.5.2
 BUILDLINK_PKGSRCDIR.ltdl?=	../../devel/libtool-base
 
diff --git a/devel/ptl2/buildlink2.mk b/devel/ptl2/buildlink2.mk
index 70807285707..003ff408730 100644
--- a/devel/ptl2/buildlink2.mk
+++ b/devel/ptl2/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:37 jlam Exp $
 
 .if !defined(PTL2_BUILDLINK2_MK)
 PTL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		ptl2
+BUILDLINK_PKGBASE.ptl2?=	ptl
 BUILDLINK_DEPENDS.ptl2?=	ptl>=2.1.7
 BUILDLINK_PKGSRCDIR.ptl2?=	../../devel/ptl2
 
diff --git a/devel/py-curses/buildlink2.mk b/devel/py-curses/buildlink2.mk
index 099cda64d4d..cb2f9a40df2 100644
--- a/devel/py-curses/buildlink2.mk
+++ b/devel/py-curses/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/06/04 19:27:55 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:38 jlam Exp $
 
 .if !defined(PYCURSES_BUILDLINK2_MK)
 PYCURSES_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYCURSES_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pycurses
+BUILDLINK_PKGBASE.pycurses?=		${PYPKGPREFIX}-curses
 BUILDLINK_DEPENDS.pycurses?=		${PYPKGPREFIX}-curses-[0-9]*
 BUILDLINK_PKGSRCDIR.pycurses?=		../../devel/py-curses
 
diff --git a/devel/py-cursespanel/buildlink2.mk b/devel/py-cursespanel/buildlink2.mk
index 0b728aba872..34931ce59ef 100644
--- a/devel/py-cursespanel/buildlink2.mk
+++ b/devel/py-cursespanel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/06/04 19:32:13 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:38 jlam Exp $
 
 .if !defined(PYCURSESPANEL_BUILDLINK2_MK)
 PYCURSESPANEL_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYCURSESPANEL_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pycursespanel
+BUILDLINK_PKGBASE.pycursespanel?=	${PYPKGPREFIX}-cursespanel
 BUILDLINK_DEPENDS.pycursespanel?=	${PYPKGPREFIX}-cursespanel-[0-9]*
 BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
 
diff --git a/devel/py-kjbuckets/buildlink2.mk b/devel/py-kjbuckets/buildlink2.mk
index f8b56c2d2ce..9b347b064c7 100644
--- a/devel/py-kjbuckets/buildlink2.mk
+++ b/devel/py-kjbuckets/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/25 16:01:15 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(PY_KJB_BUILDLINK2_MK)
 PY_KJB_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_KJB_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pykjb
+BUILDLINK_PKGBASE.pykjb?=		${PYPKGPREFIX}-kjbuckets
 BUILDLINK_DEPENDS.pykjb?=		${PYPKGPREFIX}-kjbuckets-[0-9]*
 BUILDLINK_PKGSRCDIR.pykjb?=		../../devel/py-kjbuckets
 
diff --git a/devel/py-pqueue/buildlink2.mk b/devel/py-pqueue/buildlink2.mk
index b680176e2fb..7a4c73528a3 100644
--- a/devel/py-pqueue/buildlink2.mk
+++ b/devel/py-pqueue/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/25 16:01:17 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(PY_PQUEUE_BUILDLINK2_MK)
 PY_PQUEUE_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_PQUEUE_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pypqueue
+BUILDLINK_PKGBASE.pypqueue?=		${PYPKGPREFIX}-pqueue
 BUILDLINK_DEPENDS.pypqueue?=		${PYPKGPREFIX}-pqueue-[0-9]*
 BUILDLINK_PKGSRCDIR.pypqueue?=		../../devel/py-pqueue
 
diff --git a/devel/py-subversion/buildlink2.mk b/devel/py-subversion/buildlink2.mk
index bfd699ec0ef..33f1c988d21 100644
--- a/devel/py-subversion/buildlink2.mk
+++ b/devel/py-subversion/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/26 02:27:39 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(PY_SUBVERSION_BUILDLINK2_MK)
 PY_SUBVERSION_BUILDLINK2_MK=		#defined
 
 BUILDLINK_PACKAGES+=			py-subversion
+BUILDLINK_PKGBASE.py-subversion?=	${PYPKGPREFIX}-subversion
 BUILDLINK_DEPENDS.py-subversion?=	${PYPKGPREFIX}-subversion-${SVNVER}:../../devel/py-subversion
 BUILDLINK_RECOMMENDED.py-subversion?=	${PYPKGPREFIX}-subversion>=1.0.0nb1
 BUILDLINK_PKGSRCDIR.py-subversion?=	../../devel/py-subversion
diff --git a/devel/py-zconfig/buildlink2.mk b/devel/py-zconfig/buildlink2.mk
index b38763d25c6..37c7574a654 100644
--- a/devel/py-zconfig/buildlink2.mk
+++ b/devel/py-zconfig/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/25 16:04:09 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(PY_ZCONFIG_BUILDLINK2_MK)
 PY_ZCONFIG_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_ZCONFIG_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pyzconfig
+BUILDLINK_PKGBASE.pyzconfig?=		${PYPKGPREFIX}-zconfig
 BUILDLINK_DEPENDS.pyzconfig?=		${PYPKGPREFIX}-zconfig-[0-9]*
 BUILDLINK_PKGSRCDIR.pyzconfig?=		../../devel/py-zconfig