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.

10 files changed, 28 insertions, 37 deletions

diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index 36ed0058231..caaaec124a5 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
@@ -19,9 +19,8 @@ BUILDLINK_FILES.ap-perl+=	\
 	${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/*
 BUILDLINK_FILES.ap-perl+=	\
 	${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/modules/perl/*
+.endif	# AP_PERL_BUILDLINK3_MK
 
 .include "../../www/apache/buildlink3.mk"
 
-.endif	# AP_PERL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index 2e8cc2831aa..1daad9d5fab 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $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:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -14,20 +14,20 @@ BUILDLINK_PACKAGES+=	apache
 BUILDLINK_DEPENDS.apache+=	apache>=2.0.48nb3
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
-
-USE_PERL5?=			build	# for "apxs"
-
-.if defined(APACHE_MODULE)
+.  if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=	full
-.endif
+.  endif
+.endif	# APACHE_BUILDLINK3_MK
+
+USE_PERL5?=	build	# for "apxs"
+APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
 
 .include "../../devel/apr/buildlink3.mk"
 
-APXS?=			${BUILDLINK_PREFIX.apache}/sbin/apxs
-.if defined(GNU_CONFIGURE)
+.if !empty(APACHE_BUILDLINK3_MK:M+)
+.  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs2="${APXS}"
-.endif
-
+.  endif
 .endif	# APACHE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index d2daffb4b68..9b6ce8eca96 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	curl
 .if !empty(CURL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.curl+=	curl>=7.9.1
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
+.endif	# CURL_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif	# CURL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk
index 496ba52ddde..62e3447813f 100644
--- a/www/gtkhtml3/buildlink3.mk
+++ b/www/gtkhtml3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML3_BUILDLINK3_MK:=	${GTKHTML3_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	gtkhtml3
 .if !empty(GTKHTML3_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.0.9nb5
 BUILDLINK_PKGSRCDIR.gtkhtml3?=	../../www/gtkhtml3
+.endif	# GTKHTML3_BUILDLINK3_MK
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gal2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 
-.endif	# GTKHTML3_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index fb56ae59e10..25715a8aa67 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	libgtkhtml
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.4.1nb5
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
+.endif	# LIBGTKHTML_BUILDLINK3_MK
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# LIBGTKHTML_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index 8aaaee452f1..10c8207f654 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libwww
 .if !empty(LIBWWW_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libwww+=	libwww>=5.3.2nb2
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
+.endif	# LIBWWW_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif	# LIBWWW_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index aac132d836c..c4cd5ad761e 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_GTK2_BUILDLINK3_MK:=	${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	mozilla-gtk2
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.6nb1
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
+.endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -20,6 +21,4 @@ BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# MOZILLA_GTK2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-stable/buildlink3.mk b/www/mozilla-stable/buildlink3.mk
index 0e5d285d06e..f8bd9266d64 100644
--- a/www/mozilla-stable/buildlink3.mk
+++ b/www/mozilla-stable/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_STABLE_BUILDLINK3_MK:=	${MOZILLA_STABLE_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	mozilla-stable
 .if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla-stable+=	mozilla-stable>=1.4.1nb2
 BUILDLINK_PKGSRCDIR.mozilla-stable?=	../../www/mozilla-stable
+.endif	# MOZILLA_STABLE_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
@@ -21,6 +22,4 @@ BUILDLINK_PKGSRCDIR.mozilla-stable?=	../../www/mozilla-stable
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
-.endif	# MOZILLA_STABLE_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index bbbe8efdcd8..7e2ac102ea1 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOZILLA_BUILDLINK3_MK:=	${MOZILLA_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	mozilla
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.6
 BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
+.endif	# MOZILLA_BUILDLINK3_MK
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
@@ -20,7 +21,5 @@ BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
- 
-.endif	# MOZILLA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index 81a5b4f34c9..ca3652afea2 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 22:30:33 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:16 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEON_BUILDLINK3_MK:=	${NEON_BUILDLINK3_MK}+
@@ -13,11 +13,10 @@ BUILDLINK_PACKAGES+=	neon
 .if !empty(NEON_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.neon+=	neon>=0.24.4
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
+.endif	# NEON_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
-.endif	# NEON_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}