Reorder location and setting of BUILDLINK_PACKAGES to match template

buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

14 files changed, 94 insertions, 89 deletions

diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 010d2af1f85..ace68444e77 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	db3
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb3}
+BUILDLINK_PACKAGES+=	db3
+
 .if !empty(DB3_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		db3
 BUILDLINK_DEPENDS.db3+=		db3>=2.9.2
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 .endif	# DB3_BUILDLINK3_MK
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index a8bdf4e1b85..1e75e0f936f 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	db4
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndb4}
+BUILDLINK_PACKAGES+=	db4
+
 .if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		db4
 BUILDLINK_DEPENDS.db4+=		db4>=4.2.52
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
diff --git a/databases/dbxml/buildlink3.mk b/databases/dbxml/buildlink3.mk
index 98ebd4c3ca1..760c19d01c8 100644
--- a/databases/dbxml/buildlink3.mk
+++ b/databases/dbxml/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/13 19:39:37 minskim Exp $
-#
-# This Makefile fragment is included by packages that use dbxml.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBXML_BUILDLINK3_MK:=	${DBXML_BUILDLINK3_MK}+
@@ -10,15 +7,17 @@ DBXML_BUILDLINK3_MK:=	${DBXML_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	dbxml
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbxml}
+BUILDLINK_PACKAGES+=	dbxml
+
 .if !empty(DBXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			dbxml
-BUILDLINK_DEPENDS.dbxml+=		dbxml>=1.2.0
-BUILDLINK_PKGSRCDIR.dbxml?=		../../databases/dbxml
+BUILDLINK_DEPENDS.dbxml+=	dbxml>=1.2.0
+BUILDLINK_PKGSRCDIR.dbxml?=	../../databases/dbxml
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../textproc/libpathan/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 
-.endif # DBXML_BUILDLINK3_MK
+.endif	# DBXML_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index 9fd18737d0e..f356c6a71b5 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 08:40:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDBM_BUILDLINK3_MK:=	${GDBM_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ GDBM_BUILDLINK3_MK:=	${GDBM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gdbm
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdbm}
+BUILDLINK_PACKAGES+=	gdbm
+
 .if !empty(GDBM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gdbm
 BUILDLINK_DEPENDS.gdbm+=	gdbm>=1.8.3
 BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
-.endif # GDBM_BUILDLINK3_MK
+.endif	# GDBM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index 060d0f55713..de2c610a1c5 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:07 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-mime-data.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MIME_DATA_BUILDLINK3_MK:=	${GNOME_MIME_DATA_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome-mime-data
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mime-data}
+BUILDLINK_PACKAGES+=	gnome-mime-data
+
 .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome-mime-data
 BUILDLINK_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 
-.endif # GNOME_MIME_DATA_BUILDLINK3_MK
+.endif	# GNOME_MIME_DATA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index 96caaabedf2..2f9289d9c42 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgda.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
@@ -12,17 +7,19 @@ LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libgda
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgda}
+BUILDLINK_PACKAGES+=	libgda
+
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgda
-BUILDLINK_DEPENDS.libgda+=		libgda>=0.99.0nb1
-BUILDLINK_PKGSRCDIR.libgda?=		../../databases/libgda
+BUILDLINK_DEPENDS.libgda+=	libgda>=0.99.0nb1
+BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
 
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 
-.endif # LIBGDA_BUILDLINK3_MK
+.endif	# LIBGDA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index b275c01ee7f..d0b1c03510f 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,29 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomedb.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomedb
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomedb}
+BUILDLINK_PACKAGES+=	libgnomedb
+
 .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnomedb
 BUILDLINK_DEPENDS.libgnomedb+=		libgnomedb>=1.0.0nb5
 BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
 
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBGNOMEDB_BUILDLINK3_MK
+.endif	# LIBGNOMEDB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index 2427141b0b7..69fa5cd982c 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	mysql-client
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+=	mysql-client
+
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mysql-client
 BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=3.23.58
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 
-.  include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 91fa545bf78..cb66ceb0733 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/21 01:56:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -9,17 +9,20 @@ OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	openldap
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenldap}
+BUILDLINK_PACKAGES+=	openldap
+
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		openldap
 BUILDLINK_DEPENDS.openldap+=	openldap>=2.1.22
 BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
 
