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.

15 files changed, 43 insertions, 59 deletions

diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 24a032b0b80..d6fee20ee6b 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
@@ -19,12 +19,11 @@ BUILDLINK_LIBDIRS.gcc?=		\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc?=	build
-.endif
-
+.  endif
 .endif	# GCC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 0710de0d411..8ea27408d16 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
@@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-cxx?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-cxx+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc3-cxx?=	build
-.endif
-
+.  endif
 .endif	# GCC3_CXX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 7400e8aa181..d1cd0e6ff8b 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 04:19:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
@@ -29,12 +29,11 @@ BUILDLINK_LIBDIRS.gcc3-c?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-c+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc3-c?=	build
-.endif
-
+.  endif
 .endif	# GCC3_C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index d0fb0605932..609452718b4 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
@@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-f77?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-f77+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc3-f77?=	build
-.endif
-
+.  endif
 .endif	# GCC3_F77_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 5fead2ef83b..fef0942499f 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
@@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-java?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-java+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc3-java?=	build
-.endif
-
+.  endif
 .endif	# GCC3_JAVA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index feb6ed62b2f..12ac1f9ad8e 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
@@ -25,12 +25,11 @@ BUILDLINK_LIBDIRS.gcc3-objc?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.if defined(USE_GCC_SHLIB)
+.  if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3-objc+=	full
-.else
+.  else
 BUILDLINK_DEPMETHOD.gcc3-objc?=	build
-.endif
-
+.  endif
 .endif	# GCC3_OBJC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index 0774a312cee..87211d7d41b 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	guile
 .if !empty(GUILE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.guile+=	guile>=1.6.3nb1
 BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile
+.endif	# GUILE_BUILDLINK3_MK
 
 .include "../../devel/libtool/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 
-.endif	# GUILE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index d941a7de213..f1be5d6c1fd 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	libperl
 .if !empty(LIBPERL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libperl+=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
 BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
+.endif	# LIBPERL_BUILDLINK3_MK
 
 LIBPERL5_REQD?=		${_PERL5_REQD}
 
 .include "../../lang/perl5/buildlink3.mk"
 
-.endif	# LIBPERL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index 36263ed67e4..a0c96c66117 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
@@ -13,12 +13,10 @@ BUILDLINK_PACKAGES+=	librep
 .if !empty(LIBREP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.librep+=	librep>=0.16.1nb1
 BUILDLINK_PKGSRCDIR.librep?=	../../lang/librep
-
-MAKE_FLAGS+=	rep_LIBTOOL=${LIBTOOL}
+MAKE_FLAGS+=			rep_LIBTOOL=${LIBTOOL}
+.endif	# LIBREP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 
-.endif	# LIBREP_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index d799856b414..09b9628d306 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	mono
 .if !empty(MONO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mono+=	mono>=0.30
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
+.endif	# MONO_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 
-.endif	# MONO_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index 95a41e194ce..552d7d9d033 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/11 08:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	pnet
 .if !empty(PNET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pnet+=	pnet>=0.6.2
 BUILDLINK_PKGSRCDIR.pnet?=	../../lang/pnet
+.endif	# PNET_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif	# PNET_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 1c82f6ae4c1..c89aa89bcd0 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	pnetC
 .if !empty(PNETC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pnetC+=	pnetC>=0.6.0
 BUILDLINK_PKGSRCDIR.pnetC?=	../../lang/pnetC
+.endif	# PNETC_BUILDLINK3_MK
 
 .include "../../lang/pnet/buildlink3.mk"
 
-.endif	# PNETC_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index e455f8e5728..0a1be727dc9 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	pnetlib
 .if !empty(PNETLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pnetlib+=	pnetlib>=0.6.2
 BUILDLINK_PKGSRCDIR.pnetlib?=	../../lang/pnetlib
+.endif	# PNETLIB_BUILDLINK3_MK
 
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../lang/pnet/buildlink3.mk"
 
-.endif	# PNETLIB_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk
index 94ea32bd4a8..7d58877bf10 100644
--- a/lang/tcl-expect/buildlink3.mk
+++ b/lang/tcl-expect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/11 20:19:38 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_EXPECT_BUILDLINK3_MK:=	${TCL_EXPECT_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	tcl-expect
 .if !empty(TCL_EXPECT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb1
 BUILDLINK_PKGSRCDIR.tcl-expect?=	../../lang/tcl-expect
+.endif	# TCL_EXPECT_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 
-.endif	# TCL_EXPECT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index 9c4f28a0505..9d3145edf79 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:47:44 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_OTCL_BUILDLINK3_MK:=	${TCL_OTCL_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	tcl-otcl
 .if !empty(TCL_OTCL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
 BUILDLINK_PKGSRCDIR.tcl-otcl?=	../../lang/tcl-otcl
+.endif	# TCL_OTCL_BUILDLINK3_MK
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
-.endif	# TCL_OTCL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}