Add a few new buildlink2.mk files and convert existing buildlink2.mk files

to: (1) no longer include bsd.buildlink2.mk (2) define BUILDLINK_PKGSRCDIR.<pkg> and optionally BUILDLINK_DEPMETHOD.<pkg>; these are used to generate the correct dependency on <pkg>
author: jlam <jlam@pkgsrc.org> 2002-06-21 23:00:21 +0000
committer: jlam <jlam@pkgsrc.org> 2002-06-21 23:00:21 +0000
commit: 44ee9a7c648dbde9a7b3ec071d0fd8f63ad442c3 (patch)
tree: cc03ef7b99af01a38169fd9eeea4424361f24e02
parent: a3031ef90e9db9ac046f90e1f063e9aec72ad5e4 (diff)
download: pkgsrc-44ee9a7c648dbde9a7b3ec071d0fd8f63ad442c3.tar.gz
73 files changed, 341 insertions, 810 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk
index 1ca7171f0fa..72e96d2f64c 100644
--- a/archivers/bzip2/buildlink2.mk
+++ b/archivers/bzip2/buildlink2.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:31 jlam Exp $
-#
-# This Makefile fragment is included by packages that use bzip2.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.bzip2 to the dependency pattern
-#     for the version of bzip2 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:24 jlam Exp $
 
 .if !defined(BZIP2_BUILDLINK2_MK)
 BZIP2_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.bzip2?=	bzip2>=1.0.1
+BUILDLINK_PKGSRCDIR.bzip2?=	../../archivers/bzip2
 
 .if exists(/usr/include/bzlib.h)
 #
@@ -22,7 +14,7 @@ BUILDLINK_DEPENDS.bzip2?=	bzip2>=1.0.1
 #
 _BUILTIN_BZIP2!=	${EGREP} -c "BZ2_" /usr/include/bzlib.h || ${TRUE}
 .else
-_BUILTIN_BZIP2!=	0
+_BUILTIN_BZIP2=		0
 .endif
 
 .if ${_BUILTIN_BZIP2} == "0"
@@ -32,11 +24,11 @@ _NEED_BZIP2=		NO
 .endif
 
 .if ${_NEED_BZIP2} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.bzip2}:../../archivers/bzip2
-EVAL_PREFIX+=	BUILDLINK_PREFIX.bzip2=bzip2
+BUILDLINK_PACKAGES+=		bzip2
+EVAL_PREFIX+=			BUILDLINK_PREFIX.bzip2=bzip2
 BUILDLINK_PREFIX.bzip2_DEFAULT=	${LOCALBASE}
 .else
-BUILDLINK_PREFIX.bzip2=	/usr
+BUILDLINK_PREFIX.bzip2=		/usr
 .endif
 
 BUILDLINK_FILES.bzip2=		include/bzlib.h
diff --git a/archivers/liblzo/buildlink2.mk b/archivers/liblzo/buildlink2.mk
index 35715fca854..3c8e0ce11c4 100644
--- a/archivers/liblzo/buildlink2.mk
+++ b/archivers/liblzo/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:32 jlam Exp $
-#
-# This Makefile fragment is included by packages that use liblzo.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.liblzo to the dependency pattern
-#     for the version of liblzo desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:24 jlam Exp $
 
 .if !defined(LIBLZO_BUILDLINK2_MK)
 LIBLZO_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		liblzo
 BUILDLINK_DEPENDS.liblzo?=	liblzo>=1.06
-DEPENDS+=	${BUILDLINK_DEPENDS.liblzo}:../../archivers/liblzo
+BUILDLINK_PKGSRCDIR.liblzo?=	../../archivers/liblzo
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.liblzo=liblzo
 BUILDLINK_PREFIX.liblzo_DEFAULT=	${LOCALBASE}
diff --git a/audio/esound/buildlink2.mk b/audio/esound/buildlink2.mk
index 677e4456a44..d812f1181a7 100644
--- a/audio/esound/buildlink2.mk
+++ b/audio/esound/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:32 jlam Exp $
-#
-# This Makefile fragment is included by packages that use esound.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.esound to the dependency pattern
-#     for the version of esound desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:25 jlam Exp $
 
 .if !defined(ESOUND_BUILDLINK2_MK)
 ESOUND_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		esound
 BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
-DEPENDS+=			${BUILDLINK_DEPENDS.esound}:../../audio/esound
+BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.esound=esound
 BUILDLINK_PREFIX.esound_DEFAULT=	${LOCALBASE}
diff --git a/audio/libaudiofile/buildlink2.mk b/audio/libaudiofile/buildlink2.mk
index 73e6ec79a60..c4319420f05 100644
--- a/audio/libaudiofile/buildlink2.mk
+++ b/audio/libaudiofile/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:32 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libaudiofile.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.audiofile to the dependency pattern
-#     for the version of libaudiofile desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:25 jlam Exp $
 
 .if !defined(AUDIOFILE_BUILDLINK2_MK)
 AUDIOFILE_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		audiofile
 BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
-DEPENDS+=	${BUILDLINK_DEPENDS.audiofile}:../../audio/libaudiofile
+BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.audiofile=audiofile
 BUILDLINK_PREFIX.audiofile_DEFAULT=	${LOCALBASE}
diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk
index b1a73e1626a..874397dfa15 100644
--- a/audio/libogg/buildlink2.mk
+++ b/audio/libogg/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:33 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libogg.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libogg to the dependency pattern
-#     for the version of libogg desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:25 jlam Exp $
 
 .if !defined(LIBOGG_BUILDLINK2_MK)
 LIBOGG_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink.mk"
-
+BUILDLINK_PACKAGES+=		libogg
 BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.7
-DEPENDS+=	${BUILDLINK_DEPENDS.libogg}:../../audio/libogg
+BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libogg=libogg
 BUILDLINK_PREFIX.libogg_DEFAULT=	${LOCALBASE}
diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk
index 2732c4f1c7a..5fb5afeda87 100644
--- a/audio/libvorbis/buildlink2.mk
+++ b/audio/libvorbis/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:33 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libvorbis.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libvorbis to the dependency pattern
-#     for the version of libvorbis desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:26 jlam Exp $
 
 .if !defined(LIBVORBIS_BUILDLINK2_MK)
 LIBVORBIS_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libvorbis
 BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.7
-DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis
+BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libvorbis=libvorbis
 BUILDLINK_PREFIX.libvorbis_DEFAULT=	${LOCALBASE}
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index 2d93d650252..cceab8ad3d9 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:34 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libiconv.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.iconv to the dependency pattern
-#     for the version of libiconv desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:26 jlam Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		iconv
 BUILDLINK_DEPENDS.iconv?=	libiconv>=1.5
