Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly

by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.

32 files changed, 64 insertions, 96 deletions

diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index c2ea1c3b63f..40891ef95fb 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	ImageMagick
 .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ImageMagick+=		ImageMagick>=5.5.7.11nb1
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
+.endif	# IMAGEMAGICK_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif	# IMAGEMAGICK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index d3bd6d2279c..3e9595cab40 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	OpenRM
 .if !empty(OPENRM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.OpenRM+=	OpenRM>=1.5.1
 BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
+.endif	# OPENRM_BUILDLINK3_MK
 
 .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 c45aa30c163..3c96a56d96f 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -14,12 +14,11 @@ 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
+.endif	# SDL_IMAGE_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/+$//}
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 988b633c49b..f1e3ffc9522 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -17,12 +17,11 @@ BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+.endif	# CAIRO_BUILDLINK3_MK
 
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libpixman/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
-.endif	# CAIRO_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index 33e4d818a85..a57be9c75ec 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAL3D_BUILDLINK3_MK:=	${CAL3D_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	cal3d
 .if !empty(CAL3D_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.cal3d+=	cal3d>=0.9.1
 BUILDLINK_PKGSRCDIR.cal3d?=	../../graphics/cal3d
+.endif	# CAL3D_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
 
-.endif	# CAL3D_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index 437af938513..11b87c55ca6 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 13:26:08 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FNLIB_BUILDLINK3_MK:=	${FNLIB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	fnlib
 .if !empty(FNLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.fnlib+=	fnlib>=0.5nb6
 BUILDLINK_PKGSRCDIR.fnlib?=	../../graphics/fnlib
+.endif	# FNLIB_BUILDLINK3_MK
 
 .include "../../graphics/imlib/buildlink3.mk"
 
-.endif	# FNLIB_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 3291c18499c..d16c424718e 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+=	freetype
 BUILDLINK_PKGBASE.freetype?=	freetype-lib
 BUILDLINK_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
+.endif	# FREETYPE_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 e450d18b5bb..f0aad25d152 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gd
 .if !empty(GD_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gd+=		gd>=2.0.15
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
+.endif	# GD_BUILDLINK3_MK
 
 USE_X11=	yes
 
@@ -24,6 +25,4 @@ USE_X11=	yes
 
 .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 cac0869a856..2d39f037f00 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GDK_PIXBUF_GNOME_BUILDLINK3_MK:=	${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	gdk-pixbuf-gnome
 .if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gdk-pixbuf-gnome+=	gdk-pixbuf-gnome>=0.22.0nb2
 BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?=	../../graphics/gdk-pixbuf-gnome
+.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 19a42bfb724..842e11d6cad 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GDK_PIXBUF_BUILDLINK3_MK:=	${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	gdk-pixbuf
 .if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gdk-pixbuf+=		gdk-pixbuf>=0.22.0nb2
 BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
+.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 40e050ffaf9..15abe919b72 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLE_BUILDLINK3_MK:=	${GLE_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gle
 .if !empty(GLE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gle+=		gle>=3.0.3
 BUILDLINK_PKGSRCDIR.gle?=	../../graphics/gle
+.endif	# GLE_BUILDLINK3_MK
 
 .include "../../graphics/Mesa/buildlink3.mk"
 
-.endif	# GLE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 767de23601a..d465592ae79 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2004/03/15 17:38:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	glu
 .if !empty(GLU_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.glu+=		glu>=3.4.2
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
+.endif	# GLU_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 
-.endif	# GLU_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index c2985a3331a..78be610a179 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	glut
 .if !empty(GLUT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.glut+=	glut>=${_MESA_REQD}
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
+.endif	# GLUT_BUILDLINK3_MK
 
 MESA_REQD+=	6.0
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 
-.endif	# GLUT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 405c95159f5..5240fbcb916 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 17:58:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLEXT_BUILDLINK3_MK:=	${GTKGLEXT_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	gtkglext
 .if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkglext+=	gtkglext>=0.7.1nb4
 BUILDLINK_PKGSRCDIR.gtkglext?=	../../graphics/gtkglext
+.endif	# GTKGLEXT_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GTKGLEXT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 81cce4d3140..6ade02def1f 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	imlib
 .if !empty(IMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.imlib+=	imlib>=1.9.14nb5
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
+.endif	# IMLIB_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 .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 fa4e230e678..18afb48df5d 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB2_BUILDLINK3_MK:=	${IMLIB2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	imlib2
 .if !empty(IMLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.imlib2+=	imlib2>=1.1.0nb2
 BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
+.endif	# IMLIB2_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.endif	# IMLIB2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index a1f94e0ae98..7dd9543ca4b 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	jasper
 .if !empty(JASPER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.jasper+=	jasper>=1.600.0
 BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
+.endif	# JASPER_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif	# JASPER_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index 9ad454c8cba..bb124c87c61 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libexif
 .if !empty(LIBEXIF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libexif+=	libexif>=0.5.12
 BUILDLINK_PKGSRCDIR.libexif?=	../../graphics/libexif
+.endif	# LIBEXIF_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif	# LIBEXIF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index e154042f751..cfab6fca303 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDGEDA_BUILDLINK3_MK:=	${LIBGDGEDA_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libgdgeda
 .if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgdgeda+=	libgdgeda>=2.0.15
 BUILDLINK_PKGSRCDIR.libgdgeda?=	../../graphics/libgdgeda
+.endif	# LIBGDGEDA_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
 
-.endif	# LIBGDGEDA_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 4c25847fd5a..1c9d6beb90c 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libgdiplus
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgdiplus+=		libgdiplus>=0.1
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
+.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 e9e2a6b9d15..8cc3449e4aa 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	libgnomecanvas
 .if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
+.endif	# LIBGNOMECANVAS_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBGNOMECANVAS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 126ec454ba7..4f1352ff848 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	librsvg2
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.5.0nb4
 BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
+.endif	# LIBRSVG2_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
@@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBRSVG2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index f67958ac362..ced43e32981 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWMF_BUILDLINK3_MK:=	${LIBWMF_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	libwmf
 .if !empty(LIBWMF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libwmf+=	libwmf>=0.2.8nb2
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
+.endif	# LIBWMF_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBWMF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index c1e1307803e..95309e01156 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	mng
 .if !empty(MNG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mng+=		mng>=1.0.0
 BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
+.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 ef3ad4b8f0f..46f39e87bc0 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	netpbm
 .if !empty(NETPBM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.netpbm+=	netpbm>=10.11.6
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
+.endif	# NETPBM_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/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index 92b53fbed8b..a3cf714b8f3 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PLOTUTILS_BUILDLINK3_MK:=	${PLOTUTILS_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	plotutils
 .if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.plotutils+=	plotutils>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.plotutils?=	../../graphics/plotutils
+.endif	# PLOTUTILS_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
 
-.endif	# PLOTUTILS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 07ba0db974d..c91d32bc008 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	png
 .if !empty(PNG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.png+=		png>=1.2.4
 BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
+.endif	# PNG_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif	# PNG_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index fec16d971ac..b4aa8a1a24e 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_IMAGING_BUILDLINK3_MK:=	${PY_IMAGING_BUILDLINK3_MK}+
@@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+=	pyimaging
 BUILDLINK_PKGBASE.pyimaging?=	${PYPKGPREFIX}-imaging
 BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
+.endif	# PY_IMAGING_BUILDLINK3_MK
 
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif	# PY_IMAGING_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk
index 2f3c2b2d7df..b8c740e073f 100644
--- a/graphics/swfdec/buildlink3.mk
+++ b/graphics/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	swfdec
 .if !empty(SWFDEC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.1nb7
 BUILDLINK_PKGSRCDIR.swfdec?=	../../graphics/swfdec
+.endif	# SWFDEC_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# SWFDEC_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 9e121d4e21e..38d4f4f857c 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	tiff
 .if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tiff+=	tiff>=3.6.1
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
+.endif	# TIFF_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
-.endif	# TIFF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk
index 9e75e669946..95147260237 100644
--- a/graphics/xfce4-artwork/buildlink3.mk
+++ b/graphics/xfce4-artwork/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_ARTWORK_BUILDLINK3_MK:=	${XFCE4_ARTWORK_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-artwork
 .if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-artwork+=	xfce4-artwork>=0.0.4nb4
 BUILDLINK_PKGSRCDIR.xfce4-artwork?=	../../graphics/xfce4-artwork
+.endif	# XFCE4_ARTWORK_BUILDLINK3_MK
 
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_ARTWORK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index 12a01f799e0..478a7602f21 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_ICONBOX_BUILDLINK3_MK:=	${XFCE4_ICONBOX_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xfce4-iconbox
 .if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-iconbox+=	xfce4-iconbox>=4.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-iconbox?=	../../graphics/xfce4-iconbox
+.endif	# XFCE4_ICONBOX_BUILDLINK3_MK
 
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# XFCE4_ICONBOX_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}