If the ${PKGBASE} of a package doesn't match the token passed to

BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.

26 files changed, 52 insertions, 26 deletions

diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 17d1fb6eacb..93354adcae6 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:26 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naudiofile}
 BUILDLINK_PACKAGES+=	audiofile
 
 .if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.audiofile?=	libaudiofile
 BUILDLINK_DEPENDS.audiofile+=	libaudiofile>=0.2.1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index f8a162bc5b1..2e4cf004c25 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_OGG_BUILDLINK3_MK:=	${PY_OGG_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyogg}
 BUILDLINK_PACKAGES+=	pyogg
 
 .if !empty(PY_OGG_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyogg?=	${PYPKGPREFIX}-ogg
 BUILDLINK_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
 
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index b08a3f314f3..cac7ad0b06f 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niconv}
 BUILDLINK_PACKAGES+=	iconv
 
 .if !empty(ICONV_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.iconv?=	libiconv
 BUILDLINK_DEPENDS.iconv+=	libiconv>=1.9.1
 BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 .endif	# ICONV_BUILDLINK3_MK
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index c05341eea3d..d2512a82cc8 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/03/10 18:06:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB_BUILDLINK3_MK:=	${DB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb2}
 BUILDLINK_PACKAGES+=	db2
 
 .if !empty(DB_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.db2?=		db
 BUILDLINK_DEPENDS.db2+=		db>=2.7.3
 BUILDLINK_PKGSRCDIR.db2?=	../../databases/db
 
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 76c96c34d76..7f7f7f704bb 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpyZODB}
 BUILDLINK_PACKAGES+=	pyZODB
 
 .if !empty(PY_ZODB_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyZODB?=	${PYPKGPREFIX}-ZODB
 BUILDLINK_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
 BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
 .endif	# PY_ZODB_BUILDLINK3_MK
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 96bf0bf2bdf..a8916d30539 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext}
 BUILDLINK_PACKAGES+=	gettext
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.gettext?=	gettext-lib
 BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.10.35nb1
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 1d2ceb33792..bcedd9b27e6 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGETOPT_BUILDLINK3_MK:=	${LIBGETOPT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngetopt}
 BUILDLINK_PACKAGES+=	getopt
 
 .if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.getopt?=	libgetopt
 BUILDLINK_DEPENDS.getopt+=	libgetopt>=1.3
 BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
 .endif	# LIBGETOPT_BUILDLINK3_MK
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index a1d31b4c890..e6b92bb3e27 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 23:22:33 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGC++_BUILDLINK3_MK:=	${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsigcxx}
 BUILDLINK_PACKAGES+=	libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.libsigcxx?=	libsigc++
 BUILDLINK_DEPENDS.libsigcxx+=	libsigc++>=1.2.3nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++
 .endif	# LIBSIGC++_BUILDLINK3_MK
diff --git a/devel/libtool/buildlink3.mk b/devel/libtool/buildlink3.mk
index 8a5377c727a..96ee6a21b0d 100644
--- a/devel/libtool/buildlink3.mk
+++ b/devel/libtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LTDL_BUILDLINK3_MK:=	${LTDL_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nltdl}
 BUILDLINK_PACKAGES+=	ltdl
 
 .if !empty(LTDL_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.ltdl?=	libtool-base
 BUILDLINK_DEPENDS.ltdl+=	libtool-base>=1.5.2
 BUILDLINK_PKGSRCDIR.ltdl?=	../../devel/libtool-base
 .endif	# LTDL_BUILDLINK3_MK
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 91fae0db87c..3291c18499c 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype}
 BUILDLINK_PACKAGES+=	freetype
 
 .if !empty(FREETYPE_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.freetype?=	freetype-lib
 BUILDLINK_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index bd244ed9de8..fec16d971ac 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 02:06:42 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_IMAGING_BUILDLINK3_MK:=	${PY_IMAGING_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyimaging}
 BUILDLINK_PACKAGES+=	pyimaging
 
 .if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyimaging?=	${PYPKGPREFIX}-imaging
 BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
 
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index cdfbf09d26d..38c851a1fed 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3CXX_BUILDLINK3_MK:=	${GCC3CXX_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@ BUILDLINK_PACKAGES+=	gcc3cxx
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
+BUILDLINK_PKGBASE.gcc3cxx?=	gcc3${GCC3_PKGMODIF}-c++
 BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3cxx?=	../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3cxx?=	\
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index ac946757f5b..9e75b1ab15b 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	gcc3c
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
+BUILDLINK_PKGBASE.gcc3c?=	gcc3${GCC3_PKGMODIF}-c
 BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
 BUILDLINK_LIBDIRS.gcc3c?=	\
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index dce33460154..9e531a2cffd 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3F77_BUILDLINK3_MK:=	${GCC3F77_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@ BUILDLINK_PACKAGES+=	gcc3f77
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
+BUILDLINK_PKGBASE.gcc3f77?=	gcc3${GCC3_PKGMODIF}-f77
 BUILDLINK_DEPENDS.gcc3f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3f77?=	../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3f77?=	\
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 43fa2995708..72b5db9b05e 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3JAVA_BUILDLINK3_MK:=	${GCC3JAVA_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@ BUILDLINK_PACKAGES+=	gcc3java
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
+BUILDLINK_PKGBASE.gcc3java?=	gcc3${GCC3_PKGMODIF}-java
 BUILDLINK_DEPENDS.gcc3java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
 BUILDLINK_LIBDIRS.gcc3java?=	\
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index ffa88c74cde..0ef61dda643 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3OBJC_BUILDLINK3_MK:=	${GCC3OBJC_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@ BUILDLINK_PACKAGES+=	gcc3objc
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
+BUILDLINK_PKGBASE.gcc3objc?=	gcc3${GCC3_PKGMODIF}-objc
 BUILDLINK_DEPENDS.gcc3objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3objc?=	../../lang/gcc3-objc
 BUILDLINK_LIBDIRS.gcc3objc?=	\
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index 8c78cedd116..a03aee028df 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NUMERIC_BUILDLINK3_MK:=	${PY_NUMERIC_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npynumeric}
 BUILDLINK_PACKAGES+=	pynumeric
 
 .if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pynumeric?=	${PYPKGPREFIX}-Numeric
 BUILDLINK_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-*
 BUILDLINK_PKGSRCDIR.pynumeric?=	../../math/py-Numeric
 .endif	# PY_NUMERIC_BUILDLINK3_MK
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index bd2d8997082..cb8ed37c396 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.122 2004/03/16 16:19:37 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.123 2004/03/16 18:23:26 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -14,6 +14,7 @@
 # BUILDLINK_PACKAGES+=	foo
 #
 # .if !empty(FOO_BUILDLINK3_MK:M+)
+# BUILDLINK_PKGBASE.foo+=	foo-lib
 # BUILDLINK_DEPENDS.foo+=	foo-lib>=1.0
 # BUILDLINK_RECOMMENDED.foo?=	foo-lib>=1.0nb1
 # BUILDLINK_PKGSRCDIR.foo?=	../../category/foo-lib
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index 3837a8d39b7..fd064643c49 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyorbit}
 BUILDLINK_PACKAGES+=	pyorbit
 
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyorbit?=	${PYPKGPREFIX}-ORBit
 BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
 
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 658a2bc520f..16046b81c44 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npam}
 BUILDLINK_PACKAGES+=	pam
 
 .if !empty(PAM_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pam?=		PAM
 BUILDLINK_DEPENDS.pam+=		PAM>=0.75
 BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
 .endif	# PAM_BUILDLINK3_MK
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 820d6b655e5..819fd2c3e85 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYXML_BUILDLINK3_MK:=	${PYXML_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyxml}
 BUILDLINK_PACKAGES+=	pyxml
 
 .if !empty(PYXML_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyxml?=	${PYPKGPREFIX}-xml
 BUILDLINK_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
 
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 337cfac6bbf..3b3e9512d90 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/06 23:46:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MXDATETIME_BUILDLINK3_MK:=	${PY_MXDATETIME_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-mxDateTime}
 BUILDLINK_PACKAGES+=	py-mxDateTime
 
 .if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.py-mxDateTime?=	${PYPKGPREFIX}-mxDateTime
 BUILDLINK_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
 BUILDLINK_PKGSRCDIR.py-mxDateTime?=	../../time/py-mxDateTime
 
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index c02e4f4af46..e75d6d371ab 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/16 18:23:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
 BUILDLINK_PACKAGES+=	gtk
 
 .if !empty(GTK_BUILDLINK3_MK:M+)
+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/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 9a1b47ee80b..9f824d0f401 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/09 22:15:01 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2}
 BUILDLINK_PACKAGES+=	gtk2
 
 .if !empty(GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.gtk2?=	gtk2+
 BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.2.4nb2
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index 87e345eae96..03db647181d 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:28 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2}
 BUILDLINK_PACKAGES+=	pygnome2
 
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pygnome2?=	${PYPKGPREFIX}-gnome2
 BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.0.0nb4
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 8ed67fcf7ab..8181c3a0b63 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/12 10:48:23 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
 BUILDLINK_PACKAGES+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pygtk2?=	${PYPKGPREFIX}-gtk2
 BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2