Reorder location and setting of BUILDLINK_PACKAGES to match template

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

48 files changed, 335 insertions, 373 deletions

diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 2c4fc0f3de8..d867a02d491 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:29:24 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use GConf.
-#
-# 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}+
 GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
@@ -12,16 +7,18 @@ GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	GConf
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf}
+BUILDLINK_PACKAGES+=	GConf
+
 .if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			GConf
-BUILDLINK_DEPENDS.GConf+=		GConf>=1.0.9nb5
-BUILDLINK_PKGSRCDIR.GConf?=		../../devel/GConf
+BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb5
+BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../databases/db3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 
-.endif # GCONF_BUILDLINK3_MK
+.endif	# GCONF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index 42e535ffd9b..c3645562716 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use GConf2-ui.
-#
-# 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}+
 GCONF2_UI_BUILDLINK3_MK:=	${GCONF2_UI_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	GConf2-ui
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2-ui}
+BUILDLINK_PACKAGES+=	GConf2-ui
+
 .if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			GConf2-ui
-BUILDLINK_DEPENDS.GConf2-ui+=		GConf2-ui>=2.4.0.1nb1
-BUILDLINK_PKGSRCDIR.GConf2-ui?=		../../devel/GConf2-ui
+BUILDLINK_DEPENDS.GConf2-ui+=	GConf2-ui>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.GConf2-ui?=	../../devel/GConf2-ui
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GCONF2_UI_BUILDLINK3_MK
+.endif	# GCONF2_UI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index 67542361e26..89f475bb5a4 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use GConf2.
-#
-# 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}+
 GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	GConf2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2}
+BUILDLINK_PACKAGES+=	GConf2
+
 .if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			GConf2
-BUILDLINK_DEPENDS.GConf2+=		GConf2>=2.4.0.1
-BUILDLINK_PKGSRCDIR.GConf2?=		../../devel/GConf2
+BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.4.0.1
+BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -30,13 +27,13 @@ _GCONF2_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
 
 GConf2-buildlink-fake:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-		if [ ! -f ${_GCONF2_FAKE} ]; then			\
+	if [ ! -f ${_GCONF2_FAKE} ]; then				\
 		${ECHO_BUILDLINK_MSG} "Creating ${_GCONF2_FAKE}";	\
 		${MKDIR} ${_GCONF2_FAKE:H};				\
 		${ECHO} "#!${SH}" > ${_GCONF2_FAKE};			\
 		${CHMOD} +x ${_GCONF2_FAKE};				\
 	fi
 
-.endif # GCONF2_BUILDLINK3_MK
+.endif	# GCONF2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 672633f1591..58c42834eef 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/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}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -7,18 +7,22 @@ SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	SDL
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL}
+BUILDLINK_PACKAGES+=	SDL
+
 .if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		SDL
 BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
 
-USE_X11=		YES
+USE_X11=		yes
 PTHREAD_OPTS+=		require
 