-DEPENDS+=	${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv
+BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.iconv=libiconv
 BUILDLINK_PREFIX.iconv_DEFAULT=		${LOCALBASE}
diff --git a/databases/gdbm/buildlink2.mk b/databases/gdbm/buildlink2.mk
index ac7464dcd7f..619b365ed7e 100644
--- a/databases/gdbm/buildlink2.mk
+++ b/databases/gdbm/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:34 jlam Exp $
-#
-# This Makefile fragment is included by packages that use gdbm.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.gdbm to the dependency pattern
-#     for the version of gdbm desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:26 jlam Exp $
 
 .if !defined(GDBM_BUILDLINK2_MK)
 GDBM_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		gdbm
 BUILDLINK_DEPENDS.gdbm?=	gdbm>=1.7.3
-DEPENDS+=	${BUILDLINK_DEPENDS.gdbm}:../../databases/gdbm
+BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gdbm=gdbm
 BUILDLINK_PREFIX.gdbm_DEFAULT=	${LOCALBASE}
diff --git a/databases/mysql-client/buildlink2.mk b/databases/mysql-client/buildlink2.mk
index cd743f03e24..40e274f936e 100644
--- a/databases/mysql-client/buildlink2.mk
+++ b/databases/mysql-client/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:34 jlam Exp $
-#
-# This Makefile fragment is included by packages that use mysql-client.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.mysql-client to the dependency pattern
-#     for the version of mysql-client desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:26 jlam Exp $
 
 .if !defined(MYSQL_CLIENT_BUILDLINK2_MK)
 MYSQL_CLIENT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=			mysql-client
 BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.22
-DEPENDS+=	${BUILDLINK_DEPENDS.mysql-client}:../../databases/mysql-client
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.mysql-client=mysql-client
 BUILDLINK_PREFIX.mysql-client_DEFAULT=	${LOCALBASE}
diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk
index 2fb29183005..faecda20c84 100644
--- a/databases/openldap/buildlink2.mk
+++ b/databases/openldap/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:35 jlam Exp $
-#
-# This Makefile fragment is included by packages that use openldap.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.openldap to the dependency pattern
-#     for the version of openldap desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:27 jlam Exp $
 
 .if !defined(OPENLDAP_BUILDLINK2_MK)
 OPENLDAP_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		openldap
 BUILDLINK_DEPENDS.openldap?=	openldap-2.0.*
-DEPENDS+=	${BUILDLINK_DEPENDS.openldap}:../../databases/openldap
+BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openldap=openldap
 BUILDLINK_PREFIX.openldap_DEFAULT=	${LOCALBASE}
diff --git a/databases/postgresql-lib/buildlink2.mk b/databases/postgresql-lib/buildlink2.mk
index 9160ccf72a8..542f3a2ac7e 100644
--- a/databases/postgresql-lib/buildlink2.mk
+++ b/databases/postgresql-lib/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:35 jlam Exp $
-#
-# This Makefile fragment is included by packages that use postgresql-lib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.postgresql-lib to the dependency
-#     pattern for the version of postgresql-lib desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:27 jlam Exp $
 
 .if !defined(POSTGRESQL_LIB_BUILDLINK2_MK)
 POSTGRESQL_LIB_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=			postgresql-lib
 BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-{6.5.3*,7.0*,lib-*}
-DEPENDS+=	${BUILDLINK_DEPENDS.postgresql-lib}:../../databases/postgresql-lib
+BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.postgresql-lib=postgresql-lib
 BUILDLINK_PREFIX.postgresql-lib_DEFAULT=	${LOCALBASE}
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index f857016ab13..23724c32043 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:35 jlam Exp $
-#
-# This Makefile fragment is included by packages that use gettext.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.gettext to the dependency pattern
-#     for the version of gettext desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:27 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
+BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 
 .if defined(USE_GNU_GETTEXT)
 _NEED_GNU_GETTEXT=	YES
@@ -25,7 +17,7 @@ _NEED_GNU_GETTEXT=	YES
 .endif
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.gettext}:../../devel/gettext-lib
+BUILDLINK_PACKAGES+=			gettext
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gettext=gettext-lib
 BUILDLINK_PREFIX.gettext_DEFAULT=	${LOCALBASE}
 .else
diff --git a/devel/glib/buildlink2.mk b/devel/glib/buildlink2.mk
index b390a443dd0..b4379f6439f 100644
--- a/devel/glib/buildlink2.mk
+++ b/devel/glib/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:36 jlam Exp $
-#
-# This Makefile fragment is included by packages that use glib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.glib to the dependency pattern
-#     for the version of glib desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:27 jlam Exp $
 
 .if !defined(GLIB_BUILDLINK2_MK)
 GLIB_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		glib
 BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
-DEPENDS+=	${BUILDLINK_DEPENDS.glib}:../../devel/glib
+BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.glib=glib
 BUILDLINK_PREFIX.glib_DEFAULT=	${LOCALBASE}
diff --git a/devel/libgetopt/buildlink2.mk b/devel/libgetopt/buildlink2.mk
index 8a9329fdb21..1076204836d 100644
--- a/devel/libgetopt/buildlink2.mk
+++ b/devel/libgetopt/buildlink2.mk
@@ -1,20 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:36 jlam Exp $
-#
-# This Makefile fragment is included by packages that use getopt_long().
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.getopt to the dependency pattern
-#     for the version of libgetopt desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:28 jlam Exp $
 
 .if !defined(GETOPT_BUILDLINK2_MK)
 GETOPT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
-
 BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
+BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
 
 .if exists(/usr/include/getopt.h)
 _NEED_GETOPT=		NO
@@ -27,7 +17,7 @@ BUILDLINK_PREFIX.getopt=	/usr
 BUILDLINK_FILES.getopt=		include/getopt.h
 LIBGETOPT=			# empty
 .else
-DEPENDS+=	${BUILDLINK_DEPENDS.getopt}:../../devel/libgetopt
+BUILDLINK_PACKAGES+=		getopt
 EVAL_PREFIX+=	BUILDLINK_PREFIX.getopt=libgetopt
 BUILDLINK_PREFIX.getopt_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.getopt=		include/getopt.h
diff --git a/devel/libmm/buildlink2.mk b/devel/libmm/buildlink2.mk
new file mode 100644
index 00000000000..6e863b97af9
--- /dev/null
+++ b/devel/libmm/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/21 23:00:21 jlam Exp $
+
+.if !defined(LIBMM_BUILDLINK2_MK)
+LIBMM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libmm
+BUILDLINK_DEPENDS.libmm?=	libmm>=1.1.3
+BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libmm=libmm
+BUILDLINK_PREFIX.libmm_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libmm=		include/mm.h
+BUILDLINK_FILES.libmm+=		lib/libmm.*
+
+BUILDLINK_TARGETS+=	libmm-buildlink
+
+libmm-buildlink: _BUILDLINK_USE
+
+.endif	# LIBMM_BUILDLINK2_MK
diff --git a/devel/libtool/buildlink2.mk b/devel/libtool/buildlink2.mk
index d91c1cfb24c..7dec582ff9f 100644
--- a/devel/libtool/buildlink2.mk
+++ b/devel/libtool/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:36 jlam Exp $
-#
-# This Makefile fragment is included by packages that use ltdl.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.ltdl to the dependency pattern
-#     for the version of libtool-base desired.
-# (1) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:28 jlam Exp $
 
 .if !defined(LTDL_BUILDLINK2_MK)
 LTDL_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		ltdl
 BUILDLINK_DEPENDS.ltdl?=	libtool-base>=${LIBTOOL_REQD}
-DEPENDS+=	${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool-base
+BUILDLINK_PKGSRCDIR.ltdl?=	../../devel/libtool-base
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.ltdl=libtool-base
 BUILDLINK_PREFIX.ltdl_DEFAULT=	${LOCALBASE}
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index 031832ef8f2..84ab6b0d359 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -1,23 +1,18 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:28 jlam Exp $
 #
-# This Makefile fragment is included by packages that use ncurses.
+# Optionally define:
 #
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define USE_NCURSES to force use of ncurses,
-#     or define INCOMPAT_CURSES to specify NetBSD versions that are
-#     missing some needed functions.
-# (2) Optionally define BUILDLINK_DEPENDS.ncurses to the dependency pattern
-#     for the version of ncurses desired.
-# (3) Include this Makefile fragment in the package Makefile.
+# USE_NCURSES		force use of ncurses
+# INCOMPAT_CURSES	specify NetBSD versions that are missing some
+#			needed functions.
 
 .if !defined(NCURSES_BUILDLINK2_MK)
 NCURSES_BUILDLINK2_MK=     # defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.0
+BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
 
 .if defined(USE_NCURSES)
 _NEED_NCURSES=		YES
@@ -36,6 +31,7 @@ _NEED_NCURSES=		YES
 .endif
 
 .if ${_NEED_NCURSES} == "YES"
+BUILDLINK_PACKAGES+=		ncurses
 EVAL_PREFIX+=	BUILDLINK_PREFIX.ncurses=ncurses
 BUILDLINK_PREFIX.ncurses_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.ncurses=	include/cursesapp.h
@@ -58,7 +54,6 @@ BUILDLINK_FILES.ncurses+=	lib/libmenu.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses++.*
 BUILDLINK_FILES.ncurses+=	lib/libncurses.*
 BUILDLINK_FILES.ncurses+=	lib/libpanel.*
-DEPENDS+=			${BUILDLINK_DEPENDS.ncurses}:../../devel/ncurses
 .else
 BUILDLINK_PREFIX.ncurses=	/usr
 BUILDLINK_FILES.ncurses=	include/curses.h
@@ -74,16 +69,13 @@ BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses.h|/ncurses.h|g"
 BUILDLINK_TRANSFORM+=		l:ncurses:curses
 .endif
 
-BUILDLINK_TARGETS.ncurses+=	ncurses-buildlink
-.if defined(USE_BUILDLINK2_ONLY)
-BUILDLINK_TARGETS.ncurses+=	ncurses-curses-h
-.endif
+BUILDLINK_TARGETS+=	ncurses-buildlink
+BUILDLINK_TARGETS+=	ncurses-curses-h
+
 .if ${_NEED_NCURSES} == "NO"
-BUILDLINK_TARGETS.ncurses+=	ncurses-extra-includes-buildlink
+BUILDLINK_TARGETS+=	ncurses-extra-includes-buildlink
 .endif
-BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ncurses}
 
