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.

65 files changed, 141 insertions, 77 deletions

diff --git a/audio/libaudiofile/buildlink2.mk b/audio/libaudiofile/buildlink2.mk
index 266840237fa..9490266dda3 100644
--- a/audio/libaudiofile/buildlink2.mk
+++ b/audio/libaudiofile/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:12 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:32 jlam Exp $
 
 .if !defined(AUDIOFILE_BUILDLINK2_MK)
 AUDIOFILE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		audiofile
+BUILDLINK_PKGBASE.audiofile?=	libaudiofile
 BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index 7872c81b97d..c3afe867e73 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.19 2004/03/29 05:05:33 jlam Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILDLINK_PKGBASE.iconv?=	libiconv
 BUILDLINK_DEPENDS.iconv?=	libiconv>=1.9.1
 BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 
diff --git a/databases/py-PgSQL/buildlink2.mk b/databases/py-PgSQL/buildlink2.mk
index eb763cce4af..2c7404fd1cb 100644
--- a/databases/py-PgSQL/buildlink2.mk
+++ b/databases/py-PgSQL/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:33 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -6,6 +6,7 @@
 PYPGSQL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			pyPgSQL
+BUILDLINK_PKGBASE.pyPgSQL?=		${PYPKGPREFIX}-PgSQL
 BUILDLINK_DEPENDS.pyPgSQL?=		${PYPKGPREFIX}-PgSQL>=2.4
 BUILDLINK_RECOMMENDED.pyPgSQL?=		${PYPKGPREFIX}-PgSQL>=2.4nb1
 BUILDLINK_PKGSRCDIR.pyPgSQL?=		../../databases/py-PgSQL
diff --git a/databases/py-mysqldb/buildlink2.mk b/databases/py-mysqldb/buildlink2.mk
index b2a5eed67f1..ae7217bc893 100644
--- a/databases/py-mysqldb/buildlink2.mk
+++ b/databases/py-mysqldb/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:33 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pymysqldb
-BUILDLINK_DEPENDS.pymysqldb?=	${PYPKGPREFIX}-mysqldb-*
+BUILDLINK_PKGBASE.pymysqldb?=	${PYPKGPREFIX}-mysqldb
+BUILDLINK_DEPENDS.pymysqldb?=	${PYPKGPREFIX}-mysqldb-[0-9]*
 BUILDLINK_PKGSRCDIR.pymysqldb?=	../../databases/py-mysqldb
diff --git a/databases/py-psycopg/buildlink2.mk b/databases/py-psycopg/buildlink2.mk
index a320894c927..70af7a5ca91 100644
--- a/databases/py-psycopg/buildlink2.mk
+++ b/databases/py-psycopg/buildlink2.mk
@@ -1,8 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:33 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		psycopg
+BUILDLINK_PKGBASE.psycopg?=	${PYPKGPREFIX}-psycopg
 BUILDLINK_DEPENDS.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb1
 BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb2
 BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
diff --git a/databases/py-sybase/buildlink2.mk b/databases/py-sybase/buildlink2.mk
index 46245963415..501553a1b9c 100644
--- a/databases/py-sybase/buildlink2.mk
+++ b/databases/py-sybase/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/12/30 23:14:17 cjep Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use py-sybase.
 #
@@ -11,6 +11,7 @@ PY_SYBASE_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		py-sybase
+BUILDLINK_PKGBASE.py-sybase?=	${PYPKGPREFIX}-sybase
 BUILDLINK_DEPENDS.py-sybase?=	${PYPKGPREFIX}-sybase>=0.36
 BUILDLINK_PKGSRCDIR.py-sybase?=	../../databases/py-sybase
 
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
 
diff --git a/graphics/freetype-lib/buildlink2.mk b/graphics/freetype-lib/buildlink2.mk
index 2f7f9c26c80..70f62a620d7 100644
--- a/graphics/freetype-lib/buildlink2.mk
+++ b/graphics/freetype-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:52:00 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(FREETYPE_BUILDLINK2_MK)
 FREETYPE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		freetype
+BUILDLINK_PKGBASE.freetype?=	freetype-lib
 BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
diff --git a/graphics/gnome-pixmaps/buildlink2.mk b/graphics/gnome-pixmaps/buildlink2.mk
index cfb35c66f42..03c26864db8 100644
--- a/graphics/gnome-pixmaps/buildlink2.mk
+++ b/graphics/gnome-pixmaps/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/30 22:58:04 cjep Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-pixmaps.
 #