-.  include "../../graphics/MesaLib/buildlink3.mk"
-.  include "../../graphics/glut/buildlink3.mk"
-.  include "../../graphics/aalib-x11/buildlink3.mk"
-.  include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/aalib-x11/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
 .endif	# SDL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 9ccf1027dd3..9da1d0e28c1 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/13 17:02:09 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use at-spi.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	at-spi
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nat-spi}
+BUILDLINK_PACKAGES+=	at-spi
+
 .if !empty(AT_SPI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			at-spi
-BUILDLINK_DEPENDS.at-spi?=		at-spi>=1.3.8nb1
-BUILDLINK_PKGSRCDIR.at-spi?=		../../devel/at-spi
+BUILDLINK_DEPENDS.at-spi?=	at-spi>=1.3.8nb1
+BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.at-spi?=		../../devel/at-spi
 .include "../../devel/popt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # AT_SPI_BUILDLINK3_MK
+.endif	# AT_SPI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index fa3ed35ece9..e2c0307f8b4 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 01:56:42 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use atk.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	atk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Natk}
+BUILDLINK_PACKAGES+=	atk
+
 .if !empty(ATK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			atk
 BUILDLINK_DEPENDS.atk?=		atk>=1.4.1
-BUILDLINK_PKGSRCDIR.atk?=		../../devel/atk
+BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif # ATK_BUILDLINK3_MK
+.endif	# ATK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index ce74026c3f0..d210d78efbd 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/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:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	boehm-gc
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboehm-gc}
+BUILDLINK_PACKAGES+=	boehm-gc
+
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		boehm-gc
 BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.2nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index d76e1ac3d4b..562dc4084b1 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:56:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use devIL.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	devIL
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NdevIL}
+BUILDLINK_PACKAGES+=	devIL
+
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			devIL
-BUILDLINK_DEPENDS.devIL+=		devIL>=1.6.6nb1
-BUILDLINK_PKGSRCDIR.devIL?=		../../devel/devIL
+BUILDLINK_DEPENDS.devIL+=	devIL>=1.6.6nb1
+BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -25,6 +22,6 @@ BUILDLINK_PKGSRCDIR.devIL?=		../../devel/devIL
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-.endif # DEVIL_BUILDLINK3_MK
+.endif	# DEVIL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index d6cc356a51a..c6a7e02fd4f 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/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:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	dlcompat
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndlcompat}
+BUILDLINK_PACKAGES+=	dlcompat
+
 .if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		dlcompat
 BUILDLINK_DEPENDS.dlcompat+=	dlcompat>=20020606
 BUILDLINK_PKGSRCDIR.dlcompat?=	../../devel/dlcompat
 .endif  # DLCOMPAT_BUILDLINK3_MK
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 0fff6fef546..79a65e307f5 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 23:29:17 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use eel2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	eel2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neel2}
+BUILDLINK_PACKAGES+=	eel2
+
 .if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			eel2