-.  if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-.    include "../../security/cyrus-sasl2/buildlink3.mk"
-.  elif defined(USE_SASL) && (${USE_SASL} == "YES")
-.    include "../../security/cyrus-sasl/buildlink3.mk"
-.  endif
-.  include "../../security/openssl/buildlink3.mk"
+.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.elif defined(USE_SASL) && (${USE_SASL} == "YES")
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+.include "../../security/openssl/buildlink3.mk"
+
 .endif	# OPENLDAP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index e1df41e7c52..909e4b7a790 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/27 12:24:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	p5-DBI
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-DBI}
+BUILDLINK_PACKAGES+=	p5-DBI
+
 .if !empty(P5_DBI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		p5-DBI
 BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.30
 BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
 BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
@@ -16,7 +18,8 @@ BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
 # We want all of the arch-dependent DBI files.
 BUILDLINK_CONTENTS_FILTER.p5-DBI?=	${GREP} '/auto/DBI/'
 
-.  include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+
 .endif	# P5_DBI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk
index 01dbf164097..d2d293ccff5 100644
--- a/databases/postgresql-lib/buildlink3.mk
+++ b/databases/postgresql-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL_LIB_BUILDLINK3_MK:=	${POSTGRESQL_LIB_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ POSTGRESQL_LIB_BUILDLINK3_MK:=	${POSTGRESQL_LIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	postgresql-lib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npostgresql-lib}
+BUILDLINK_PACKAGES+=	postgresql-lib
+
 .if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			postgresql-lib
 BUILDLINK_DEPENDS.postgresql-lib+=	postgresql-lib>=7.3.1
 BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
 BUILDLINK_INCDIRS.postgresql-lib?=	include/postgresql
 
-.  include "../../security/openssl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
 .endif	# POSTGRESQL_LIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 146e6d340de..76c96c34d76 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 23:07:51 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-ZODB.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
@@ -12,11 +9,12 @@ PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pyZODB
 .endif
 
-.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pyZODB
-BUILDLINK_DEPENDS.pyZODB+=		${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_PKGSRCDIR.pyZODB?=		../../databases/py-ZODB
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpyZODB}
+BUILDLINK_PACKAGES+=	pyZODB
 
-.endif # PY_ZODB_BUILDLINK3_MK
+.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
+BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
+.endif	# PY_ZODB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index ce178b13af1..46fbad0209f 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	rrdtool
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
+BUILDLINK_PACKAGES+=	rrdtool
+
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		rrdtool
 BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.0.40
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 
-.  include "../../graphics/freetype-lib/buildlink3.mk"
-.  include "../../graphics/gd/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../www/cgilib/buildlink3.mk"
-.endif # RRDTOOL_BUILDLINK3_MK
+.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../www/cgilib/buildlink3.mk"
+
+.endif	# RRDTOOL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index 05ee66cf07a..476765d7824 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:28:21 wiz Exp $
-#
-# This Makefile fragment is included by packages that use tdb.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TDB_BUILDLINK3_MK:=	${TDB_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ TDB_BUILDLINK3_MK:=	${TDB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	tdb
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntdb}
+BUILDLINK_PACKAGES+=	tdb
+
 .if !empty(TDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		tdb
 BUILDLINK_DEPENDS.tdb+=		tdb>=1.0.6
 BUILDLINK_PKGSRCDIR.tdb?=	../../databases/tdb
-
-.endif # TDB_BUILDLINK3_MK
+.endif	# TDB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}