@@ -10,6 +10,7 @@ GNOME_PIXMAPS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-pixmaps
 .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/hermes/buildlink2.mk b/graphics/hermes/buildlink2.mk
index 71a0206bd08..7ad5a773700 100644
--- a/graphics/hermes/buildlink2.mk
+++ b/graphics/hermes/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:09 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:39 jlam Exp $
 
 .if !defined(HERMES_BUILDLINK2_MK)
 HERMES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		hermes
+BUILDLINK_PKGBASE.hermes?=	Hermes
 BUILDLINK_DEPENDS.hermes?=	Hermes>=1.3.2
 BUILDLINK_PKGSRCDIR.hermes?=	../../graphics/hermes
 
diff --git a/graphics/py-imaging/buildlink2.mk b/graphics/py-imaging/buildlink2.mk
index 4e16ebfec22..c8006b4c29c 100644
--- a/graphics/py-imaging/buildlink2.mk
+++ b/graphics/py-imaging/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/24 20:44:51 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:39 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyimaging
-BUILDLINK_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging-*
+BUILDLINK_PKGBASE.pyimaging?=	${PYPKGPREFIX}-imaging
+BUILDLINK_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging-[0-9]*
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pyimaging=${PYPKGPREFIX}-imaging
diff --git a/graphics/sane-backends/buildlink2.mk b/graphics/sane-backends/buildlink2.mk
index 6f5ea85598a..9f73fc62fba 100644
--- a/graphics/sane-backends/buildlink2.mk
+++ b/graphics/sane-backends/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/20 21:18:41 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:40 jlam Exp $
 
 .if !defined(SANE_BUILDLINK2_MK)
 SANE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		sane
+BUILDLINK_PKGBASE.sane?=	sane-backends
 BUILDLINK_DEPENDS.sane?=	sane-backends>=1.0.3
 BUILDLINK_PKGSRCDIR.sane?=	../../graphics/sane-backends
 
diff --git a/inputmethod/canna-lib/buildlink2.mk b/inputmethod/canna-lib/buildlink2.mk
index 3215629f934..68e1d4e3dc1 100644
--- a/inputmethod/canna-lib/buildlink2.mk
+++ b/inputmethod/canna-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/06/03 00:58:10 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/29 05:05:40 jlam Exp $
 
 .if !defined(CANNA_BUILDLINK2_MK)
 CANNA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		canna
+BUILDLINK_PKGBASE.canna?=	Canna-lib
 BUILDLINK_DEPENDS.canna?=	Canna-lib>=3.6pl3
 BUILDLINK_PKGSRCDIR.canna?=	../../inputmethod/canna-lib
 
diff --git a/inputmethod/ja-freewnn-lib/buildlink2.mk b/inputmethod/ja-freewnn-lib/buildlink2.mk
index a40f98ca680..ebd38bd9e39 100644
--- a/inputmethod/ja-freewnn-lib/buildlink2.mk
+++ b/inputmethod/ja-freewnn-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:57 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:40 jlam Exp $
 
 .if !defined(JA_FREEWNN_BUILDLINK2_MK)
 JA_FREEWNN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			ja-freewnn
+BUILDLINK_PKGBASE.ja-freewnn?=		ja-FreeWnn-lib
 BUILDLINK_DEPENDS.ja-freewnn?=		ja-FreeWnn-lib>=1.10
 BUILDLINK_PKGSRCDIR.ja-freewnn?=	../../inputmethod/ja-freewnn-lib
 BUILDLINK_DEPMETHOD.ja-freewnn?=	build
diff --git a/inputmethod/sj3-lib/buildlink2.mk b/inputmethod/sj3-lib/buildlink2.mk
index 0e055b9cd2d..261907b67d2 100644
--- a/inputmethod/sj3-lib/buildlink2.mk
+++ b/inputmethod/sj3-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/27 06:29:20 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:41 jlam Exp $
 
 .if !defined(SJ3_BUILDLINK2_MK)
 SJ3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		sj3
+BUILDLINK_PKGBASE.sj3?=		sj3-lib
 BUILDLINK_DEPENDS.sj3?=		sj3-lib>=2.0.1.20nb1
 BUILDLINK_PKGSRCDIR.sj3?=	../../inputmethod/sj3-lib
 