-BUILDLINK_DEPENDS.eel2+=		eel2>=2.4.1nb2
-BUILDLINK_PKGSRCDIR.eel2?=		../../devel/eel2
+BUILDLINK_DEPENDS.eel2+=	eel2>=2.4.1nb2
+BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
@@ -30,6 +27,6 @@ BUILDLINK_PKGSRCDIR.eel2?=		../../devel/eel2
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # EEL2_BUILDLINK3_MK
+.endif	# EEL2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 917d26da2dd..ec9d520122a 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gail.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gail
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngail}
+BUILDLINK_PACKAGES+=	gail
+
 .if !empty(GAIL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gail
-BUILDLINK_DEPENDS.gail+=		gail>=1.4.1nb1
-BUILDLINK_PKGSRCDIR.gail?=		../../devel/gail
+BUILDLINK_DEPENDS.gail+=	gail>=1.4.1nb1
+BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gail?=		../../devel/gail
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GAIL_BUILDLINK3_MK
+.endif	# GAIL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
index cc71ab8ac3c..9589a298a2d 100644
--- a/devel/gal2/buildlink3.mk
+++ b/devel/gal2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gal2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gal2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngal2}
+BUILDLINK_PACKAGES+=	gal2
+
 .if !empty(GAL2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gal2
-BUILDLINK_DEPENDS.gal2+=		gal2>=1.99.10nb3
-BUILDLINK_PKGSRCDIR.gal2?=		../../devel/gal2
+BUILDLINK_DEPENDS.gal2+=	gal2>=1.99.10nb3
+BUILDLINK_PKGSRCDIR.gal2?=	../../devel/gal2
 
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 
-.endif # GAL2_BUILDLINK3_MK
+.endif	# GAL2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index 9784174cddc..8837b3df8de 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:02:52 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use giblib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	giblib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngiblib}
+BUILDLINK_PACKAGES+=	giblib
+
 .if !empty(GIBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			giblib
-BUILDLINK_DEPENDS.giblib+=		giblib>=1.2.3nb3
-BUILDLINK_PKGSRCDIR.giblib?=		../../devel/giblib
+BUILDLINK_DEPENDS.giblib+=	giblib>=1.2.3nb3
+BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
 
 .include "../../graphics/imlib2/buildlink3.mk"
 
-.endif # GIBLIB_BUILDLINK3_MK
+.endif	# GIBLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 244cc256fec..65dc4ce3aeb 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/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:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	glib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib}
+BUILDLINK_PACKAGES+=	glib
+
 .if !empty(GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		glib
 BUILDLINK_DEPENDS.glib+=	glib>=1.2.10nb5
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 
 PTHREAD_OPTS+=	require
 
-.  include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
 .endif	# GLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 65871029d46..7f1e83f5bd2 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/11 12:27:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -7,14 +7,18 @@ GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	glib2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglib2}
+BUILDLINK_PACKAGES+=	glib2
+
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		glib2
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.2.2nb1
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
-.  include "../../converters/libiconv/buildlink3.mk"
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../mk/pthread.buildlink3.mk"
-.endif # GLIB2_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.endif	# GLIB2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index d900d94807c..8844639c81b 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
@@ -7,11 +7,12 @@ GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gmp
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmp}
+BUILDLINK_PACKAGES+=	gmp
+
 .if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gmp
 BUILDLINK_DEPENDS.gmp+=		gmp>=4.1.2
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
-
-.endif # GMP_BUILDLINK3_MK
+.endif	# GMP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index cf13ee18692..e4fc203276b 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 13:15:54 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use gperf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPERF_BUILDLINK3_MK:=	${GPERF_BUILDLINK3_MK}+
@@ -12,13 +7,13 @@ GPERF_BUILDLINK3_MK:=	${GPERF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gperf
 .endif
 
-.if !empty(GPERF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gperf
-BUILDLINK_DEPENDS.gperf+=		gperf>=3.0.1
-BUILDLINK_PKGSRCDIR.gperf?=		../../devel/gperf
-
-BUILDLINK_DEPMETHOD.gperf=		build
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngperf}
+BUILDLINK_PACKAGES+=	gperf
 
-.endif # GPERF_BUILDLINK3_MK
+.if !empty(GPERF_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gperf+=	gperf>=3.0.1
+BUILDLINK_PKGSRCDIR.gperf?=	../../devel/gperf
+BUILDLINK_DEPMETHOD.gperf?=	build
+.endif	# GPERF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index efb8bd47d2f..da6053f6a0e 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:02:52 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libast.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libast
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibast}
+BUILDLINK_PACKAGES+=	libast
+
 .if !empty(LIBAST_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libast
-BUILDLINK_DEPENDS.libast+=		libast>=0.5nb5
-BUILDLINK_PKGSRCDIR.libast?=		../../devel/libast
+BUILDLINK_DEPENDS.libast+=	libast>=0.5nb5
+BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 
-.endif # LIBAST_BUILDLINK3_MK
+.endif	# LIBAST_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 616ec5e0a63..f0287f6cb5d 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 03:52:22 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libbonobo.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libbonobo
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonobo}
+BUILDLINK_PACKAGES+=	libbonobo
+
 .if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libbonobo
-BUILDLINK_DEPENDS.libbonobo+=		libbonobo>=2.4.2
-BUILDLINK_PKGSRCDIR.libbonobo?=		../../devel/libbonobo
+BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.4.2
+BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
-BUILDLINK_FILES.libbonobo+=		share/idl/bonobo-2.0/*
-BUILDLINK_FILES.libbonobo+=		share/idl/bonobo-activation-2.0/*
+BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-2.0/*
+BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-activation-2.0/*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -26,6 +23,6 @@ BUILDLINK_FILES.libbonobo+=		share/idl/bonobo-activation-2.0/*
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # LIBBONOBO_BUILDLINK3_MK
+.endif	# LIBBONOBO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index b3c1f291be2..6287e3189bb 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libbonoboui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libbonoboui
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonoboui}
+BUILDLINK_PACKAGES+=	libbonoboui
+
 .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libbonoboui
 BUILDLINK_DEPENDS.libbonoboui+=		libbonoboui>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBBONOBOUI_BUILDLINK3_MK
+.endif	# LIBBONOBOUI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 2791f4c9dc8..c1fb649dcfc 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:35:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libglade
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade}
+BUILDLINK_PACKAGES+=	libglade
+
 .if !empty(LIBGLADE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libglade
 BUILDLINK_DEPENDS.libglade+=	libglade>=0.17nb5
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
 
-.  include "../../textproc/libxml/buildlink3.mk"
-.  include "../../x11/gnome-libs/buildlink3.mk"
-.endif # LIBGLADE_BUILDLINK3_MK
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+.endif	# LIBGLADE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index a8b86d3126e..9b7d29937b4 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,30 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:23:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libglade2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE2_BUILDLINK3_MK:=	${LIBGLADE2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libglade2
 .endif
 
-.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libglade2
-BUILDLINK_DEPENDS.libglade2+=		libglade2>=2.0.1nb13
-BUILDLINK_PKGSRCDIR.libglade2?=		../../devel/libglade2
-
-BUILDLINK_CPPFLAGS.libglade2= \
-	-I${BUILDLINK_PREFIX.libglade2}/include/libglade-2.0
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade2}
+BUILDLINK_PACKAGES+=	libglade2
 
-CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libglade2}
+.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.0.1nb13
+BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
+BUILDLINK_INCDIRS.libglade2?=	include/libglade-2.0
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBGLADE2_BUILDLINK3_MK
+.endif	# LIBGLADE2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index c2e3ae7e8d4..620173c9627 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:04:37 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnome.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnome
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnome}
+BUILDLINK_PACKAGES+=	libgnome
+
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnome
-BUILDLINK_DEPENDS.libgnome+=		libgnome>=2.4.0
-BUILDLINK_PKGSRCDIR.libgnome?=		../../devel/libgnome
+BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.4.0
+BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libgnome?=		../../devel/libgnome
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 
-.endif # LIBGNOME_BUILDLINK3_MK
+.endif	# LIBGNOME_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 9e14acc0ee1..9f35e843281 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,31 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomeui
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeui}
+BUILDLINK_PACKAGES+=	libgnomeui
+
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnomeui
 BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.4.0.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 
-.endif # LIBGNOMEUI_BUILDLINK3_MK
+.endif	# LIBGNOMEUI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 9c751262ae2..d609b592c8b 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,20 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 22:58:08 cube Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgphoto2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgphoto2}
+BUILDLINK_PACKAGES+=	libgphoto2
+
 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgphoto2
 BUILDLINK_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
-BUILDLINK_PKGSRCDIR.libgphoto2?=		../../devel/libgphoto2
+BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 
-.endif # LIBGPHOTO2_BUILDLINK3_MK
+.endif	# LIBGPHOTO2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index cc025bb220a..4e0b969909a 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:43:54 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgsf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libgsf
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgsf}
+BUILDLINK_PACKAGES+=	libgsf
+
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgsf
-BUILDLINK_DEPENDS.libgsf+=		libgsf>=1.8.2nb3
-BUILDLINK_PKGSRCDIR.libgsf?=		../../devel/libgsf
+BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.8.2nb3
+BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.libgsf?=		../../devel/libgsf
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # LIBGSF_BUILDLINK3_MK
+.endif	# LIBGSF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgtop2/buildlink3.mk b/devel/libgtop2/buildlink3.mk
index 08e369f7075..ddb5a293889 100644
--- a/devel/libgtop2/buildlink3.mk
+++ b/devel/libgtop2/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/26 11:23:41 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libgtop2.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:11 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTOP2_BUILDLINK3_MK:=	${LIBGTOP2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgtop2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop2}
+BUILDLINK_PACKAGES+=	libgtop2
+
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgtop2
-BUILDLINK_DEPENDS.libgtop2+=		libgtop2>=2.0.0nb4
-BUILDLINK_PKGSRCDIR.libgtop2?=		../../devel/libgtop2
+BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.0.0nb4
+BUILDLINK_PKGSRCDIR.libgtop2?=	../../devel/libgtop2
 
-.include "../../devel/popt/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 
-.endif # LIBGTOP2_BUILDLINK3_MK
+.endif	# LIBGTOP2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index f29da0599e1..eaa56f60459 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 10:22:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libidn
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidn}
+BUILDLINK_PACKAGES+=	libidn
+
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libidn
 BUILDLINK_DEPENDS.libidn+=	libidn>=0.3.3
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
 
-.  include "../../converters/libiconv/buildlink3.mk"
-.  include "../../devel/libgetopt/buildlink3.mk"
-.endif # LIBIDN_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+
+.endif	# LIBIDN_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index e9559b91cce..3efc3f3887c 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/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:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libmm
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmm}
+BUILDLINK_PACKAGES+=	libmm
+
 .if !empty(LIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libmm
 BUILDLINK_DEPENDS.libmm+=	libmm>=1.2.1
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
 .endif	# LIBMM_BUILDLINK3_MK
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 6eabd46caca..85963a50dd9 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libntlm
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibntlm}
+BUILDLINK_PACKAGES+=	libntlm
+
 .if !empty(LIBNTLM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libntlm
 BUILDLINK_DEPENDS.libntlm+=	libntlm>=0.3.2
 BUILDLINK_PKGSRCDIR.libntlm?=	../../devel/libntlm
-.endif # LIBNTLM_BUILDLINK3_MK
+.endif	# LIBNTLM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index e7b363f6104..0d46895df61 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 23:23:00 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libproplist.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPROPLIST_BUILDLINK3_MK:=	${LIBPROPLIST_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libproplist
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibproplist}
+BUILDLINK_PACKAGES+=	libproplist
+
 .if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libproplist
 BUILDLINK_DEPENDS.libproplist+=		libproplist>=0.10.1
-BUILDLINK_PKGSRCDIR.libproplist?=		../../devel/libproplist
-
-.endif # LIBPROPLIST_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.libproplist?=	../../devel/libproplist
+.endif	# LIBPROPLIST_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index d049cda198a..f40ecae1e17 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/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:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -9,15 +9,18 @@ LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libslang
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibslang}
+BUILDLINK_PACKAGES+=	libslang
+
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libslang
 BUILDLINK_DEPENDS.libslang+=	libslang>=1.4.9nb1
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 
 # Debian adds a dependency on ncurses.
-.  if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
-.    include "../../devel/ncurses/buildlink3.mk"
-.  endif
+.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
 .endif	# LIBSLANG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 19a7c80e4ef..b7b1e9a4f19 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 05:08:50 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use libstroke.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libstroke
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibstroke}
+BUILDLINK_PACKAGES+=	libstroke
+
 .if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libstroke
-BUILDLINK_DEPENDS.libstroke+=		libstroke>=0.3nb1
-BUILDLINK_PKGSRCDIR.libstroke?=		../../devel/libstroke
+BUILDLINK_DEPENDS.libstroke+=	libstroke>=0.3nb1
+BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
 
 .include "../../lang/tcl/buildlink3.mk"
 
-.endif # LIBSTROKE_BUILDLINK3_MK
+.endif	# LIBSTROKE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index ce6238d6fe4..f5375c009a4 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 23:53:09 seb Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTAR_BUILDLINK3_MK:=	${LIBTAR_BUILDLINK3_MK}+
@@ -8,13 +7,15 @@ LIBTAR_BUILDLINK3_MK:=	${LIBTAR_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libtar
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtar}
+BUILDLINK_PACKAGES+=	libtar
+
 .if !empty(LIBTAR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libtar
-BUILDLINK_DEPENDS.libtar+=		libtar>=1.2.11
-BUILDLINK_PKGSRCDIR.libtar?=		../../devel/libtar
+BUILDLINK_DEPENDS.libtar+=	libtar>=1.2.11
+BUILDLINK_PKGSRCDIR.libtar?=	../../devel/libtar
 
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif # LIBTAR_BUILDLINK3_MK
+.endif	# LIBTAR_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtool/buildlink3.mk b/devel/libtool/buildlink3.mk
index 3e6bd6a15d7..8a5377c727a 100644
--- a/devel/libtool/buildlink3.mk
+++ b/devel/libtool/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 04:23:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libtool.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LTDL_BUILDLINK3_MK:=	${LTDL_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LTDL_BUILDLINK3_MK:=	${LTDL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ltdl
 .endif
 
-.if !empty(LTDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ltdl
-BUILDLINK_DEPENDS.ltdl+=		libtool-base>=1.5.2
-BUILDLINK_PKGSRCDIR.ltdl?=		../../devel/libtool-base
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nltdl}
+BUILDLINK_PACKAGES+=	ltdl
 
-.endif # LTDL_BUILDLINK3_MK
+.if !empty(LTDL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ltdl+=	libtool-base>=1.5.2
+BUILDLINK_PKGSRCDIR.ltdl?=	../../devel/libtool-base
+.endif	# LTDL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index e2165c977cc..fb189637be4 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 22:54:04 cube Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUSB_BUILDLINK3_MK:=	${LIBUSB_BUILDLINK3_MK}+
@@ -8,10 +7,12 @@ LIBUSB_BUILDLINK3_MK:=	${LIBUSB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libusb
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibusb}
+BUILDLINK_PACKAGES+=	libusb
+
 .if !empty(LIBUSB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libusb
-BUILDLINK_DEPENDS.libusb+=		libusb>=0.1.7
-BUILDLINK_PKGSRCDIR.libusb?=		../../devel/libusb
-.endif # LIBUSB_BUILDLINK3_MK
+BUILDLINK_DEPENDS.libusb+=	libusb>=0.1.7
+BUILDLINK_PKGSRCDIR.libusb?=	../../devel/libusb
+.endif	# LIBUSB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 937cea395cb..414ae3a71f3 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:38:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libwnck.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libwnck
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwnck}
+BUILDLINK_PACKAGES+=	libwnck
+
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libwnck
-BUILDLINK_DEPENDS.libwnck+=		libwnck>=2.4.0.1nb1
-BUILDLINK_PKGSRCDIR.libwnck?=		../../devel/libwnck
+BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 
-.endif # LIBWNCK_BUILDLINK3_MK
+.endif	# LIBWNCK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 788b563fb95..455c5898258 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 19:17:33 minskim Exp $
-#
-# This Makefile fragment is included by packages that use oaf.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OAF_BUILDLINK3_MK:=	${OAF_BUILDLINK3_MK}+
@@ -10,15 +7,17 @@ OAF_BUILDLINK3_MK:=	${OAF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	oaf
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Noaf}
+BUILDLINK_PACKAGES+=	oaf
+
 .if !empty(OAF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			oaf
 BUILDLINK_DEPENDS.oaf+=		oaf>=0.6.10nb4
-BUILDLINK_PKGSRCDIR.oaf?=		../../devel/oaf
+BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
 .include "../../x11/gnome-libs/buildlink3.mk"
 
-.endif # OAF_BUILDLINK3_MK
+.endif	# OAF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index d61f11a7acb..06c076fc183 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:56:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ode.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ODE_BUILDLINK3_MK:=	${ODE_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ ODE_BUILDLINK3_MK:=	${ODE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ode
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Node}
+BUILDLINK_PACKAGES+=	ode
+
 .if !empty(ODE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		ode
 BUILDLINK_DEPENDS.ode+=		ode>=0.039
 BUILDLINK_PKGSRCDIR.ode?=	../../devel/ode
-
-.endif # ODE_BUILDLINK3_MK
+.endif	# ODE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 2e1e08908ba..e07306add7f 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 09:02:51 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ogre.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
@@ -12,16 +7,18 @@ OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ogre
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogre}
+BUILDLINK_PACKAGES+=	ogre
+
 .if !empty(OGRE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ogre
-BUILDLINK_DEPENDS.ogre+=		ogre>=0.12.1nb1
-BUILDLINK_PKGSRCDIR.ogre?=		../../devel/ogre
+BUILDLINK_DEPENDS.ogre+=	ogre>=0.12.1nb1
+BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 
-.include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 
-.endif # OGRE_BUILDLINK3_MK
+.endif	# OGRE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index b9413a1a08c..1f5e24a82da 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/17 14:48:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pango
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npango}
+BUILDLINK_PACKAGES+=	pango
+
 .if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		pango
-BUILDLINK_DEPENDS.pango?=	pango>=1.2.5nb1
+BUILDLINK_DEPENDS.pango+=	pango>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 
-.  include "../../devel/glib2/buildlink3.mk"
-.  include "../../fonts/Xft2/buildlink3.mk"
-.endif # PANGO_BUILDLINK3_MK
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+
+.endif	# PANGO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 3337cb02ed2..8511768e680 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/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:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pcre
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npcre}
+BUILDLINK_PACKAGES+=	pcre
+
 .if !empty(PCRE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		pcre
 BUILDLINK_DEPENDS.pcre+=	pcre>=3.4nb1
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 .endif	# PCRE_BUILDLINK3_MK
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk
index f56a61281ee..47cb1c3f00e 100644
--- a/devel/pkgconfig/buildlink3.mk
+++ b/devel/pkgconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 21:01:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PKGCONFIG_BUILDLINK3_MK:=	${PKGCONFIG_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PKGCONFIG_BUILDLINK3_MK:=	${PKGCONFIG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pkgconfig
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npkgconfig}
+BUILDLINK_PACKAGES+=	pkgconfig
+
 .if !empty(PKGCONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		pkgconfig
 BUILDLINK_DEPENDS.pkgconfig+=	pkgconfig>=0.15.0
 BUILDLINK_PKGSRCDIR.pkgconfig?=	../../devel/pkgconfig
 BUILDLINK_DEPMETHOD.pkgconfig?=	build
@@ -18,6 +20,7 @@ CONFIGURE_ENV+=		PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
 CONFIGURE_ENV+=		PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
 MAKE_ENV+=		PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
 MAKE_ENV+=		PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
+
 .endif	# PKGCONFIG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index db0126022d1..dd0243c92dc 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/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:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	popt
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npopt}
+BUILDLINK_PACKAGES+=	popt
+
 .if !empty(POPT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		popt
 BUILDLINK_DEPENDS.popt+=	popt>=1.7nb3
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
 .endif	# POPT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 29d9ec708e1..6d7bed7edea 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/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:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pth
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npth}
+BUILDLINK_PACKAGES+=	pth
+
 .if !empty(PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		pth
 BUILDLINK_DEPENDS.pth+=		pth>=2.0.0
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 .endif	# PTH_BUILDLINK3_MK
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index 20aa33634e0..acaf80fe272 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use pthread-sem.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PTHREAD_SEM_BUILDLINK3_MK:=	${PTHREAD_SEM_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ PTHREAD_SEM_BUILDLINK3_MK:=	${PTHREAD_SEM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pthread-sem
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npthread-sem}
+BUILDLINK_PACKAGES+=	pthread-sem
+
 .if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pthread-sem
 BUILDLINK_DEPENDS.pthread-sem+=		pthread-sem>=1.0
 BUILDLINK_PKGSRCDIR.pthread-sem?=	../../devel/pthread-sem
-
-.endif # PTHREAD_SEM_BUILDLINK3_MK
+.endif	# PTHREAD_SEM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index b7da5268914..d4215c389ef 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:48:11 minskim Exp $
-#
-# This Makefile fragment is included by packages that use rx.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RX_BUILDLINK3_MK:=	${RX_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ RX_BUILDLINK3_MK:=	${RX_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	rx
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrx}
+BUILDLINK_PACKAGES+=	rx
+
 .if !empty(RX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		rx
 BUILDLINK_DEPENDS.rx+=		rx>=1.5
 BUILDLINK_PKGSRCDIR.rx?=	../../devel/rx
-
-.endif # RX_BUILDLINK3_MK
+.endif	# RX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index 47f7528bf59..7b2f5315f05 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/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:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	smpeg
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsmpeg}
+BUILDLINK_PACKAGES+=	smpeg
+
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		smpeg
 BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
 BUILDLINK_PKGSRCDIR.smpeg?=	../../devel/smpeg
 
-.  include "../../devel/SDL/buildlink3.mk"
-.  include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
 .endif	# SMPEG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}