-pre-configure: ${BUILDLINK_TARGETS.ncurses}
 ncurses-buildlink: _BUILDLINK_USE
 
 ncurses-extra-includes-buildlink:
diff --git a/devel/pcre/buildlink2.mk b/devel/pcre/buildlink2.mk
index 3fefbaef5bf..80d75aac974 100644
--- a/devel/pcre/buildlink2.mk
+++ b/devel/pcre/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:37 jlam Exp $
-#
-# This Makefile fragment is included by packages that use pcre.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.pcre to the dependency pattern
-#     for the version of pcre desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:28 jlam Exp $
 
 .if !defined(PCRE_BUILDLINK2_MK)
 PCRE_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		pcre
 BUILDLINK_DEPENDS.pcre?=	pcre>=3.4
-DEPENDS+=	${BUILDLINK_DEPENDS.pcre}:../../devel/pcre
+BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pcre=pcre
 BUILDLINK_PREFIX.pcre_DEFAULT=	${LOCALBASE}
diff --git a/devel/pth/buildlink2.mk b/devel/pth/buildlink2.mk
index bdd3e99f534..c4c27386274 100644
--- a/devel/pth/buildlink2.mk
+++ b/devel/pth/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:37 jlam Exp $
-#
-# This Makefile fragment is included by packages that use pth.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.pth to the dependency pattern
-#     for the version of pth desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:29 jlam Exp $
 
 .if !defined(PTH_BUILDLINK2_MK)
 PTH_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.pth?=	pth>=1.3.2
-DEPENDS+=		${BUILDLINK_DEPENDS.pth}:../../devel/pth
+BUILDLINK_PACKAGES+=		pth
+BUILDLINK_DEPENDS.pth?=		pth>=1.3.2
+BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pth=pth
 BUILDLINK_PREFIX.pth_DEFAULT=	${LOCALBASE}
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index e3717bf391d..f9f14ff8b0c 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,23 +1,14 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:29 jlam Exp $
 #
-# This Makefile fragment is included by packages that use readline().
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define USE_GNU_READLINE to force use of GNU readline.
-# (2) Optionally define BUILDLINK_DEPENDS.readline to the dependency pattern
-#     for the version of GNU readline desired.
-#
-# NOTE:	You may need to do some more work to get libedit recognized over
-#	libreadline, especially by GNU configure scripts.
+# Optionally define USE_GNU_READLINE to force use of GNU readline.
 
 .if !defined(READLINE_BUILDLINK2_MK)
 READLINE_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.readline?=	readline>=2.2
+BUILDLINK_PKGSRCDIR.readline?=	../../devel/readline
 
 .if defined(USE_GNU_READLINE)
 _NEED_GNU_READLINE=	YES
@@ -29,7 +20,7 @@ _NEED_GNU_READLINE=	YES
 .endif
 
 .if ${_NEED_GNU_READLINE} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.readline}:../../devel/readline
