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.

46 files changed, 115 insertions, 161 deletions

diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index d867a02d491..de0c2091099 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	GConf
 .if !empty(GCONF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb5
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
+.endif	# GCONF_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
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index c3645562716..d1cd19c9037 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCONF2_UI_BUILDLINK3_MK:=	${GCONF2_UI_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	GConf2-ui
 .if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GConf2-ui+=	GConf2-ui>=2.4.0.1nb1
 BUILDLINK_PKGSRCDIR.GConf2-ui?=	../../devel/GConf2-ui
+.endif	# GCONF2_UI_BUILDLINK3_MK
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../x11/gtk2/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 89f475bb5a4..577c3b2fe91 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	GConf2
 .if !empty(GCONF2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.4.0.1
 BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
+.endif	# GCONF2_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -21,8 +22,8 @@ BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
 
+.if !empty(GCONF2_BUILDLINK3_MK:M+)
 BUILDLINK_TARGETS+=	GConf2-buildlink-fake
-
 _GCONF2_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
 
 GConf2-buildlink-fake:
@@ -33,7 +34,6 @@ GConf2-buildlink-fake:
 		${ECHO} "#!${SH}" > ${_GCONF2_FAKE};			\
 		${CHMOD} +x ${_GCONF2_FAKE};				\
 	fi
-
 .endif	# GCONF2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 58c42834eef..91a687995d1 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -13,9 +13,10 @@ BUILDLINK_PACKAGES+=	SDL
 .if !empty(SDL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
+.endif	# SDL_BUILDLINK3_MK
 
-USE_X11=		yes
-PTHREAD_OPTS+=		require
+USE_X11=	yes
+PTHREAD_OPTS+=	require
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/aalib-x11/buildlink3.mk"
@@ -23,6 +24,4 @@ PTHREAD_OPTS+=		require
 
 .include "../../mk/pthread.buildlink3.mk"
 
-.endif	# SDL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index 270fea80041..8e3b463daf8 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 04:21:55 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_GFX_BUILDLINK3_MK:=	${SDL_GFX_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	SDL_gfx
 .if !empty(SDL_GFX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
 BUILDLINK_PKGSRCDIR.SDL_gfx?=	../../devel/SDL_gfx
+.endif	# SDL_GFX_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 
-.endif	# SDL_GFX_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index acb1bfa53bd..3f9af3c3350 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 17:47:30 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_TTF_BUILDLINK3_MK:=	${SDL_TTF_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	SDL_ttf
 .if !empty(SDL_TTF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
 BUILDLINK_PKGSRCDIR.SDL_ttf?=	../../devel/SDL_ttf
+.endif	# SDL_TTF_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 
-.endif	# SDL_TTF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index 5c19f4b2f5f..5c5ada11f1f 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 23:19:38 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLMM_BUILDLINK3_MK:=	${SDLMM_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	SDLmm
 .if !empty(SDLMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
 BUILDLINK_PKGSRCDIR.SDLmm?=	../../devel/SDLmm
+.endif	# SDLMM_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 
-.endif	# SDLMM_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 23de408c4ce..585afad0b8c 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 22:32:05 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	apr
 .endif
@@ -17,14 +19,11 @@ BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr
 BUILDLINK_FILES.apr+=	bin/apr-config
 BUILDLINK_FILES.apr+=	bin/apu-config
 BUILDLINK_FILES.apr+=	lib/*.exp
+.endif	# APR_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
-.if ${APR_USE_DB4} == "YES"
-.include "../../databases/db4/buildlink3.mk"
+.if !empty(APR_USE_DB4:M[yY][eE][sS])
+.  include "../../databases/db4/buildlink3.mk"
 .endif
-
 .include "../../textproc/expat/buildlink3.mk"
 
-.endif	# APR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 4b5c09ded92..1ec4d508c96 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/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:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	at-spi
 .if !empty(AT_SPI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.at-spi+=	at-spi>=1.3.8nb1
 BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
+.endif	# AT_SPI_BUILDLINK3_MK
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 .include "../../devel/popt/buildlink3.mk"
 .include "../../x11/gtk2/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 56bc53f3697..f2269d06a76 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/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:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	atk
 .if !empty(ATK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.atk+=		atk>=1.4.1
 BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
+.endif	# ATK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif	# ATK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index 562dc4084b1..184c0deea1f 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	devIL
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.devIL+=	devIL>=1.6.6nb1
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
+.endif	# DEVIL_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-.endif	# DEVIL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 79a65e307f5..e2d87acfb80 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	eel2
 .if !empty(EEL2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.eel2+=	eel2>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
+.endif	# EEL2_BUILDLINK3_MK
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
@@ -27,6 +28,4 @@ BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# EEL2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index ec9d520122a..27ce5eafad9 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gail
 .if !empty(GAIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gail+=	gail>=1.4.1nb1
 BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
+.endif	# GAIL_BUILDLINK3_MK
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GAIL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
index 9589a298a2d..3a06bcd4022 100644
--- a/devel/gal2/buildlink3.mk
+++ b/devel/gal2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	gal2
 .if !empty(GAL2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gal2+=	gal2>=1.99.10nb3
 BUILDLINK_PKGSRCDIR.gal2?=	../../devel/gal2
+.endif	# GAL2_BUILDLINK3_MK
 
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 
-.endif	# GAL2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index a8916d30539..0b9e4943251 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -14,10 +14,9 @@ BUILDLINK_PACKAGES+=	gettext
 BUILDLINK_PKGBASE.gettext?=	gettext-lib
 BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.10.35nb1
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
+.endif	# GETTEXT_BUILDLINK3_MK
 
 # libiconv/buildlink3.mk is included by gettext-lib/builtin.mk
 #.include "../../converters/libiconv/buildlink3.mk"
 
-.endif	# GETTEXT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index 8837b3df8de..f66a31cf8eb 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	giblib
 .if !empty(GIBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.giblib+=	giblib>=1.2.3nb3
 BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
+.endif	# GIBLIB_BUILDLINK3_MK
 
 .include "../../graphics/imlib2/buildlink3.mk"
 
-.endif	# GIBLIB_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 65dc4ce3aeb..77cc5be1cc3 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	glib
 .if !empty(GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.glib+=	glib>=1.2.10nb5
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
+.endif	# GLIB_BUILDLINK3_MK
 
 PTHREAD_OPTS+=	require
 
 .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 7f1e83f5bd2..0e47d3a57a6 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	glib2
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.2.2nb1
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
+.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/gnome-objc/buildlink3.mk b/devel/gnome-objc/buildlink3.mk
index 2b07528874f..afa316c7b85 100644
--- a/devel/gnome-objc/buildlink3.mk
+++ b/devel/gnome-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 22:51:25 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_OBJC_BUILDLINK3_MK:=	${GNOME_OBJC_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	gnome-objc
 .if !empty(GNOME_OBJC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-objc+=		gnome-objc>=1.0.40nb4
 BUILDLINK_PKGSRCDIR.gnome-objc?=	../../devel/gnome-objc
+.endif	# GNOME_OBJC_BUILDLINK3_MK
 
 .include "../../x11/gnome-libs/buildlink3.mk"
 
-.endif	# GNOME_OBJC_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index da6053f6a0e..a8b2e139eec 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libast
 .if !empty(LIBAST_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libast+=	libast>=0.5nb5
 BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
+.endif	# LIBAST_BUILDLINK3_MK
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 
-.endif	# LIBAST_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index f0287f6cb5d..46578b80e21 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
@@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-2.0/*
 BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-activation-2.0/*
+.endif	# LIBBONOBO_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -23,6 +24,4 @@ BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-activation-2.0/*
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBBONOBO_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 6287e3189bb..f951470a70e 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	libbonoboui
 .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libbonoboui+=		libbonoboui>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
+.endif	# LIBBONOBOUI_BUILDLINK3_MK
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBBONOBOUI_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index e4f9517b4c7..5eb3422c599 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,22 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 14:10:39 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libdockapp.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDOCKAPP_BUILDLINK3_MK:=	${LIBDOCKAPP_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libdockapp
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdockapp}
+BUILDLINK_PACKAGES+=	libdockapp
+
 .if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libdockapp
 BUILDLINK_DEPENDS.libdockapp+=		libdockapp>=0.4.0
-BUILDLINK_PKGSRCDIR.libdockapp?=		../../devel/libdockapp
+BUILDLINK_PKGSRCDIR.libdockapp?=	../../devel/libdockapp
+.endif	# LIBDOCKAPP_BUILDLINK3_MK
 
 .include "../../graphics/xpm/buildlink3.mk"
 
-.endif # LIBDOCKAPP_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index c1fb649dcfc..386ffa2ead2 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libglade
 .if !empty(LIBGLADE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libglade+=	libglade>=0.17nb5
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
+.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 9b7d29937b4..6c618350adb 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE2_BUILDLINK3_MK:=	${LIBGLADE2_BUILDLINK3_MK}+
@@ -14,10 +14,9 @@ BUILDLINK_PACKAGES+=	libglade2
 BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.0.1nb13
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
 BUILDLINK_INCDIRS.libglade2?=	include/libglade-2.0
+.endif	# LIBGLADE2_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBGLADE2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index 620173c9627..ebeabfa2e92 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	libgnome
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.4.0
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
+.endif	# LIBGNOME_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -24,6 +25,4 @@ BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 
-.endif	# LIBGNOME_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 9f35e843281..445d65e02cf 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	libgnomeui
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.4.0.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
+.endif	# LIBGNOMEUI_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
@@ -23,6 +24,4 @@ BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 
-.endif	# LIBGNOMEUI_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index d609b592c8b..9baa629be0d 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libgphoto2
 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
 BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
+.endif	# LIBGPHOTO2_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 
-.endif	# LIBGPHOTO2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index 4e0b969909a..0b958b2c2bd 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	libgsf
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.8.2nb3
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
+.endif	# LIBGSF_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBGSF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgtop2/buildlink3.mk b/devel/libgtop2/buildlink3.mk
index ddb5a293889..d140646089e 100644
--- a/devel/libgtop2/buildlink3.mk
+++ b/devel/libgtop2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTOP2_BUILDLINK3_MK:=	${LIBGTOP2_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libgtop2
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.0.0nb4
 BUILDLINK_PKGSRCDIR.libgtop2?=	../../devel/libgtop2
+.endif	# LIBGTOP2_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 
-.endif	# LIBGTOP2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index eaa56f60459..9ea9f7e8e41 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libidn
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libidn+=	libidn>=0.3.3
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
+.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/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index f40ecae1e17..eae4c783592 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -15,12 +15,11 @@ BUILDLINK_PACKAGES+=	libslang
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libslang+=	libslang>=1.4.9nb1
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
+.endif	# LIBSLANG_BUILDLINK3_MK
 
 # Debian adds a dependency on ncurses.
 .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 e73fd4ed531..90a32e49c16 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libstroke
 .if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libstroke+=	libstroke>=0.3nb1
 BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
+.endif	# LIBSTROKE_BUILDLINK3_MK
 
 .include "../../lang/tcl83/buildlink3.mk"
 
-.endif	# LIBSTROKE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index f5375c009a4..5c7df57a76f 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTAR_BUILDLINK3_MK:=	${LIBTAR_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libtar
 .if !empty(LIBTAR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libtar+=	libtar>=1.2.11
 BUILDLINK_PKGSRCDIR.libtar?=	../../devel/libtar
+.endif	# LIBTAR_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif	# LIBTAR_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 414ae3a71f3..43960b49ed8 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libwnck
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.4.0.1nb1
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
+.endif	# LIBWNCK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
-.endif	# LIBWNCK_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 455c5898258..8522e9424b6 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OAF_BUILDLINK3_MK:=	${OAF_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	oaf
 .if !empty(OAF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.oaf+=		oaf>=0.6.10nb4
 BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
+.endif	# OAF_BUILDLINK3_MK
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
 .include "../../x11/gnome-libs/buildlink3.mk"
 
-.endif	# OAF_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index e07306add7f..bed1f45d2ac 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	ogre
 .if !empty(OGRE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ogre+=	ogre>=0.12.1nb1
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
+.endif	# OGRE_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
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 1f5e24a82da..0e8b377e4c0 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	pango
 .if !empty(PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pango+=	pango>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
+.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/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index c8bec497752..2218c03c174 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/07 00:30:04 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHYSFS_BUILDLINK3_MK:=	${PHYSFS_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	physfs
 .if !empty(PHYSFS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.physfs+=	physfs>=0.1.8
 BUILDLINK_PKGSRCDIR.physfs?=	../../devel/physfs
+.endif	# PHYSFS_BUILDLINK3_MK
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-.endif	# PHYSFS_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index dd0243c92dc..ad256256f13 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	popt
 .if !empty(POPT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.popt+=	popt>=1.7nb3
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
+.endif	# POPT_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif	# POPT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index 7b2f5315f05..931749e93db 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	smpeg
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
 BUILDLINK_PKGSRCDIR.smpeg?=	../../devel/smpeg
+.endif	# SMPEG_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif	# SMPEG_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk
index 90ad399a38c..14252cf9428 100644
--- a/devel/subversion/buildlink3.mk
+++ b/devel/subversion/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
 
+.include "../../devel/subversion/Makefile.version"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	subversion-base
 .endif
@@ -15,13 +17,10 @@ BUILDLINK_DEPENDS.subversion-base+=	subversion-base>=${SVNVER}
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
+.endif	# SUBVERSION_BASE_BUILDLINK3_MK
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
 
-.include "../../devel/subversion/Makefile.version"
-
-.endif	# SUBVERSION_BASE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/swig-build/buildlink3.mk b/devel/swig-build/buildlink3.mk
index 008e6c4f834..3afb9fb61c3 100644
--- a/devel/swig-build/buildlink3.mk
+++ b/devel/swig-build/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 23:20:55 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWIG_BUILD_BUILDLINK3_MK:=	${SWIG_BUILD_BUILDLINK3_MK}+
 
+.include "../../devel/swig-build/Makefile.version"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	swig-build
 .endif
@@ -11,14 +13,11 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig-build}
 BUILDLINK_PACKAGES+=	swig-build
 
 .if !empty(SWIG_BUILD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swig-build+=	swig-build>=${SWIG_VERSION}
+BUILDLINK_DEPENDS.swig-build+=		swig-build>=${SWIG_VERSION}
 BUILDLINK_PKGSRCDIR.swig-build?=	../../devel/swig-build
 
 # This package contains no run-time components.
 BUILDLINK_DEPMETHOD.swig-build?=	build
-
-.include "../../devel/swig-build/Makefile.version"
-
 .endif	# SWIG_BUILD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/swig-perl/buildlink3.mk b/devel/swig-perl/buildlink3.mk
index 30fc93f0a3f..ee28032d8d5 100644
--- a/devel/swig-perl/buildlink3.mk
+++ b/devel/swig-perl/buildlink3.mk
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWIG_PERL_BUILDLINK3_MK:=	${SWIG_PERL_BUILDLINK3_MK}+
 
+.include "../../devel/swig-build/Makefile.version"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	swig-perl
 .endif
@@ -13,11 +15,8 @@ BUILDLINK_PACKAGES+=	swig-perl
 .if !empty(SWIG_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.swig-perl+=	swig-perl>=${SWIG_VERSION}
 BUILDLINK_PKGSRCDIR.swig-perl?=	../../devel/swig-perl
+.endif	# SWIG_PERL_BUILDLINK3_MK
 
 .include "../../lang/perl5/buildlink3.mk"
 
-.include "../../devel/swig-build/Makefile.version"
-
-.endif	# SWIG_PERL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/swig-python/buildlink3.mk b/devel/swig-python/buildlink3.mk
index 606cc5fce84..ad30cc7cf1a 100644
--- a/devel/swig-python/buildlink3.mk
+++ b/devel/swig-python/buildlink3.mk
@@ -1,8 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 23:20:35 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWIG_PYTHON_BUILDLINK3_MK:=	${SWIG_PYTHON_BUILDLINK3_MK}+
 
+PYTHON_VERSION_ACCEPTED=	22 22pth
+
+.include "../../lang/python/pyversion.mk"
+.include "../../devel/swig-build/Makefile.version"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	swig-python
 .endif
@@ -11,14 +16,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig-python}
 BUILDLINK_PACKAGES+=	swig-python
 
 .if !empty(SWIG_PYTHON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swig-python+=	swig-python>=${SWIG_VERSION}
+BUILDLINK_DEPENDS.swig-python+=		swig-python>=${SWIG_VERSION}
 BUILDLINK_PKGSRCDIR.swig-python?=	../../devel/swig-python
-
-PYTHON_VERSION_ACCEPTED=		22 22pth
-.include "../../lang/python/pyversion.mk"
-
-.include "../../devel/swig-build/Makefile.version"
-
 .endif	# SWIG_PYTHON_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index 80e23074ff5..3729e503fdb 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:49:41 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_TCLCL_BUILDLINK3_MK:=	${TCL_TCLCL_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	tcl-tclcl
 .if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
 BUILDLINK_PKGSRCDIR.tcl-tclcl?=	../../devel/tcl-tclcl
+.endif	# TCL_TCLCL_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
-.endif	# TCL_TCLCL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}