summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/libaudiofile/buildlink3.mk3
-rw-r--r--audio/py-ogg/buildlink3.mk3
-rw-r--r--converters/libiconv/buildlink3.mk3
-rw-r--r--databases/db/buildlink3.mk3
-rw-r--r--databases/py-ZODB/buildlink3.mk3
-rw-r--r--devel/gettext-lib/buildlink3.mk3
-rw-r--r--devel/libgetopt/buildlink3.mk3
-rw-r--r--devel/libsigc++/buildlink3.mk3
-rw-r--r--devel/libtool/buildlink3.mk3
-rw-r--r--graphics/freetype-lib/buildlink3.mk3
-rw-r--r--graphics/gnome-pixmaps/buildlink3.mk3
-rw-r--r--graphics/py-imaging/buildlink3.mk3
-rw-r--r--lang/gcc3-c++/buildlink3.mk3
-rw-r--r--lang/gcc3-c/buildlink3.mk3
-rw-r--r--lang/gcc3-f77/buildlink3.mk3
-rw-r--r--lang/gcc3-java/buildlink3.mk3
-rw-r--r--lang/gcc3-objc/buildlink3.mk3
-rw-r--r--lang/libperl/buildlink3.mk3
-rw-r--r--math/py-Numeric/buildlink3.mk3
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk3
-rw-r--r--net/py-ORBit/buildlink3.mk3
-rw-r--r--security/PAM/buildlink3.mk3
-rw-r--r--textproc/py-xml/buildlink3.mk3
-rw-r--r--time/py-mxDateTime/buildlink3.mk3
-rw-r--r--www/apache/buildlink3.mk3
-rw-r--r--x11/gtk/buildlink3.mk3
-rw-r--r--x11/gtk2/buildlink3.mk3
-rw-r--r--x11/py-gnome2/buildlink3.mk3
-rw-r--r--x11/py-gtk2/buildlink3.mk3
29 files changed, 29 insertions, 58 deletions
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 93354adcae6..55b72ce0a2e 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:33 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 140f8cdb8a9..1ba7f50cc44 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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
.endif # PY_OGG_BUILDLINK3_MK
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index 842bf75339a..ac9f5921f92 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/05/03 02:22:24 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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
BUILDLINK_LDFLAGS.iconv= ${BUILDLINK_LDADD.iconv}
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 7b76c35ce95..800ddb049fd 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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
. if defined(USE_DB185)
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 7f7f7f704bb..08c894f555e 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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 0b9e4943251..0d5120e1fd7 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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
.endif # GETTEXT_BUILDLINK3_MK
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index bcedd9b27e6..09b9b67275d 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGETOPT_BUILDLINK3_MK:= ${LIBGETOPT_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 e6b92bb3e27..e4edd20f730 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 96ee6a21b0d..9b4665f0ca5 100644
--- a/devel/libtool/buildlink3.mk
+++ b/devel/libtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LTDL_BUILDLINK3_MK:= ${LTDL_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 d16c424718e..04f0b7f0ae7 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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
.endif # FREETYPE_BUILDLINK3_MK
diff --git a/graphics/gnome-pixmaps/buildlink3.mk b/graphics/gnome-pixmaps/buildlink3.mk
index ec51b03b4db..13829ff65b4 100644
--- a/graphics/gnome-pixmaps/buildlink3.mk
+++ b/graphics/gnome-pixmaps/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 05:55:21 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PIXMAPS_BUILDLINK3_MK:= ${GNOME_PIXMAPS_BUILDLINK3_MK}+
@@ -12,7 +12,6 @@ BUILDLINK_PACKAGES+= gnome-pixmaps
.if !empty(GNOME_PIXMAPS_BUILDLINK3_MK:M+)
.if (${LOCALBASE} == ${X11PREFIX})
-BUILDLINK_PKGBASE.gnome-pixmaps?= gnome{2,}-pixmaps
BUILDLINK_DEPENDS.gnome-pixmaps?= gnome{2,}-pixmaps>=1.4.2
.else
BUILDLINK_DEPENDS.gnome-pixmaps?= gnome-pixmaps>=1.4.2
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index b4aa8a1a24e..ca2c3f82dab 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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
.endif # PY_IMAGING_BUILDLINK3_MK
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 8ea27408d16..dc43021b472 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_CXX_BUILDLINK3_MK:= ${GCC3_CXX_BUILDLINK3_MK}+
@@ -18,7 +18,6 @@ BUILDLINK_PACKAGES+= gcc3-cxx
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PKGBASE.gcc3-cxx?= gcc3${GCC3_PKGMODIF}-c++
BUILDLINK_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
BUILDLINK_LIBDIRS.gcc3-cxx?= \
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index d1cd0e6ff8b..637b3d534e3 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+
@@ -22,7 +22,6 @@ BUILDLINK_PACKAGES+= gcc3-c
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PKGBASE.gcc3-c?= gcc3${GCC3_PKGMODIF}-c
BUILDLINK_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c
BUILDLINK_LIBDIRS.gcc3-c?= \
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 609452718b4..2a3882b6efc 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_F77_BUILDLINK3_MK:= ${GCC3_F77_BUILDLINK3_MK}+
@@ -18,7 +18,6 @@ BUILDLINK_PACKAGES+= gcc3-f77
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PKGBASE.gcc3-f77?= gcc3${GCC3_PKGMODIF}-f77
BUILDLINK_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77
BUILDLINK_LIBDIRS.gcc3-f77?= \
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index fef0942499f..0aee0be4928 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_JAVA_BUILDLINK3_MK:= ${GCC3_JAVA_BUILDLINK3_MK}+
@@ -18,7 +18,6 @@ BUILDLINK_PACKAGES+= gcc3-java
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PKGBASE.gcc3-java?= gcc3${GCC3_PKGMODIF}-java
BUILDLINK_DEPENDS.gcc3-java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3-java?= ../../lang/gcc3-java
BUILDLINK_LIBDIRS.gcc3-java?= \
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 12ac1f9ad8e..12e7035d810 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+
@@ -18,7 +18,6 @@ BUILDLINK_PACKAGES+= gcc3-objc
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PKGBASE.gcc3-objc?= gcc3${GCC3_PKGMODIF}-objc
BUILDLINK_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc
BUILDLINK_LIBDIRS.gcc3-objc?= \
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index e25a2c77d3e..8697e8a81a3 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/29 05:05:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibperl}
BUILDLINK_PACKAGES+= libperl
.if !empty(LIBPERL_BUILDLINK3_MK:M+)
-BUILDLINK_PKGBASE.libperl+= {libperl,perl}
BUILDLINK_DEPENDS.libperl+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}
BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl
.endif # LIBPERL_BUILDLINK3_MK
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index 5283d1c8833..19b14b19ede 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/29 05:05:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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-[0-9]*
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 0517b31f682..87cdacc19e0 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.142 2004/04/26 16:27:36 minskim Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.143 2004/05/17 21:32:34 seb Exp $
#
# An example package buildlink3.mk file:
#
@@ -14,7 +14,6 @@
# 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 276f025791f..20aec9ed9e8 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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_RECOMMENDED.pyorbit?= ${PYPKGPREFIX}-ORBit>=2.0.0nb2
BUILDLINK_PKGSRCDIR.pyorbit?= ../../net/py-ORBit
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 16046b81c44..31bbec98354 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 3eb88c9c868..d0a1f6d9db2 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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
.endif # PYXML_BUILDLINK3_MK
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 20d16bc5c46..308d7e09544 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_MXDATETIME_BUILDLINK3_MK:= ${PY_MXDATETIME_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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
BUILDLINK_INCDIRS.py-mxDateTime+= ${PYSITELIB}/mx/DateTime/mxDateTime
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index fcbb492f933..f75881ebaab 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/29 05:05:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
BUILDLINK_PACKAGES+= apache
.if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_PKGBASE.apache+= apache{,6}
BUILDLINK_DEPENDS.apache+= apache{,6}-1.3.*
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 804c5ecff91..801979e34d3 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/05/17 21:32:35 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ 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 3b0ad141108..95f1d340b7f 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/05/15 12:18:36 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/05/17 21:32:35 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+
@@ -11,7 +11,6 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2}
BUILDLINK_PACKAGES+= gtk2
.if !empty(GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_PKGBASE.gtk2?= gtk2+
BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.4.0
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index e184c67b175..115ee697205 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/26 02:28:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/05/17 21:32:35 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GNOME2_BUILDLINK3_MK:= ${PY_GNOME2_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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_RECOMMENDED.pygnome2?= ${PYPKGPREFIX}-gnome2>=2.0.0nb11
BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 6d647092ab0..d2d5e812ed0 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/26 02:28:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:35 seb Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@ 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_RECOMMENDED.pygtk2?= ${PYPKGPREFIX}-gtk2>=2.2.0nb1
BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2