+BUILDLINK_PACKAGES+=		readline
 EVAL_PREFIX+=	BUILDLINK_PREFIX.readline=readline
 BUILDLINK_PREFIX.readline_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.readline=	include/readline/*
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 1abc3d8b709..631a6a40161 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:37 jlam Exp $
-#
-# This Makefile fragment is included by packages that use zlib. 
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.zlib to the dependency pattern
-#     for the version of zlib desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:29 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.zlib?=	zlib>=1.1.3
+BUILDLINK_PKGSRCDIR.zlib?=	../../devel/zlib
 
 .if exists(/usr/include/zlib.h)
 _NEED_ZLIB=		NO
@@ -23,7 +15,7 @@ _NEED_ZLIB=		YES
 .endif
 
 .if ${_NEED_ZLIB} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.zlib}:../../devel/zlib
+BUILDLINK_PACKAGES+=		zlib
 EVAL_PREFIX+=	BUILDLINK_PREFIX.zlib=zlib
 BUILDLINK_PREFIX.zlib_DEFAULT=	${LOCALBASE}
 .else
diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk
index bd4c4529b14..f4fc497cf0a 100644
--- a/graphics/Mesa/buildlink2.mk
+++ b/graphics/Mesa/buildlink2.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:09 jlam Exp $
-#
-# This Makefile fragment is included by packages that use Mesa.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:29 jlam Exp $
 
 .if !defined(MESA_BUILDLINK2_MK)
 MESA_BUILDLINK2_MK=	# defined
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index ee779597053..62035d3469c 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,17 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:09 jlam Exp $
-#
-# This Makefile fragment is included by packages that use MesaLib.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:30 jlam Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=3.4.2
+BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
 # Check if we got Mesa distributed with XFree86 4.x or if we need to
 # depend on the Mesa package.
@@ -28,7 +23,7 @@ _NEED_MESALIB=		NO
 .endif
 
 .if ${_NEED_MESALIB} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.MesaLib}:../../graphics/MesaLib
+BUILDLINK_PACKAGES+=		MesaLib
 EVAL_PREFIX+=	BUILDLINK_PREFIX.MesaLib=MesaLib
 BUILDLINK_PREFIX.MesaLib_DEFAULT=	${X11PREFIX}
 .else
diff --git a/graphics/freetype-lib/buildlink2.mk b/graphics/freetype-lib/buildlink2.mk
index c0917a7db06..f7f94987ef7 100644
--- a/graphics/freetype-lib/buildlink2.mk
+++ b/graphics/freetype-lib/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:39 jlam Exp $
-#
-# This Makefile fragment is included by packages that use freetype.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.freetype to the dependency pattern
-#     for the version of freetype desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:30 jlam Exp $
 
 .if !defined(FREETYPE_BUILDLINK2_MK)
 FREETYPE_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		freetype
 BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1
-DEPENDS+=	${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib
+BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.freetype=freetype-lib
 BUILDLINK_PREFIX.freetype_DEFAULT=	${LOCALBASE}
diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk
index c8ba84cd56f..c4f15420e7f 100644
--- a/graphics/freetype2/buildlink2.mk
+++ b/graphics/freetype2/buildlink2.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:10 jlam Exp $
-#
-# This Makefile fragment is included by packages that use freetype2.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.freetype2 to the dependency pattern
-#     for the version of freetype2 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:30 jlam Exp $
 
 .if !defined(FREETYPE2_BUILDLINK2_MK)
 FREETYPE2_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.1
+BUILDLINK_PKGSRCDIR.freetype2?=	../../graphics/freetype2
 
 # Check if we got FreeType2 distributed with XFree86 4.x or if we need to
 # depend on the freetype2 package.
@@ -31,7 +23,7 @@ _NEED_FREETYPE2=	NO
 .endif
 
 .if ${_NEED_FREETYPE2} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.freetype2}:../../graphics/freetype2
+BUILDLINK_PACKAGES+=			freetype2
 EVAL_PREFIX+=	BUILDLINK_PREFIX.freetype2=freetype2
 BUILDLINK_PREFIX.freetype2_DEFAULT=	${LOCALBASE}
 .else
diff --git a/graphics/gdk-pixbuf/buildlink2.mk b/graphics/gdk-pixbuf/buildlink2.mk
index 3a0bcb05232..06c2ca454ff 100644
--- a/graphics/gdk-pixbuf/buildlink2.mk
+++ b/graphics/gdk-pixbuf/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:39 jlam Exp $
-#
-# This Makefile fragment is included by packages that use gdk-pixbuf.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.gkd-pixbuf to the dependency version
-#     for the version of gdk-pixbuf desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:30 jlam Exp $
 
 .if !defined(GDK_PIXBUF_BUILDLINK2_MK)
 GDK_PIXBUF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.gdk-pixbuf?=	gdk-pixbuf>=0.11.0nb1
-DEPENDS+=	${BUILDLINK_DEPENDS.gdk-pixbuf}:../../graphics/gdk-pixbuf
+BUILDLINK_PACKAGES+=			gdk-pixbuf
+BUILDLINK_DEPENDS.gdk-pixbuf?=		gdk-pixbuf>=0.11.0nb1
+BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
 BUILDLINK_PREFIX.gdk-pixbuf_DEFAULT=	${X11PREFIX}
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index f100bfbbe91..18911a560bb 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,17 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:11 jlam Exp $
-#
-# This Makefile fragment is included by packages that use glu.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:31 jlam Exp $
 
 .if !defined(GLU_BUILDLINK2_MK)
 GLU_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
-BUILDLINK_DEPENDS.glu?=	glu>=3.4.2
+BUILDLINK_DEPENDS.glu?=		glu>=3.4.2
+BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 
 # Check if we got libGLU distributed with XFree86 4.x or if we need to
 # depend on the glu package.
@@ -28,7 +23,7 @@ _NEED_GLU=		NO
 .endif
 
 .if ${_NEED_GLU} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.glu}:../../graphics/glu
+BUILDLINK_PACKAGES+=		glu
 EVAL_PREFIX+=	BUILDLINK_PREFIX.glu=glu
 BUILDLINK_PREFIX.glu_DEFAULT=	${X11PREFIX}
 .else
diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk
index 1f82a238875..7453ec57099 100644
--- a/graphics/glut/buildlink2.mk
+++ b/graphics/glut/buildlink2.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:12 jlam Exp $
-#
-# This Makefile fragment is included by packages that use glut.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:31 jlam Exp $
 
 .if !defined(GLUT_BUILDLINK2_MK)
 GLUT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		glut
 BUILDLINK_DEPENDS.glut?=	glut>=3.4.2
+BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 
-DEPENDS+=		${BUILDLINK_DEPENDS.glut}:../../graphics/glut
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glut=glut
 BUILDLINK_PREFIX.glut_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.glut=	include/GL/glut.h
diff --git a/graphics/imlib/buildlink2.mk b/graphics/imlib/buildlink2.mk
index 21556ee7f81..5d3e6ce4ab0 100644
--- a/graphics/imlib/buildlink2.mk
+++ b/graphics/imlib/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:40 jlam Exp $
-#
-# This Makefile fragment is included by packages that use imlib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.imlib to the dependency pattern
-#     for the version of imlib desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:31 jlam Exp $
 
 .if !defined(IMLIB_BUILDLINK2_MK)
 IMLIB_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		imlib
 BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.11nb1
-DEPENDS+=	${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
+BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib=imlib
 BUILDLINK_PREFIX.imlib_DEFAULT=	${X11PREFIX}
diff --git a/graphics/jpeg/buildlink2.mk b/graphics/jpeg/buildlink2.mk
index cb4dd35a63f..3d06846e6bd 100644
--- a/graphics/jpeg/buildlink2.mk
+++ b/graphics/jpeg/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:40 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libjpeg.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.jpeg to the dependency pattern
-#     for the version of libjpeg desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:31 jlam Exp $
 
 .if !defined(JPEG_BUILDLINK2_MK)
 JPEG_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		jpeg
 BUILDLINK_DEPENDS.jpeg?=	jpeg-6b
-DEPENDS+=	${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg
+BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.jpeg=jpeg
 BUILDLINK_PREFIX.jpeg_DEFAULT=	${LOCALBASE}
diff --git a/graphics/lcms/buildlink2.mk b/graphics/lcms/buildlink2.mk
index dcd94b3b949..95cadeca0e9 100644
--- a/graphics/lcms/buildlink2.mk
+++ b/graphics/lcms/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:40 jlam Exp $
-#
-# This Makefile fragment is included by packages that use lcms.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.lcms to the dependency pattern
-#     for the version of lcms desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:32 jlam Exp $
 
 .if !defined(LCMS_BUILDLINK2_MK)
 LCMS_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		lcms
 BUILDLINK_DEPENDS.lcms?=	lcms>=1.06
-DEPENDS+=	${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms
+BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.lcms=lcms
 BUILDLINK_PREFIX.lcms_DEFAULT=	${LOCALBASE}
diff --git a/graphics/libungif/buildlink2.mk b/graphics/libungif/buildlink2.mk
index 055d0a19b79..bfc48ec93ff 100644
--- a/graphics/libungif/buildlink2.mk
+++ b/graphics/libungif/buildlink2.mk
@@ -1,22 +1,13 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:41 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libungif.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libungif to the dependency pattern
-#     for the version of libungif desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:32 jlam Exp $
 
 .if !defined(LIBUNGIF_BUILDLINK2_MK)
 LIBUNGIF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libungif
 BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
-DEPENDS+=	${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif
+BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
 
-EVAL_PREIFX+=	BUILDLINK_PREFIX.libungif=libungif
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libungif=libungif
 BUILDLINK_PREFIX.libungif_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libungif=	include/gif_lib.h
 BUILDLINK_FILES.libungif+=	lib/libgif.*
diff --git a/graphics/mng/buildlink2.mk b/graphics/mng/buildlink2.mk
index 9e0eac13b46..941b6d9e037 100644
--- a/graphics/mng/buildlink2.mk
+++ b/graphics/mng/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:41 jlam Exp $
-#
-# This Makefile fragment is included by packages that use mng.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.mng to the dependency pattern
-#     for the version of mng desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:32 jlam Exp $
 
 .if !defined(MNG_BUILDLINK2_MK)
 MNG_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.mng?=	mng>=1.0.0
-DEPENDS+=		${BUILDLINK_DEPENDS.mng}:../../graphics/mng
+BUILDLINK_PACKAGES+=		mng
+BUILDLINK_DEPENDS.mng?=		mng>=1.0.0
+BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.mng=mng
 BUILDLINK_PREFIX.mng_DEFAULT=	${LOCALBASE}
diff --git a/graphics/netpbm/buildlink2.mk b/graphics/netpbm/buildlink2.mk
index 02dab8afe0e..3e8d73ae358 100644
--- a/graphics/netpbm/buildlink2.mk
+++ b/graphics/netpbm/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:41 jlam Exp $
-#
-# This Makefile fragment is included by packages that use netpbm.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.netpbm to the dependency pattern
-#     for the version of netpbm desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:33 jlam Exp $
 
 .if !defined(NETPBM_BUILDLINK2_MK)
 NETPBM_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		netpbm
 BUILDLINK_DEPENDS.netpbm?=	netpbm>=9.24
-DEPENDS+=	${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
+BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.netpbm=netpbm
 BUILDLINK_PREFIX.netpbm_DEFAULT=	${LOCALBASE}
diff --git a/graphics/png/buildlink2.mk b/graphics/png/buildlink2.mk
index b38839a2cdf..88ec1a4c86d 100644
--- a/graphics/png/buildlink2.mk
+++ b/graphics/png/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:42 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libpng.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.png to the dependency pattern
-#     for the version of libpng desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:33 jlam Exp $
 
 .if !defined(PNG_BUILDLINK2_MK)
 PNG_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.png?=	png>=1.2.1
-DEPENDS+=		${BUILDLINK_DEPENDS.png}:../../graphics/png
+BUILDLINK_PACKAGES+=		png
+BUILDLINK_DEPENDS.png?=		png>=1.2.1
+BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.png=png
 BUILDLINK_PREFIX.png_DEFAULT=	${LOCALBASE}
diff --git a/graphics/tiff/buildlink2.mk b/graphics/tiff/buildlink2.mk
index 2ee9012fc37..02be0326795 100644
--- a/graphics/tiff/buildlink2.mk
+++ b/graphics/tiff/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:42 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libtiff.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.tiff to the dependency pattern
-#     for the version of libtiff desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:33 jlam Exp $
 
 .if !defined(TIFF_BUILDLINK2_MK)
 TIFF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		tiff
 BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
-DEPENDS+=	${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff
+BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.tiff=tiff
 BUILDLINK_PREFIX.tiff_DEFAULT=	${LOCALBASE}
diff --git a/graphics/xpm/buildlink2.mk b/graphics/xpm/buildlink2.mk
index 99c924f9a88..26fd745b4d7 100644
--- a/graphics/xpm/buildlink2.mk
+++ b/graphics/xpm/buildlink2.mk
@@ -1,17 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:16 jlam Exp $
-#
-# This Makefile fragment is included by packages that use xpm.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:33 jlam Exp $
 
 .if !defined(XPM_BUILDLINK2_MK)
 XPM_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
-BUILDLINK_DEPENDS.xpm?=	xpm-3.4k
+BUILDLINK_DEPENDS.xpm?=		xpm-3.4k
+BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
 
 # Check if we got Xpm distributed with XFree86 4.x or if we need to
 # depend on the Xpm package.
@@ -29,7 +24,7 @@ _NEED_XPM=		NO
 .endif
 
 .if ${_NEED_XPM} == "YES"
-DEPENDS+=		${BUILDLINK_DEPENDS.xpm}:../../graphics/xpm
+BUILDLINK_PACKAGES+=	xpm
 EVAL_PREFIX+=		BUILDLINK_PREFIX.xpm=xpm
 BUILDLINK_PREFIX.xpm_DEFAULT=	${X11PREFIX}
 .else
diff --git a/japanese/vflib-lib/buildlink2.mk b/japanese/vflib-lib/buildlink2.mk
index 9409e77a33f..5db54feb02a 100644
--- a/japanese/vflib-lib/buildlink2.mk
+++ b/japanese/vflib-lib/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:43 jlam Exp $
-#
-# This Makefile fragment is included by packages that use VFlib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.vflib to the dependency pattern
-#     for the version of VFlib desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:34 jlam Exp $
 
 .if !defined(VFLIB_BUILDLINK2_MK)
 VFLIB_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		vflib
 BUILDLINK_DEPENDS.vflib?=	ja-vflib-lib>=2.24.2
-DEPENDS+=	${BUILDLINK_DEPENDS.vflib}:../../japanese/vflib-lib
+BUILDLINK_PKGSRCDIR.vflib?=	../../japanese/vflib-lib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.vflib=ja-vflib-lib
 BUILDLINK_PREFIX.vflib_DEFAULT=	${LOCALBASE}
diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk
index 052f3cbf039..88c4b80359e 100644
--- a/lang/perl5/buildlink2.mk
+++ b/lang/perl5/buildlink2.mk
@@ -1,27 +1,26 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:43 jlam Exp $
-#
-# This Makefile fragment is included by packages that use perl.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.perl to the dependency pattern
-#     for the version of perl desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:34 jlam Exp $
 
 .if !defined(PERL5_BUILDLINK2_MK)
 PERL5_BUILDLINK2_MK=  # defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 PERL5_REQD?=			5.0
+BUILDLINK_PACKAGES+=		perl
 BUILDLINK_DEPENDS.perl?=	perl>=${PERL5_REQD}
+BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.perl=perl
 BUILDLINK_PREFIX.perl_DEFAULT=	${LOCALBASE}
 PERL5?=			${BUILDLINK_PREFIX.perl}/bin/perl
 
-DEPENDS+=		${BUILDLINK_DEPENDS.perl}:../../lang/perl5
+BUILDLINK_FILES.perl=	${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/CORE/*
+
+BUILDLINK_TARGETS+=	perl-buildlink
+
+perl-buildlink: _BUILDLINK_USE
+
+.endif  # PERL5_BUILDLINK2_MK
 
 .if exists(${PERL5})
 .  if exists(${BUILDLINK_PREFIX.perl}/share/mk/bsd.perl.mk)
@@ -38,11 +37,3 @@ MAKEFLAGS+=		PERL5_SITEARCH=${PERL5_SITEARCH}
 MAKEFLAGS+=		PERL5_ARCHLIB=${PERL5_ARCHLIB}
 .  endif # !exists(bsd.perl.mk) && !defined(PERL5_*)
 .endif # exists($PERL5)
-
-BUILDLINK_FILES.perl=	${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/CORE/*
-
-BUILDLINK_TARGETS+=	perl-buildlink
-
-perl-buildlink: _BUILDLINK_USE
-
-.endif  # PERL5_BUILDLINK2_MK
diff --git a/misc/rpm/buildlink2.mk b/misc/rpm/buildlink2.mk
index b27af06a3f6..feff5b9745b 100644
--- a/misc/rpm/buildlink2.mk
+++ b/misc/rpm/buildlink2.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:43 jlam Exp $
-#
-# This Makefile fragment is included by packages that use rpm.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.rpm to the dependency pattern
-#     for the version of rpm desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:35 jlam Exp $
 
 .if !defined(RPM_BUILDLINK2_MK)
 RPM_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
+BUILDLINK_PACKAGES+=		rpm
+BUILDLINK_DEPENDS.rpm?=		rpm>=2.4.3
+BUILDLINK_PKGSRCDIR.rpm?=	../../misc/rpm
 
 # This adds a build-dependency as rpm only has a static library.
-BUILDLINK_DEPENDS.rpm?=	rpm>=2.4.3
-BUILD_DEPENDS+=		${BUILDLINK_DEPENDS.rpm}:../../misc/rpm
+BUILDLINK_DEPMETHOD.rpm?=	build
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.rpm=rpm
 BUILDLINK_PREFIX.rpm_DEFAULT=	${LOCALBASE}
diff --git a/mk/motif.buildlink2.mk b/mk/motif.buildlink2.mk
index fd60f469d53..2bb4182cfa6 100644
--- a/mk/motif.buildlink2.mk
+++ b/mk/motif.buildlink2.mk
@@ -1,16 +1,15 @@
-# $NetBSD: motif.buildlink2.mk,v 1.1.2.1 2002/05/08 16:07:30 jlam Exp $
+# $NetBSD: motif.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
 #
-# This Makefile fragment is included by packages that use Motif.
+# USE_MOTIF12
+#	use a Motif-1.2-compatible installation, otherwise, assume
+#	we want a Motif-2.0-compatible installation
 #
-# To use this Makefile fragment, simply:
+# MOTIFBASE, MOTIF12BASE
+#	choose the Motif-2.0 or Motif-1.2-compatible installation at the
+#	named location
 #
-# (1) Optionally set USE_MOTIF12 to use a Motif-1.2-compatible installation.
-#     Otherwise, assume we want a Motif-2.0-compatible installation.
-# (2) Optionally set MOTIFBASE or MOTIF12BASE to choose the Motif-2.0 or
-#     Motif-1.2-compatible installation at the named location,
-# (3) Or optionally set MOTIF_TYPE or MOTIF12_TYPE to choose a specific
-#     Motif-2.0 or Motif-1.2-compatible package to be used,
-# (4) And include this Makefile fragment in the package Makefile.
+# MOTIF_TYPE, MOTIF12_TYPE
+#	choose a specific Motif-2.0 or Motif-1.2-compatible package.
 
 .if !defined(MOTIF_BUILDLINK2_MK)
 MOTIF_BUILDLINK2_MK=	# defined
@@ -123,7 +122,6 @@ _MOTIFBASE=		${BUILDLINK_PREFIX.lesstif12}
 # Link the pre-existing Motif libraries and headers in ${_MOTIFBASE} into
 # ${BUILDLINK_DIR}.
 #
-.  include "../../mk/bsd.buildlink2.mk"
 BUILDLINK_PREFIX.motif=		${_MOTIFBASE}
 BUILDLINK_FILES.motif=		include/Mrm/*
 BUILDLINK_FILES.motif+=		include/Xm/*
diff --git a/mk/ossaudio.buildlink2.mk b/mk/ossaudio.buildlink2.mk
index 583958a5b75..b6af5c95175 100644
--- a/mk/ossaudio.buildlink2.mk
+++ b/mk/ossaudio.buildlink2.mk
@@ -1,15 +1,9 @@
-# $NetBSD: ossaudio.buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:18 jlam Exp $
-#
-# This Makefile fragment is included by packages that use OSS audio.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: ossaudio.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
 
 .if !defined(OSSAUDIO_BUILDLINK2_MK)
 OSSAUDIO_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 .if ${_OPSYS_HAS_OSSAUDIO} == "yes"
 BUILDLINK_PREFIX.ossaudio=	/usr
diff --git a/mk/pthread.buildlink2.mk b/mk/pthread.buildlink2.mk
index 45653896362..cda2bceee5c 100644
--- a/mk/pthread.buildlink2.mk
+++ b/mk/pthread.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink2.mk,v 1.1.2.1 2002/05/08 16:07:28 jlam Exp $
+# $NetBSD: pthread.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pthreads.
 # This Makefile fragment is also included directly by bsd.prefs.mk.
@@ -72,7 +72,6 @@ PTHREAD_BUILDLINK2_MK=	# defined
 #
 # Link the native pthread libraries and headers into ${BUILDLINK_DIR}.
 #
-.  include "../../mk/bsd.buildlink2.mk"
 BUILDLINK_PREFIX.pthread=	/usr
 BUILDLINK_FILES.pthread=	include/pthread.h
 BUILDLINK_FILES.pthread+=	lib/libpthread.*
diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk
index bf352cbcc36..4b4c735db26 100644
--- a/mk/xaw.buildlink2.mk
+++ b/mk/xaw.buildlink2.mk
@@ -1,11 +1,4 @@
-# $NetBSD: xaw.buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:44 jlam Exp $
-#
-# This Makefile fragment is included by packages that use Xaw.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally set XAW_TYPE to the Xaw library desired, and
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: xaw.buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:35 jlam Exp $
 
 .if !defined(XAW_BUILDLINK2_MK)
 XAW_BUILDLINK2_MK=	# defined
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
index 41650bcb35b..1a449cc686a 100644
--- a/net/ORBit/buildlink2.mk
+++ b/net/ORBit/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:44 jlam Exp $
-#
-# This Makefile fragment is included by packages that use ORBit.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.ORBit to the dependency pattern
-#     for the version of ORBit desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(ORBIT_BUILDLINK2_MK)
 ORBIT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		ORBit
 BUILDLINK_DEPENDS.ORBit?=	ORBit>=0.5.12
-DEPENDS+=	${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit
+BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.ORBit=ORBit
 BUILDLINK_PREFIX.ORBit_DEFAULT=	${LOCALBASE}
diff --git a/net/openslp/buildlink2.mk b/net/openslp/buildlink2.mk
index cf04a7e8e79..5eaae709af0 100644
--- a/net/openslp/buildlink2.mk
+++ b/net/openslp/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:45 jlam Exp $
-#
-# This Makefile fragment is included by packages that use openslp.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.openslp to the dependency pattern
-#     for the version of openslp desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(OPENSLP_BUILDLINK2_MK)
 OPENSLP_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		openslp
 BUILDLINK_DEPENDS.openslp?=	openslp>=1.0.1
-DEPENDS+=	${BUILDLINK_DEPENDS.openslp}:../../net/openslp
+BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openslp=openslp
 BUILDLINK_PREFIX.openslp_DEFAULT=	${LOCALBASE}
diff --git a/net/socks4/buildlink2.mk b/net/socks4/buildlink2.mk
index 2c4ac4dd9f9..3b72a784070 100644
--- a/net/socks4/buildlink2.mk
+++ b/net/socks4/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use socks4.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.socks4 to the dependency pattern
-#     for the version of socks4 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(SOCKS4_BUILDLINK2_MK)
 SOCKS4_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		socks4
 BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
-DEPENDS+=	${BUILDLINK_DEPENDS.socks4}:../../net/socks4
+BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.socks4=socks4
 BUILDLINK_PREFIX.socks4_DEFAULT=	${LOCALBASE}
diff --git a/net/socks5/buildlink2.mk b/net/socks5/buildlink2.mk
index a5d838c06f9..54fd33b7d40 100644
--- a/net/socks5/buildlink2.mk
+++ b/net/socks5/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use socks5.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.socks5 to the dependency pattern
-#     for the version of socks5 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(SOCKS5_BUILDLINK2_MK)
 SOCKS5_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		socks5
 BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
-DEPENDS+=	${BUILDLINK_DEPENDS.socks5}:../../net/socks5
+BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.socks5=socks5
 BUILDLINK_PREFIX.socks5_DEFAULT=	${LOCALBASE}
diff --git a/pkgtools/x11-links/buildlink2.mk b/pkgtools/x11-links/buildlink2.mk
index 554c351dc24..5573fdff6de 100644
--- a/pkgtools/x11-links/buildlink2.mk
+++ b/pkgtools/x11-links/buildlink2.mk
@@ -1,16 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:21 jlam Exp $
-#
-# This Makefile fragment is included by packages that use X11.
-#
-# To use this Makefile fragment, simply include this Makefile fragment in the
-# package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:37 jlam Exp $
 
 .if defined(_FOR_X11_LINKS_ONLY)
 .if !defined(X11_LINKS_BUILDLINK_MK)
 X11_LINKS_BUILDLINK_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
 BUILDLINK_PREFIX.X11=	${X11BASE}
 
 .if (${OPSYS} != SunOS)
@@ -1537,10 +1530,8 @@ BUILDLINK_FILES.X11+=	lib/libxview.so
 BUILDLINK_FILES.X11+=	lib/libxview.so.3
 .endif
 
-BUILDLINK_TARGETS.X11=	X11-buildlink
-BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.X11}
+BUILDLINK_TARGETS+=	X11-buildlink
 
-pre-configure: ${BUILDLINK_TARGETS.X11}
 X11-buildlink: _BUILDLINK_USE
 
 .endif	# X11_LINKS_BUILDLINK_MK
diff --git a/print/cups/buildlink2.mk b/print/cups/buildlink2.mk
index 5f46091db65..25ebfd4f685 100644
--- a/print/cups/buildlink2.mk
+++ b/print/cups/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libcups.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.cups to the dependency pattern
-#     for the version of cups desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:37 jlam Exp $
 
 .if !defined(CUPS_BUILDLINK2_MK)
 CUPS_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		cups
 BUILDLINK_DEPENDS.cups?=	cups>=1.1.14nb1
-DEPENDS+=	${BUILDLINK_DEPENDS.cups}:../../print/cups
+BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.cups=cups
 BUILDLINK_PREFIX.cups_DEFAULT=	${LOCALBASE}
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index f9756724ce8..53ed4b78ffa 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:47 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libpam.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.pam to the dependency pattern
-#     for the version of pam desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:37 jlam Exp $
 
 .if !defined(PAM_BUILDLINK2_MK)
 PAM_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
-BUILDLINK_DEPENDS.pam?=	PAM>=0.75
+BUILDLINK_DEPENDS.pam?=		PAM>=0.75
+BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
 
 .if exists(/usr/include/security/pam_appl.h)
 _NEED_PAM=		NO
@@ -24,7 +16,7 @@ _NEED_PAM=		YES
 
 .if ${_NEED_PAM} == "YES"
 
-DEPENDS+=	${BUILDLINK_DEPENDS.pam}:../../security/PAM
+BUILDLINK_PACKAGES+=	pam
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pam=PAM
 BUILDLINK_PREFIX.pam_DEFAULT=	${LOCALBASE}
 
diff --git a/security/cyrus-sasl/buildlink2.mk b/security/cyrus-sasl/buildlink2.mk
index 361c76fa46a..940e1ffc5b6 100644
--- a/security/cyrus-sasl/buildlink2.mk
+++ b/security/cyrus-sasl/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:48 jlam Exp $
-#
-# This Makefile fragment is included by packages that use cyrus-sasl.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.cyrus-sasl to the dependency pattern
-#     for the version of cyrus-sasl desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:38 jlam Exp $
 
 .if !defined(CYRUS_SASL_BUILDLINK2_MK)
 CYRUS_SASL_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.cyrus-sasl?=	cyrus-sasl>=1.5.24nb2
-DEPENDS+=	${BUILDLINK_DEPENDS.cyrus-sasl}:../../security/cyrus-sasl
+BUILDLINK_PACKAGES+=			cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=1.5.24nb2
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
 BUILDLINK_PREFIX.cyrus-sasl_DEFAULT=	${LOCALBASE}
diff --git a/security/libcrack/buildlink2.mk b/security/libcrack/buildlink2.mk
index 89bbd7601dd..fd5ad9ed00b 100644
--- a/security/libcrack/buildlink2.mk
+++ b/security/libcrack/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:48 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libcrack.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libcrack to the dependency pattern
-#     for the version of libcrack desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:38 jlam Exp $
 
 .if !defined(LIBCRACK_BUILDLINK2_MK)
 LIBCRACK_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libcrack
 BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
-DEPENDS+=	${BUILDLINK_DEPENDS.libcrack}:../../security/libcrack
+BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libcrack=libcrack
 BUILDLINK_PREFIX.libcrack_DEFAULT=	${LOCALBASE}
diff --git a/security/libmcrypt22/buildlink2.mk b/security/libmcrypt22/buildlink2.mk
index f06fc23514b..41ff486b3d4 100644
--- a/security/libmcrypt22/buildlink2.mk
+++ b/security/libmcrypt22/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:49 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libmcrypt22.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libmcrypt22 to the dependency pattern
-#     for the version of GNU libmcrypt22 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:38 jlam Exp $
 
 .if !defined(LIBMCRYPT22_BUILDLINK2_MK)
 LIBMCRYPT22_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.libmcrypt22?=	libmcrypt22>=2.2.7
-DEPENDS+=	${BUILDLINK_DEPENDS.libmcrypt22}:../../security/libmcrypt22
+BUILDLINK_PACKAGES+=			libmcrypt22
+BUILDLINK_DEPENDS.libmcrypt22?=		libmcrypt22>=2.2.7
+BUILDLINK_PKGSRCDIR.libmcrypt22?=	../../security/libmcrypt22
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libmcrypt22=libmcrypt22
 BUILDLINK_PREFIX.libmcrypt22_DEFAULT=	${LOCALBASE}
diff --git a/security/mhash/buildlink2.mk b/security/mhash/buildlink2.mk
new file mode 100644
index 00000000000..afec677bed9
--- /dev/null
+++ b/security/mhash/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/21 23:00:23 jlam Exp $
+
+.if !defined(MHASH_BUILDLINK2_MK)
+MHASH_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		mhash
+BUILDLINK_DEPENDS.mhash?=	mhash>=0.8.3
+BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.mhash=mhash
+BUILDLINK_PREFIX.mhash_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.mhash=		include/mhash.h
+BUILDLINK_FILES.mhash+=		lib/libmhash.*
+
+BUILDLINK_TARGETS+=	mhash-buildlink
+
+mhash-buildlink: _BUILDLINK_USE
+
+.endif	# MHASH_BUILDLINK2_MK
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index f06a65bbbbc..c0119f5ae26 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,18 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:49 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:39 jlam Exp $
 #
-# This Makefile fragment is included by packages that use OpenSSL.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define USE_OPENSSL_VERSION to the mininum OpenSSL version
-#     number in <openssl/opensslv.h>, i.e. 0x0090600fL, etc.
-# (2) Include this Makefile fragment in the package Makefile.
+# Optionally define USE_OPENSSL_VERSION to the mininum OpenSSL version
+# number in <openssl/opensslv.h>, i.e. 0x0090600fL, etc.
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.buildlink2.mk"
 
 # OpenSSL version numbers from <openssl/opensslv.h>
 OPENSSL_VERSION_095A=		0x0090581fL
@@ -32,6 +26,7 @@ BUILDLINK_DEPENDS.openssl=	{openssl-0.9.5a,openssl>=0.9.6}
 .else
 BUILDLINK_DEPENDS.openssl=	openssl>=0.9.6
 .endif
+BUILDLINK_PKGSRCDIR.openssl=	../../security/openssl
 
 _NEED_OPENSSL=		YES
 .if ${OPSYS} == "Darwin"
@@ -71,7 +66,7 @@ _NEED_OPENSSL=		NO
 .endif	# exists(${_OPENSSLV_H})
 
 .if ${_NEED_OPENSSL} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.openssl}:../../security/openssl
+BUILDLINK_PACKAGES+=		openssl
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openssl=openssl
 BUILDLINK_PREFIX.openssl_DEFAULT=	${LOCALBASE}
 SSLBASE=			${BUILDLINK_PREFIX.openssl}
diff --git a/security/rsaref/buildlink2.mk b/security/rsaref/buildlink2.mk
index ccb2053498f..89a8c9de22f 100644
--- a/security/rsaref/buildlink2.mk
+++ b/security/rsaref/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:50 jlam Exp $
-#
-# This Makefile fragment is included by packages that use rsaref.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.rsaref to the dependency pattern
-#     for the version of rsaref desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:39 jlam Exp $
 
 .if !defined(RSAREF_BUILDLINK2_MK)
 RSAREF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		rsaref
 BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
-DEPENDS+=	${BUILDLINK_DEPENDS.rsaref}:../../security/rsaref
+BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.rsaref=rsaref
 BUILDLINK_PREFIX.rsaref_DEFAULT=	${LOCALBASE}
diff --git a/security/tcp_wrappers/buildlink2.mk b/security/tcp_wrappers/buildlink2.mk
index 721834b4f4f..7e8bd34224d 100644
--- a/security/tcp_wrappers/buildlink2.mk
+++ b/security/tcp_wrappers/buildlink2.mk
@@ -1,19 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:51 jlam Exp $
-#
-# This Makefile fragment is included by packages that use tcp_wrappers.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.tcp_wrappers to the dependency
-#     pattern for the version of tcp_wrappers desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:39 jlam Exp $
 
 .if !defined(TCP_WRAPPERS_BUILDLINK2_MK)
 TCP_WRAPPERS_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
 BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
+BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 
 .if exists(/usr/include/tcpd.h)
 _NEED_TCP_WRAPPERS=	NO
@@ -22,7 +13,7 @@ _NEED_TCP_WRAPPERS=	YES
 .endif
 
 .if ${_NEED_TCP_WRAPPERS} == "YES"
-DEPENDS+=	${BUILDLINK_DEPENDS.tcp_wrappers}:../../security/tcp_wrappers
+BUILDLINK_PACKAGES+=	tcp_wrappers
 EVAL_PREFIX+=	BUILDLINK_PREFIX.tcp_wrappers=tcp_wrappers
 BUILDLINK_PREFIX.tcp_wrappers_DEFAULT=	${LOCALBASE}
 .else
diff --git a/textproc/expat/buildlink2.mk b/textproc/expat/buildlink2.mk
index dddffff8b0a..26677ddce2c 100644
--- a/textproc/expat/buildlink2.mk
+++ b/textproc/expat/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:51 jlam Exp $
-#
-# This Makefile fragment is included by packages that use expat.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.expat to the dependency pattern
-#     for the version of expat desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:39 jlam Exp $
 
 .if !defined(EXPAT_BUILDLINK2_MK)
 EXPAT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		expat
 BUILDLINK_DEPENDS.expat?=	expat>=1.95.2
-DEPENDS+=	${BUILDLINK_DEPENDS.expat}:../../textproc/expat
+BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.expat=expat
 BUILDLINK_PREFIX.expat_DEFAULT=	${LOCALBASE}
diff --git a/textproc/libxml/buildlink2.mk b/textproc/libxml/buildlink2.mk
index 69e771a69d5..e078ac253e9 100644
--- a/textproc/libxml/buildlink2.mk
+++ b/textproc/libxml/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:52 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libxml.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libxml to the dependency pattern
-#     for the version of libxml desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:40 jlam Exp $
 
 .if !defined(LIBXML_BUILDLINK2_MK)
 LIBXML_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libxml
 BUILDLINK_DEPENDS.libxml?=	libxml>=1.8.11
-DEPENDS+=	${BUILDLINK_DEPENDS.libxml}:../../textproc/libxml
+BUILDLINK_PKGSRCDIR.libxml?=	../../textproc/libxml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml=libxml
 BUILDLINK_PREFIX.libxml_DEFAULT=	${LOCALBASE}
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
index 41d90db1796..9367849f32a 100644
--- a/textproc/libxml2/buildlink2.mk
+++ b/textproc/libxml2/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:52 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libxml2.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libxml2 to the dependency pattern
-#     for the version of libxml2 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:40 jlam Exp $
 
 .if !defined(LIBXML2_BUILDLINK2_MK)
 LIBXML2_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libxml2
 BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.2
-DEPENDS+=	${BUILDLINK_DEPENDS.libxml2}:../../textproc/libxml2
+BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
 BUILDLINK_PREFIX.libxml2_DEFAULT=	${LOCALBASE}
diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk
index c0d5b867d7a..036cb5e892e 100644
--- a/textproc/libxslt/buildlink2.mk
+++ b/textproc/libxslt/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:52 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libxslt.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.libxslt to the dependency pattern
-#     for the version of libxslt desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:40 jlam Exp $
 
 .if !defined(LIBXSLT_BUILDLINK2_MK)
 LIBXSLT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		libxslt
 BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.7
-DEPENDS+=	${BUILDLINK_DEPENDS.libxslt}:../../textproc/libxslt
+BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxslt=libxslt
 BUILDLINK_PREFIX.libxslt_DEFAULT=	${LOCALBASE}
diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk
new file mode 100644
index 00000000000..e832b5a535e
--- /dev/null
+++ b/www/php4/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/21 23:00:23 jlam Exp $
+
+.if !defined(PHP4_BUILDLINK2_MK)
+PHP4_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		php4
+BUILDLINK_DEPENDS.php4?=	php>=4.1.0
+BUILDLINK_PKGSRCDIR.php4?=	../../www/php4
+
+# This adds a build-dependency as php4 has no libraries.
+BUILDLINK_DEPMETHOD.php4?=	build
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.php4=php
+BUILDLINK_PREFIX.php4_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.php4=		include/php/*/*/*.h
+BUILDLINK_FILES.php4+=		include/php/*/*.h
+BUILDLINK_FILES.php4+=		include/php/*.h
+
+BUILDLINK_TARGETS+=		php4-buildlink
+
+php4-buildlink: _BUILDLINK_USE
+
+.endif	# PHP4_BUILDLINK2_MK
diff --git a/x11/Xaw-Xpm/buildlink2.mk b/x11/Xaw-Xpm/buildlink2.mk
index cbf09239e6a..638abc909f9 100644
--- a/x11/Xaw-Xpm/buildlink2.mk
+++ b/x11/Xaw-Xpm/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:53 jlam Exp $
-#
-# This Makefile fragment is included by packages that use Xaw-Xpm.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.Xaw-Xpm to the dependency pattern
-#     for the version of Xaw-Xpm desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:40 jlam Exp $
 
 .if !defined(XAWXPM_BUILDLINK2_MK)
 XAWXPM_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		Xaw-Xpm
 BUILDLINK_DEPENDS.Xaw-Xpm?=	Xaw-Xpm-1.1
-DEPENDS+=	${BUILDLINK_DEPENDS.Xaw-Xpm}:../../x11/Xaw-Xpm
+BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.Xaw-Xpm=Xaw-Xpm
 BUILDLINK_PREFIX.Xaw-Xpm_DEFAULT=	${X11PREFIX}
diff --git a/x11/Xaw3d/buildlink2.mk b/x11/Xaw3d/buildlink2.mk
index b9d0e2fb086..cc74485df64 100644
--- a/x11/Xaw3d/buildlink2.mk
+++ b/x11/Xaw3d/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:54 jlam Exp $
-#
-# This Makefile fragment is included by packages that use Xaw3d.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.Xaw3d to the dependency pattern
-#     for the version of Xaw3d desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:41 jlam Exp $
 
 .if !defined(XAW3D_BUILDLINK2_MK)
 XAW3D_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		Xaw3d
 BUILDLINK_DEPENDS.Xaw3d?=	Xaw3d-1.5
-DEPENDS+=	${BUILDLINK_DEPENDS.Xaw3d}:../../x11/Xaw3d
+BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.Xaw3d=Xaw3d
 BUILDLINK_PREFIX.Xaw3d_DEFAULT=	${X11PREFIX}
diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk
new file mode 100644
index 00000000000..e58cc6db883
--- /dev/null
+++ b/x11/gnome-libs/buildlink2.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/21 23:00:24 jlam Exp $
+
+.if !defined(GNOME_LIBS_BUILDLINK2_MK)
+GNOME_LIBS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gnome-libs
+BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.1.4
+BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-libs=gnome-libs
+BUILDLINK_PREFIX.gnome-libs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gnome-libs=	include/gnome-1.0/gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/gtk-xmhtml/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libart_lgpl/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnome/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnomeui/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnorba/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/popt-gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/zvt/*
+BUILDLINK_FILES.gnome-libs+=	lib/gnome-libs/*/*
+BUILDLINK_FILES.gnome-libs+=	lib/libart_lgpl.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnome.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnomesupport.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnomeui.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnorba.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnorbagtk.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgtkxmhtml.*
+BUILDLINK_FILES.gnome-libs+=	lib/libzvt.*
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../net/ORBit/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		gnome-libs-buildlink
+
+gnome-libs-buildlink: _BUILDLINK_USE
+
+.endif	# GNOME_LIBS_BUILDLINK2_MK
diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk
index f035f651304..6da69f5417f 100644
--- a/x11/gtk/buildlink2.mk
+++ b/x11/gtk/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:30 jlam Exp $
-#
-# This Makefile fragment is included by packages that use gtk.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.gtk to the dependency pattern
-#     for the version of gtk desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:41 jlam Exp $
 
 .if !defined(GTK_BUILDLINK2_MK)
 GTK_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
