Reorder location and setting of BUILDLINK_PACKAGES to match template

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

39 files changed, 293 insertions, 289 deletions

diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index a1f9e21b87f..c2ea1c3b63f 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/02 10:31:48 adam Exp $
-#
-# This Makefile fragment is included by packages that use ImageMagick.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	ImageMagick
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NImageMagick}
+BUILDLINK_PACKAGES+=	ImageMagick
+
 .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ImageMagick
 BUILDLINK_DEPENDS.ImageMagick+=		ImageMagick>=5.5.7.11nb1
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif # IMAGEMAGICK_BUILDLINK3_MK
+.endif	# IMAGEMAGICK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/Mesa/buildlink3.mk b/graphics/Mesa/buildlink3.mk
index e3275b94128..214d7fb8721 100644
--- a/graphics/Mesa/buildlink3.mk
+++ b/graphics/Mesa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 02:03:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
 
 .if !defined(MESA_BUILDLINK3_MK)
 MESA_BUILDLINK3_MK=	defined
@@ -8,8 +8,8 @@ BUILDLINK_PREFIX.Mesa=	${BUILDLINK_PREFIX.MesaLib}
 # The ordering is important here as glut/buildlink3.mk sets the version
 # of Mesa required.
 #
-.include "../../graphics/glut/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
 
 .endif	# MESA_BUILDLINK3_MK
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 564109a9b29..d3bd6d2279c 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,20 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 10:07:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
 
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-OPENRM_BUILDLINK3_MK:=			${OPENRM_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=			OpenRM
+BUILDLINK_DEPENDS+=	OpenRM
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NOpenRM}
+BUILDLINK_PACKAGES+=	OpenRM
+
 .if !empty(OPENRM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			OpenRM
-BUILDLINK_DEPENDS.OpenRM+=		OpenRM>=1.5.1
-BUILDLINK_PKGSRCDIR.OpenRM?=		../../graphics/OpenRM
-
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/Mesa/buildlink3.mk"
-.  include "../../mk/pthread.buildlink3.mk"
-.endif # OPENRM_BUILDLINK3_MK
+BUILDLINK_DEPENDS.OpenRM+=	OpenRM>=1.5.1
+BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.endif	# OPENRM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 2a62e50060d..c45aa30c163 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	SDL_image
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_image}
+BUILDLINK_PACKAGES+=	SDL_image
+
 .if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		SDL_image
 BUILDLINK_DEPENDS.SDL_image+=	SDL_image>=1.2.3nb1
 BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
 .endif	# SDL_IMAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index 89950604460..0cdc02e5e2f 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=		aalib-x11
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib-x11}
+BUILDLINK_PACKAGES+=	aalib-x11
+
 .if !empty(AALIB_X11_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		aalib-x11
 BUILDLINK_DEPENDS.aalib-x11+=	aalib-x11>=1.4.0.4nb1
 BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
 
@@ -19,6 +21,7 @@ BUILDLINK_TRANSFORM+=		l:aa:aa-x11
 AALIB_CONFIG=		${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config
 CONFIGURE_ENV+=		AALIB_CONFIG="${AALIB_CONFIG}"
 MAKE_ENV+=		AALIB_CONFIG="${AALIB_CONFIG}"
-.endif # AALIB_X11_BUILDLINK3_MK
+
+.endif	# AALIB_X11_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 77f515c14f1..901926c6f38 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:44:23 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use aalib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	aalib
 .endif
 
-.if !empty(AALIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			aalib
-BUILDLINK_DEPENDS.aalib+=		aalib>=1.4.0.4
-BUILDLINK_PKGSRCDIR.aalib?=		../../graphics/aalib
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib}
+BUILDLINK_PACKAGES+=	aalib
 
-.endif # AALIB_BUILDLINK3_MK
+.if !empty(AALIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.aalib+=	aalib>=1.4.0.4
+BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
+.endif	# AALIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 6fe3795c09f..988b633c49b 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/29 00:06:14 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	cairo
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncairo}
+BUILDLINK_PACKAGES+=	cairo
+
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		cairo
 BUILDLINK_DEPENDS.cairo+=	cairo>=0.1.17nb1
 BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 
@@ -21,6 +23,6 @@ BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../graphics/libpixman/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
-.endif # CAIRO_BUILDLINK3_MK
+.endif	# CAIRO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index 321a3f32a3b..cf5b9275dcf 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
-#
-# This Makefile fragment is included by packages that use cal3d.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAL3D_BUILDLINK3_MK:=	${CAL3D_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ CAL3D_BUILDLINK3_MK:=	${CAL3D_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	cal3d
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncal3d}
+BUILDLINK_PACKAGES+=	cal3d
+
 .if !empty(CAL3D_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			cal3d
-BUILDLINK_DEPENDS.cal3d?=		cal3d>=0.9.1
-BUILDLINK_PKGSRCDIR.cal3d?=		../../graphics/cal3d
+BUILDLINK_DEPENDS.cal3d?=	cal3d>=0.9.1
+BUILDLINK_PKGSRCDIR.cal3d?=	../../graphics/cal3d
 
 .include "../../graphics/Mesa/buildlink3.mk"
 
-.endif # CAL3D_BUILDLINK3_MK
+.endif	# CAL3D_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index 8a80a1067c4..ffa721caed4 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:08:44 minskim Exp $
-#
-# This Makefile fragment is included by packages that use compface.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 COMPFACE_BUILDLINK3_MK:=	${COMPFACE_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	compface
 .endif
 
-.if !empty(COMPFACE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			compface
-BUILDLINK_DEPENDS.compface+=		compface>=1.4
-BUILDLINK_PKGSRCDIR.compface?=		../../graphics/compface
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompface}
+BUILDLINK_PACKAGES+=	compface
 
-.endif # COMPFACE_BUILDLINK3_MK
+.if !empty(COMPFACE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.compface+=	compface>=1.4
+BUILDLINK_PKGSRCDIR.compface?=	../../graphics/compface
+.endif	# COMPFACE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 6ad85f44019..91fae0db87c 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	freetype
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetype}
+BUILDLINK_PACKAGES+=	freetype
+
 .if !empty(FREETYPE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		freetype
 BUILDLINK_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
 .endif	# FREETYPE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index f28349c2360..e450d18b5bb 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
@@ -7,19 +7,23 @@ GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gd
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngd}
+BUILDLINK_PACKAGES+=	gd
+
 .if !empty(GD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gd
 BUILDLINK_DEPENDS.gd+=		gd>=2.0.15
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 
 USE_X11=	yes
 
-.  include "../../mk/pthread.buildlink3.mk"
-.  include "../../devel/zlib/buildlink3.mk"
-.  include "../../graphics/freetype2/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/xpm/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
 .endif	# GD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk
index 02bba99d066..cac0869a856 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:48:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GDK_PIXBUF_GNOME_BUILDLINK3_MK:=	${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ GDK_PIXBUF_GNOME_BUILDLINK3_MK:=	${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gdk-pixbuf-gnome
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdk-pixbuf-gnome}
+BUILDLINK_PACKAGES+=	gdk-pixbuf-gnome
+
 .if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gdk-pixbuf-gnome
 BUILDLINK_DEPENDS.gdk-pixbuf-gnome+=	gdk-pixbuf-gnome>=0.22.0nb2
 BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?=	../../graphics/gdk-pixbuf-gnome
 
-.  include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.  include "../../x11/gnome-libs/buildlink3.mk"
-.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+.endif	# GDK_PIXBUF_GNOME_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 93412e3cb61..19a42bfb724 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:47:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GDK_PIXBUF_BUILDLINK3_MK:=	${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ GDK_PIXBUF_BUILDLINK3_MK:=	${GDK_PIXBUF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gdk-pixbuf
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngdk-pixbuf}
+BUILDLINK_PACKAGES+=	gdk-pixbuf
+
 .if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gdk-pixbuf
 BUILDLINK_DEPENDS.gdk-pixbuf+=		gdk-pixbuf>=0.22.0nb2
 BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
 
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../x11/gtk/buildlink3.mk"
-.endif # GDK_PIXBUF_BUILDLINK3_MK
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif	# GDK_PIXBUF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index 669d966c03f..40e050ffaf9 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/01 10:09:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLE_BUILDLINK3_MK:=	${GLE_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ GLE_BUILDLINK3_MK:=	${GLE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gle
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngle}
+BUILDLINK_PACKAGES+=	gle
+
 .if !empty(GLE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gle
 BUILDLINK_DEPENDS.gle+=		gle>=3.0.3
 BUILDLINK_PKGSRCDIR.gle?=	../../graphics/gle
 
-.  include "../../graphics/Mesa/buildlink3.mk"
-.endif # GLE_BUILDLINK3_MK
+.include "../../graphics/Mesa/buildlink3.mk"
+
+.endif	# GLE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index d52ca6af6f7..c2985a3331a 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 02:03:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	glut
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglut}
+BUILDLINK_PACKAGES+=	glut
+
 .if !empty(GLUT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		glut
 BUILDLINK_DEPENDS.glut+=	glut>=${_MESA_REQD}
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 
 MESA_REQD+=	6.0
 
-.  include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+
 .endif	# GLUT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gnome2-pixmaps/buildlink3.mk b/graphics/gnome2-pixmaps/buildlink3.mk
index c7e2f8c6444..0083dc2acb0 100644
--- a/graphics/gnome2-pixmaps/buildlink3.mk
+++ b/graphics/gnome2-pixmaps/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:40:49 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome2-pixmaps.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME2_PIXMAPS_BUILDLINK3_MK:=	${GNOME2_PIXMAPS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gnome2-pixmaps
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-pixmaps}
+BUILDLINK_PACKAGES+=	gnome2-pixmaps
+
 .if !empty(GNOME2_PIXMAPS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnome2-pixmaps
 BUILDLINK_DEPENDS.gnome2-pixmaps+=	gnome2-pixmaps>=2.4.1.1
 BUILDLINK_PKGSRCDIR.gnome2-pixmaps?=	../../graphics/gnome2-pixmaps
-
-.endif # GNOME2_PIXMAPS_BUILDLINK3_MK
+.endif	# GNOME2_PIXMAPS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index df80cc2403b..497e05d072a 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 20:58:04 garbled Exp $
-#
-# This Makefile fragment is included by packages that use gtkglext.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:34 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLEXT_BUILDLINK3_MK:=	${GTKGLEXT_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtkglext
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglext}
+BUILDLINK_PACKAGES+=	gtkglext
+
 .if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtkglext
-BUILDLINK_DEPENDS.gtkglext?=		gtkglext>=0.7.1nb4
-BUILDLINK_PKGSRCDIR.gtkglext?=		../../graphics/gtkglext
+BUILDLINK_DEPENDS.gtkglext?=	gtkglext>=0.7.1nb4
+BUILDLINK_PKGSRCDIR.gtkglext?=	../../graphics/gtkglext
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # GTKGLEXT_BUILDLINK3_MK
+.endif	# GTKGLEXT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index 3e5f50cb131..588b42cae0c 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use Hermes.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:34 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HERMES_BUILDLINK3_MK:=	${HERMES_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ HERMES_BUILDLINK3_MK:=	${HERMES_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	Hermes
 .endif
 
-.if !empty(HERMES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			Hermes
-BUILDLINK_DEPENDS.Hermes+=		Hermes>=1.3.2
-BUILDLINK_PKGSRCDIR.Hermes?=		../../graphics/hermes
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NHermes}
+BUILDLINK_PACKAGES+=	Hermes
 
-.endif # HERMES_BUILDLINK3_MK
+.if !empty(HERMES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.Hermes+=	Hermes>=1.3.2
+BUILDLINK_PKGSRCDIR.Hermes?=	../../graphics/hermes
+.endif	# HERMES_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index f4aef70ad00..81cce4d3140 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
@@ -7,18 +7,21 @@ IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	imlib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib}
+BUILDLINK_PACKAGES+=	imlib
+
 .if !empty(IMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		imlib
 BUILDLINK_DEPENDS.imlib+=	imlib>=1.9.14nb5
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/libungif/buildlink3.mk"
-.  include "../../graphics/netpbm/buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../x11/gtk/buildlink3.mk"
-.endif # IMLIB_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif	# IMLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 7e7b2d08a15..fa4e230e678 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 22:57:16 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use imlib2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	imlib2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimlib2}
+BUILDLINK_PACKAGES+=	imlib2
+
 .if !empty(IMLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			imlib2
-BUILDLINK_DEPENDS.imlib2+=		imlib2>=1.1.0nb2
-BUILDLINK_PKGSRCDIR.imlib2?=		../../graphics/imlib2
+BUILDLINK_DEPENDS.imlib2+=	imlib2>=1.1.0nb2
+BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.imlib2?=		../../graphics/imlib2
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif # IMLIB2_BUILDLINK3_MK
+.endif	# IMLIB2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index e66823bb737..a1f94e0ae98 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:10:15 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use jasper.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	jasper
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njasper}
+BUILDLINK_PACKAGES+=	jasper
+
 .if !empty(JASPER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			jasper
-BUILDLINK_DEPENDS.jasper+=		jasper>=1.600.0
-BUILDLINK_PKGSRCDIR.jasper?=		../../graphics/jasper
+BUILDLINK_DEPENDS.jasper+=	jasper>=1.600.0
+BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
 
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif # JASPER_BUILDLINK3_MK
+.endif	# JASPER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 4f114a2f1c3..01c1713c396 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	jpeg
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njpeg}
+BUILDLINK_PACKAGES+=	jpeg
+
 .if !empty(JPEG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		jpeg
 BUILDLINK_DEPENDS.jpeg+=	jpeg>=6b
 BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
 .endif	# JPEG_BUILDLINK3_MK
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 4a64dc69688..69e39f2f3bf 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/11 19:11:32 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
@@ -7,15 +7,17 @@ LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	lcms
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlcms}
+BUILDLINK_PACKAGES+=	lcms
+
 .if !empty(LCMS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		lcms
 BUILDLINK_DEPENDS.lcms+=	lcms>=1.06
 BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
-.endif # LCMS_BUILDLINK3_MK
 
 BUILDLINK_TARGETS+=	buildlink-include-lcms
 
-buildlink-include-lcms: .PHONY
+.PHONY: buildlink-include-lcms
+buildlink-include-lcms:
 .for _h_ in lcms.h icc34.h
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then		\
@@ -25,4 +27,6 @@ buildlink-include-lcms: .PHONY
 	fi
 .endfor
 
+.endif	# LCMS_BUILDLINK3_MK
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libart2/buildlink3.mk b/graphics/libart2/buildlink3.mk
index 8883f88cd5d..c881792f250 100644
--- a/graphics/libart2/buildlink3.mk
+++ b/graphics/libart2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:25:25 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libart2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBART2_BUILDLINK3_MK:=	${LIBART2_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBART2_BUILDLINK3_MK:=	${LIBART2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libart2
 .endif
 
-.if !empty(LIBART2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libart2
-BUILDLINK_DEPENDS.libart2+=		libart2>=2.3.10nb1
-BUILDLINK_PKGSRCDIR.libart2?=		../../graphics/libart2
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibart2}
+BUILDLINK_PACKAGES+=	libart2
 
-.endif # LIBART2_BUILDLINK3_MK
+.if !empty(LIBART2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libart2+=	libart2>=2.3.10nb1
+BUILDLINK_PKGSRCDIR.libart2?=	../../graphics/libart2
+.endif	# LIBART2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index 3e00fb2b0bc..9ad454c8cba 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:58:15 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libexif.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libexif
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibexif}
+BUILDLINK_PACKAGES+=	libexif
+
 .if !empty(LIBEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libexif
-BUILDLINK_DEPENDS.libexif+=		libexif>=0.5.12
-BUILDLINK_PKGSRCDIR.libexif?=		../../graphics/libexif
+BUILDLINK_DEPENDS.libexif+=	libexif>=0.5.12
+BUILDLINK_PKGSRCDIR.libexif?=	../../graphics/libexif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif # LIBEXIF_BUILDLINK3_MK
+.endif	# LIBEXIF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index 5c2e69cb993..e154042f751 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 04:43:48 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use libgdgeda.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDGEDA_BUILDLINK3_MK:=	${LIBGDGEDA_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgdgeda
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdgeda}
+BUILDLINK_PACKAGES+=	libgdgeda
+
 .if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgdgeda
-BUILDLINK_DEPENDS.libgdgeda+=		libgdgeda>=2.0.15
-BUILDLINK_PKGSRCDIR.libgdgeda?=		../../graphics/libgdgeda
+BUILDLINK_DEPENDS.libgdgeda+=	libgdgeda>=2.0.15
+BUILDLINK_PKGSRCDIR.libgdgeda?=	../../graphics/libgdgeda
 
 .include "../../graphics/png/buildlink3.mk"
 
-.endif # LIBGDGEDA_BUILDLINK3_MK
+.endif	# LIBGDGEDA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 932ba23a190..4c25847fd5a 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libgdiplus
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
+BUILDLINK_PACKAGES+=	libgdiplus
+
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgdiplus
 BUILDLINK_DEPENDS.libgdiplus+=		libgdiplus>=0.1
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 
-.  include "../../graphics/cairo/buildlink3.mk"
-.  include "../../lang/mono/buildlink3.mk"
-.  include "../../x11/Xrender/buildlink3.mk"
-.endif # LIBGDIPLUS_BUILDLINK3_MK
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+
+.endif	# LIBGDIPLUS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index a2d73bf750b..e9e2a6b9d15 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:25:25 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomecanvas.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomecanvas
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvas}
+BUILDLINK_PACKAGES+=	libgnomecanvas
+
 .if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnomecanvas
 BUILDLINK_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBGNOMECANVAS_BUILDLINK3_MK
+.endif	# LIBGNOMECANVAS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index 2aae0310ab6..1efa250facb 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPIXMAN_BUILDLINK3_MK:=	${LIBPIXMAN_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBPIXMAN_BUILDLINK3_MK:=	${LIBPIXMAN_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libpixman
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpixman}
+BUILDLINK_PACKAGES+=	libpixman
+
 .if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libpixman
 BUILDLINK_DEPENDS.libpixman+=	libpixman>=0.1.0
 BUILDLINK_PKGSRCDIR.libpixman?=	../../graphics/libpixman
-.endif # LIBPIXMAN_BUILDLINK3_MK
+.endif	# LIBPIXMAN_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 40534bcd5e6..126ec454ba7 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,32 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:22:08 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use librsvg2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	librsvg2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
+BUILDLINK_PACKAGES+=	librsvg2
+
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			librsvg2
-BUILDLINK_DEPENDS.librsvg2+=		librsvg2>=2.5.0nb4
-BUILDLINK_PKGSRCDIR.librsvg2?=		../../graphics/librsvg2
+BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.5.0nb4
+BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
 
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBRSVG2_BUILDLINK3_MK
+.endif	# LIBRSVG2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 7447352a96e..ccdb27d4168 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libungif
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibungif}
+BUILDLINK_PACKAGES+=	libungif
+
 .if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libungif
 BUILDLINK_DEPENDS.libungif+=	libungif>=4.1.0
 BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
 .endif	# LIBUNGIF_BUILDLINK3_MK
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 03ed1148dde..f67958ac362 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:07:25 wiz Exp $
-#
-# This Makefile fragment is included by packages that use libwmf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWMF_BUILDLINK3_MK:=	${LIBWMF_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ LIBWMF_BUILDLINK3_MK:=	${LIBWMF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libwmf
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwmf}
+BUILDLINK_PACKAGES+=	libwmf
+
 .if !empty(LIBWMF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libwmf
-BUILDLINK_DEPENDS.libwmf+=		libwmf>=0.2.8nb2
-BUILDLINK_PKGSRCDIR.libwmf?=		../../graphics/libwmf
+BUILDLINK_DEPENDS.libwmf+=	libwmf>=0.2.8nb2
+BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.libwmf?=		../../graphics/libwmf
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # LIBWMF_BUILDLINK3_MK
+.endif	# LIBWMF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 1de48ec02ed..c1e1307803e 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	mng
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmng}
+BUILDLINK_PACKAGES+=	mng
+
 .if !empty(MNG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		mng
 BUILDLINK_DEPENDS.mng+=		mng>=1.0.0
 BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
 
-.  include "../../devel/zlib/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
-.  include "../../graphics/lcms/buildlink3.mk"
-.endif # MNG_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
+
+.endif	# MNG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 17e5bbed837..ef3ad4b8f0f 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	netpbm
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetpbm}
+BUILDLINK_PACKAGES+=	netpbm
+
 .if !empty(NETPBM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		netpbm
 BUILDLINK_DEPENDS.netpbm+=	netpbm>=10.11.6
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
 
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
 .endif	# NETPBM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/openquicktime/buildlink3.mk b/graphics/openquicktime/buildlink3.mk
index f937569ba96..d251e116dff 100644
--- a/graphics/openquicktime/buildlink3.mk
+++ b/graphics/openquicktime/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use openquicktime.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openquicktime
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenquicktime}
+BUILDLINK_PACKAGES+=	openquicktime
+
 .if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			openquicktime
-BUILDLINK_DEPENDS.openquicktime+=		openquicktime>=1.0nb2
-BUILDLINK_PKGSRCDIR.openquicktime?=		../../graphics/openquicktime
+BUILDLINK_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
+BUILDLINK_PKGSRCDIR.openquicktime?=	../../graphics/openquicktime
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif # OPENQUICKTIME_BUILDLINK3_MK
+.endif	# OPENQUICKTIME_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index bb9f5b628bf..92b53fbed8b 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 14:46:50 minskim Exp $
-#
-# This Makefile fragment is included by packages that use plotutils.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PLOTUTILS_BUILDLINK3_MK:=	${PLOTUTILS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	plotutils
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplotutils}
+BUILDLINK_PACKAGES+=	plotutils
+
 .if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			plotutils
-BUILDLINK_DEPENDS.plotutils+=		plotutils>=2.4.1nb2
-BUILDLINK_PKGSRCDIR.plotutils?=		../../graphics/plotutils
+BUILDLINK_DEPENDS.plotutils+=	plotutils>=2.4.1nb2
+BUILDLINK_PKGSRCDIR.plotutils?=	../../graphics/plotutils
 
 .include "../../graphics/png/buildlink3.mk"
 
-.endif # PLOTUTILS_BUILDLINK3_MK
+.endif	# PLOTUTILS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 9589b3d6aaf..07ba0db974d 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	png
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npng}
+BUILDLINK_PACKAGES+=	png
+
 .if !empty(PNG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		png
 BUILDLINK_DEPENDS.png+=		png>=1.2.4
 BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
-.  include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 .endif	# PNG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk
index b2b555dbe69..2f3c2b2d7df 100644
--- a/graphics/swfdec/buildlink3.mk
+++ b/graphics/swfdec/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use swfdec.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	swfdec
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswfdec}
+BUILDLINK_PACKAGES+=	swfdec
+
 .if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			swfdec
-BUILDLINK_DEPENDS.swfdec+=		swfdec>=0.2.1nb7
-BUILDLINK_PKGSRCDIR.swfdec?=		../../graphics/swfdec
+BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.1nb7
+BUILDLINK_PKGSRCDIR.swfdec?=	../../graphics/swfdec
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # SWFDEC_BUILDLINK3_MK
+.endif	# SWFDEC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 450c07db9d7..9e121d4e21e 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	tiff
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntiff}
+BUILDLINK_PACKAGES+=	tiff
+
 .if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		tiff
 BUILDLINK_DEPENDS.tiff+=	tiff>=3.6.1
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 
-.  include "../../devel/zlib/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+
 .endif	# TIFF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}