diff --git a/lang/libperl/buildlink2.mk b/lang/libperl/buildlink2.mk
index 8883ea33188..7023f5080f1 100644
--- a/lang/libperl/buildlink2.mk
+++ b/lang/libperl/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:41 jlam Exp $
 
 .if !defined(LIBPERL5_BUILDLINK2_MK)
 LIBPERL5_BUILDLINK2_MK=  # defined
 
 LIBPERL5_REQD?=			${_PERL5_REQD}
 BUILDLINK_PACKAGES+=		libperl
+BUILDLINK_PKGBASE.libperl?=	{libperl,perl}
 BUILDLINK_DEPENDS.libperl?=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
 BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
 
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index f1be5d6c1fd..e25a2c77d3e 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/29 05:05:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ 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/buildlink2.mk b/math/py-Numeric/buildlink2.mk
index 0cd7212433a..d5158871ca1 100644
--- a/math/py-Numeric/buildlink2.mk
+++ b/math/py-Numeric/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 10:29:18 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:41 jlam Exp $
 
 .if !defined(PY_NUMERIC_BUILDLINK2_MK)
 PY_NUMERIC_BUILDLINK2_MK=	# defined
@@ -6,7 +6,8 @@ PY_NUMERIC_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pynumeric
-BUILDLINK_DEPENDS.pynumeric?=	${PYPKGPREFIX}-Numeric-*
+BUILDLINK_PKGBASE.pynumeric?=	${PYPKGPREFIX}-Numeric
+BUILDLINK_DEPENDS.pynumeric?=	${PYPKGPREFIX}-Numeric-[0-9]*
 BUILDLINK_PKGSRCDIR.pynumeric?=	../../math/py-Numeric
 
 EVAL_PREFIX+=   BUILDLINK_PREFIX.pynumeric=pynumeric
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index a03aee028df..5283d1c8833 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/29 05:05:41 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NUMERIC_BUILDLINK3_MK:=	${PY_NUMERIC_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	pynumeric
 
 .if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
 BUILDLINK_PKGBASE.pynumeric?=	${PYPKGPREFIX}-Numeric
-BUILDLINK_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-*
+BUILDLINK_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-[0-9]*
 BUILDLINK_PKGSRCDIR.pynumeric?=	../../math/py-Numeric
 .endif	# PY_NUMERIC_BUILDLINK3_MK
 
diff --git a/net/libIDL/buildlink2.mk b/net/libIDL/buildlink2.mk
index 2b92444d47c..11425403ce6 100644
--- a/net/libIDL/buildlink2.mk
+++ b/net/libIDL/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/12/04 17:07:48 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/03/29 05:05:41 jlam Exp $
 
 .if !defined(LIBIDL2_BUILDLINK2_MK)
 LIBIDL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		idl
+BUILDLINK_PKGBASE.idl?=		libIDL
 BUILDLINK_DEPENDS.idl?=		libIDL>=0.8.2
 BUILDLINK_PKGSRCDIR.idl?=	../../net/libIDL
 
diff --git a/net/py-ORBit/buildlink2.mk b/net/py-ORBit/buildlink2.mk
index 68db632c560..cb4e9424b0c 100644
--- a/net/py-ORBit/buildlink2.mk
+++ b/net/py-ORBit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/03/29 05:05:42 jlam Exp $
 
 .if !defined(PYORBIT_BUILDLINK2_MK)
 PYORBIT_BUILDLINK2_MK=	# defined
@@ -7,6 +7,7 @@ PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pyorbit
+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/net/py-mimelib/buildlink2.mk b/net/py-mimelib/buildlink2.mk
index aaaefd46762..3d8e33195f6 100644
--- a/net/py-mimelib/buildlink2.mk
+++ b/net/py-mimelib/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/08/11 14:56:54 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:42 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pymimelib
+BUILDLINK_PKGBASE.pymimelib?=	${PYPKGPREFIX}-mimelib
 BUILDLINK_DEPENDS.pymimelib?=	${PYPKGPREFIX}-mimelib-[0-9]*
 BUILDLINK_PKGSRCDIR.pymimelib?=	../../net/py-mimelib
diff --git a/net/py-soappy/buildlink2.mk b/net/py-soappy/buildlink2.mk
index 482df645f3e..d8a0699ce50 100644
--- a/net/py-soappy/buildlink2.mk
+++ b/net/py-soappy/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/03/29 05:05:42 jlam Exp $
 
 .if !defined(SOAPPY_BUILDLINK2_MK)
 SOAPPY_BUILDLINK2_MK=	# defined
@@ -7,6 +7,7 @@ PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			SOAPpy
+BUILDLINK_PKGBASE.SOAPpy?=		${PYPKGPREFIX}-SOAPpy
 BUILDLINK_DEPENDS.SOAPpy?=		${PYPKGPREFIX}-SOAPpy>=0.11.1
 BUILDLINK_RECOMMENDED.SOAPpy?=		${PYPKGPREFIX}-SOAPpy>=0.11.3nb1
 BUILDLINK_PKGSRCDIR.SOAPpy?=		../../net/py-soappy
diff --git a/print/ja-vflib-lib/buildlink2.mk b/print/ja-vflib-lib/buildlink2.mk
index 95ec8ee6a1c..543d58706d2 100644
--- a/print/ja-vflib-lib/buildlink2.mk
+++ b/print/ja-vflib-lib/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:44 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:42 jlam Exp $
 
 .if !defined(VFLIB_BUILDLINK2_MK)
 VFLIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		vflib
+BUILDLINK_PKGBASE.vflib?=	ja-vflib-lib
 BUILDLINK_DEPENDS.vflib?=	ja-vflib-lib>=2.24.2
 BUILDLINK_PKGSRCDIR.vflib?=	../../print/ja-vflib-lib
 
diff --git a/print/py-reportlab-renderPM/buildlink2.mk b/print/py-reportlab-renderPM/buildlink2.mk
index 45ca0b04a65..2128baca8de 100644
--- a/print/py-reportlab-renderPM/buildlink2.mk
+++ b/print/py-reportlab-renderPM/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/28 15:08:50 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:44 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyrlrenderpm
-BUILDLINK_DEPENDS.pyrlrenderpm?= ${PYPKGPREFIX}-reportlab-renderPM-*
+BUILDLINK_PKGBASE.pyrlrenderpm?= ${PYPKGPREFIX}-reportlab-renderPM
+BUILDLINK_DEPENDS.pyrlrenderpm?= ${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
 BUILDLINK_PKGSRCDIR.pyrlrenderpm=../../print/py-reportlab-renderPM
diff --git a/print/py-reportlab/buildlink2.mk b/print/py-reportlab/buildlink2.mk
index 144ad1c9abd..bdd53e90468 100644
--- a/print/py-reportlab/buildlink2.mk
+++ b/print/py-reportlab/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/10 15:11:02 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/29 05:05:43 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyreportlab
+BUILDLINK_PKGBASE.pyreportlab?= ${PYPKGPREFIX}-reportlab
 BUILDLINK_DEPENDS.pyreportlab?= ${PYPKGPREFIX}-reportlab-[0-9]*
 BUILDLINK_PKGSRCDIR.pyreportlab=../../print/py-reportlab
diff --git a/print/teTeX-bin/kpathsea.buildlink2.mk b/print/teTeX-bin/kpathsea.buildlink2.mk
index a8d658d9188..1acc57ba9e2 100644
--- a/print/teTeX-bin/kpathsea.buildlink2.mk
+++ b/print/teTeX-bin/kpathsea.buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: kpathsea.buildlink2.mk,v 1.2 2003/12/24 12:51:31 jmmv Exp $
+# $NetBSD: kpathsea.buildlink2.mk,v 1.3 2004/03/29 05:05:45 jlam Exp $
 
 .if !defined(KPATHSEA_BUILDLINK2_MK)
 KPATHSEA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kpathsea
+BUILDLINK_PKGBASE.kpathsea?=	teTeX-bin
 BUILDLINK_DEPENDS.kpathsea?=	teTeX-bin>=2.0.2
 BUILDLINK_PKGSRCDIR.kpathsea?=	../../print/teTeX-bin
 BUILDLINK_DEPMETHOD.kpathsea?=	build
diff --git a/print/teTeX1-bin/kpathsea.buildlink2.mk b/print/teTeX1-bin/kpathsea.buildlink2.mk
index 2c9dadfecbd..798a9f88db4 100644
--- a/print/teTeX1-bin/kpathsea.buildlink2.mk
+++ b/print/teTeX1-bin/kpathsea.buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: kpathsea.buildlink2.mk,v 1.1.1.1 2003/12/24 12:57:30 jmmv Exp $
+# $NetBSD: kpathsea.buildlink2.mk,v 1.2 2004/03/29 05:05:45 jlam Exp $
 
 .if !defined(KPATHSEA_BUILDLINK2_MK)
 KPATHSEA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kpathsea
+BUILDLINK_PKGBASE.kpathsea?=	teTeX-bin
 BUILDLINK_DEPENDS.kpathsea?=	teTeX-bin>=1.0.7nb2
 BUILDLINK_PKGSRCDIR.kpathsea?=	../../print/teTeX1-bin
 BUILDLINK_DEPMETHOD.kpathsea?=	build
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index c429fb3ae90..be8f7cd351e 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:07 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/03/29 05:05:45 jlam Exp $
 
 .if !defined(PAM_BUILDLINK2_MK)
 PAM_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILDLINK_PKGBASE.pam?=		PAM
 BUILDLINK_DEPENDS.pam?=		PAM>=0.75
 BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
 
diff --git a/textproc/py-FourSuite/buildlink2.mk b/textproc/py-FourSuite/buildlink2.mk
index 66dfd501568..74495a66287 100644
--- a/textproc/py-FourSuite/buildlink2.mk
+++ b/textproc/py-FourSuite/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/12/04 12:47:42 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:45 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyfoursuite
-BUILDLINK_DEPENDS.pyfoursuite?=	${PYPKGPREFIX}-FourSuite-*
+BUILDLINK_PKGBASE.pyfoursuite?=	${PYPKGPREFIX}-FourSuite
+BUILDLINK_DEPENDS.pyfoursuite?=	${PYPKGPREFIX}-FourSuite-[0-9]*
 BUILDLINK_PKGSRCDIR.pyfoursuite?=	../../textproc/py-FourSuite
diff --git a/textproc/py-xml/buildlink2.mk b/textproc/py-xml/buildlink2.mk
index 7d39e376605..c4a78e163fd 100644
--- a/textproc/py-xml/buildlink2.mk
+++ b/textproc/py-xml/buildlink2.mk
@@ -1,7 +1,8 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/23 15:25:39 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:45 jlam Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyxml
-BUILDLINK_DEPENDS.pyxml?=	${PYPKGPREFIX}-xml-*
+BUILDLINK_PKGBASE.pyxml?=	${PYPKGPREFIX}-xml
+BUILDLINK_DEPENDS.pyxml?=	${PYPKGPREFIX}-xml-[0-9]*
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
diff --git a/time/py-mxDateTime/buildlink2.mk b/time/py-mxDateTime/buildlink2.mk
index 614dd93eb75..9b0e5b59e29 100644
--- a/time/py-mxDateTime/buildlink2.mk
+++ b/time/py-mxDateTime/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/25 14:14:24 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/29 05:05:46 jlam Exp $
 
 .if !defined(PY_MXDATETIME_BUILDLINK2_MK)
 PY_MXDATETIME_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PY_MXDATETIME_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pymxdatetime
+BUILDLINK_PKGBASE.pymxdatetime?=	${PYPKGPREFIX}-mxDateTime
 BUILDLINK_DEPENDS.pymxdatetime?=	${PYPKGPREFIX}-mxDateTime-[0-9]*
 BUILDLINK_PKGSRCDIR.pymxdatetime?=	../../time/py-mxDateTime
 
diff --git a/www/apache/buildlink2.mk b/www/apache/buildlink2.mk
index 421fab7d493..fab7da4d948 100644
--- a/www/apache/buildlink2.mk
+++ b/www/apache/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/18 21:46:02 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/29 05:05:46 jlam Exp $
 
 .if !defined(APACHE_BUILDLINK2_MK)
 APACHE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		apache
+BUILDLINK_PKGBASE.apache?=	apache{,6}
 BUILDLINK_DEPENDS.apache?=	apache{,6}-1.3.*
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
 
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 22b3368dd22..fcbb492f933 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/29 05:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ 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/www/php4/buildlink2.mk b/www/php4/buildlink2.mk
index 7bbfdcd7c06..f8dae53568a 100644
--- a/www/php4/buildlink2.mk
+++ b/www/php4/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/11/08 06:58:10 jdolecek Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/29 05:05:46 jlam Exp $
 
 .if !defined(PHP4_BUILDLINK2_MK)
 PHP4_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		php4
+BUILDLINK_PKGBASE.php4?=	php
 BUILDLINK_DEPENDS.php4?=	php>=4.3.4
 BUILDLINK_PKGSRCDIR.php4?=	../../www/php4
 
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