-BUILDLINK_DEPENDS.gtk?=	gtk+>=1.2.8
-DEPENDS+=		${BUILDLINK_DEPENDS.gtk}:../../x11/gtk
+BUILDLINK_PACKAGES+=		gtk
+BUILDLINK_DEPENDS.gtk?=		gtk+>=1.2.8
+BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk=gtk
 BUILDLINK_PREFIX.gtk_DEFAULT=	${X11PREFIX}
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index 5d52e9b7dd8..2306f4a4c62 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,22 +1,13 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:30 jlam Exp $
-#
-# This Makefile fragment is included by packages that use kdelibs2.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.kdelibs2 to the dependency pattern
-#     for the version of kdelibs2 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:41 jlam Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
+.include "../../mk/bsd.prefs.mk"
 
+BUILDLINK_PACKAGES+=		kdelibs2
 BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb1
-DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
-
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
diff --git a/x11/lesstif/buildlink2.mk b/x11/lesstif/buildlink2.mk
index 68a9c34d0f5..241048f830a 100644
--- a/x11/lesstif/buildlink2.mk
+++ b/x11/lesstif/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:54 jlam Exp $
-#
-# This Makefile fragment is included by packages that use lesstif.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.lesstif to the dependency pattern
-#     for the version of lesstif desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:42 jlam Exp $
 
 .if !defined(LESSTIF_BUILDLINK2_MK)
 LESSTIF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		lesstif
 BUILDLINK_DEPENDS.lesstif?=	lesstif>=0.91.4
-DEPENDS+=	${BUILDLINK_DEPENDS.lesstif}:../../x11/lesstif
+BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.lesstif=lesstif
 BUILDLINK_PREFIX.lesstif_DEFAULT=	${X11PREFIX}
diff --git a/x11/lesstif12/buildlink2.mk b/x11/lesstif12/buildlink2.mk
index b4714233d26..0f42efd0397 100644
--- a/x11/lesstif12/buildlink2.mk
+++ b/x11/lesstif12/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:55 jlam Exp $
-#
-# This Makefile fragment is included by packages that use lesstif12.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.lesstif12 to the dependency pattern
-#     for the version of lesstif12 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:42 jlam Exp $
 
 .if !defined(LESSTIF12_BUILDLINK2_MK)
 LESSTIF12_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		lesstif12
 BUILDLINK_DEPENDS.lesstif12?=	lesstif12>=0.91.4
-DEPENDS+=	${BUILDLINK_DEPENDS.lesstif12}:../../x11/lesstif12
+BUILDLINK_PKGSRCDIR.lesstif12?=	../../x11/lesstif12
 
 EVAL_PREFIX+=			_LESSTIF12_PREFIX=lesstif12
 _LESSTIF12_PREFIX_DEFAULT=	${X11PREFIX}
diff --git a/x11/openmotif/buildlink2.mk b/x11/openmotif/buildlink2.mk
index 12b4bd2800d..a1a80a7409c 100644
--- a/x11/openmotif/buildlink2.mk
+++ b/x11/openmotif/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:55 jlam Exp $
-#
-# This Makefile fragment is included by packages that use openmotif.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.openmotif to the dependency pattern
-#     for the version of openmotif desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:42 jlam Exp $
 
 .if !defined(OPENMOTIF_BUILDLINK2_MK)
 OPENMOTIF_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		openmotif
 BUILDLINK_DEPENDS.openmotif?=	openmotif>=2.1.30
-DEPENDS+=	${BUILDLINK_DEPENDS.openmotif}:../../x11/openmotif
+BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openmotif=openmotif
 BUILDLINK_PREFIX.openmotif_DEFAULT=	${X11PREFIX}
diff --git a/x11/qt2-designer/buildlink2.mk b/x11/qt2-designer/buildlink2.mk
index 865aa03bc98..961bc045e75 100644
--- a/x11/qt2-designer/buildlink2.mk
+++ b/x11/qt2-designer/buildlink2.mk
@@ -1,21 +1,12 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:32 jlam Exp $
-#
-# This Makefile fragment is included by packages that use qt2-designer.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.qt2-designer to the dependency
-#     pattern for the version of qt2-designer desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:42 jlam Exp $
 
 .if !defined(QT2_DESIGNER_BUILDLINK2_MK)
 QT2_DESIGNER_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=	qt2-designer
 BUILDLINK_DEPENDS.qt2-designer?= \
 		{qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2}
-DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
+BUILDLINK_PKGSRCDIR.qt2-designer?=	../../x11/qt2-designer
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt2-designer=qt2-designer
 BUILDLINK_PREFIX.qt2-designer_DEFAULT=	${X11PREFIX}
diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk
index 56b4f9df6a3..e136576cefb 100644
--- a/x11/qt2-libs/buildlink2.mk
+++ b/x11/qt2-libs/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/05/11 02:09:32 jlam Exp $
-#
-# This Makefile fragment is included by packages that use qt2-libs.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.qt2-libs to the dependency pattern
-#     for the version of qt2-libs desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:43 jlam Exp $
 
 .if !defined(QT2_LIBS_BUILDLINK2_MK)
 QT2_LIBS_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		qt2-libs
 BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.3.1nb2
-DEPENDS+=	${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
+BUILDLINK_PKGSRCDIR.qt2-libs?=	../../x11/qt2-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt2-libs=qt2-libs
 BUILDLINK_PREFIX.qt2-libs_DEFAULT=	${X11PREFIX}
author	jlam <jlam@pkgsrc.org>	2002-06-21 23:00:21 +0000
committer	jlam <jlam@pkgsrc.org>	2002-06-21 23:00:21 +0000
commit	44ee9a7c648dbde9a7b3ec071d0fd8f63ad442c3 (patch)
tree	cc03ef7b99af01a38169fd9eeea4424361f24e02
parent	a3031ef90e9db9ac046f90e1f063e9aec72ad5e4 (diff)
download	pkgsrc-44ee9a7c648dbde9a7b3ec071d0fd8f63ad442c3.tar.gz