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.

14 files changed, 30 insertions, 40 deletions

diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index 0b50abb2414..8a663636705 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ENCHANT_BUILDLINK3_MK:=	${ENCHANT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	enchant
 .if !empty(ENCHANT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.enchant+=	enchant>=1.1.3
 BUILDLINK_PKGSRCDIR.enchant?=	../../textproc/enchant
+.endif	# ENCHANT_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 
-.endif	# ENCHANT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 0e911007a04..f863cd07f49 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPELL_BUILDLINK3_MK:=	${GNOME_SPELL_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gnome-spell
 .if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
 BUILDLINK_PKGSRCDIR.gnome-spell?=	../../textproc/gnome-spell
+.endif	# GNOME_SPELL_BUILDLINK3_MK
 
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
@@ -22,6 +23,4 @@ BUILDLINK_PKGSRCDIR.gnome-spell?=	../../textproc/gnome-spell
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GNOME_SPELL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 28f0244ef12..34f2d18955d 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSPELL_BUILDLINK3_MK:=	${GTKSPELL_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	gtkspell
 .if !empty(GTKSPELL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
 BUILDLINK_PKGSRCDIR.gtkspell?=	../../textproc/gtkspell
+.endif	# GTKSPELL_BUILDLINK3_MK
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif	# GTKSPELL_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index ae5b435a2b0..0c4e85fffe1 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 INTLTOOL_BUILDLINK3_MK:=	${INTLTOOL_BUILDLINK3_MK}+
@@ -14,11 +14,13 @@ BUILDLINK_PACKAGES+=	intltool
 BUILDLINK_DEPENDS.intltool+=	intltool>=0.30
 BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
 BUILDLINK_DEPMETHOD.intltool?=	build
+.endif	# INTLTOOL_BUILDLINK3_MK
 
 USE_PERL5?=	build
 
 .include "../../lang/perl5/buildlink3.mk"
 
+.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
 CONFIGURE_ENV+=		INTLTOOL_PERL="${PERL5}"
 INTLTOOLIZE=		${BUILDLINK_PREFIX.intltool}/bin/intltoolize
 
@@ -29,7 +31,6 @@ intltoolize:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} "=> Overriding intltool."
 	@cd ${WRKSRC} && ${INTLTOOLIZE} --force >/dev/null 2>&1
-
 .endif	# INTLTOOL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 2981bbc2814..151bf569448 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCROCO_BUILDLINK3_MK:=	${LIBCROCO_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+=	libcroco
 .if !empty(LIBCROCO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libcroco+=	libcroco>=0.4.0
 BUILDLINK_PKGSRCDIR.libcroco?=	../../textproc/libcroco
+.endif	# LIBCROCO_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBCROCO_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index 58de2f30f91..9dd5a0a1ae7 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPATHAN_BUILDLINK3_MK:=	${LIBPATHAN_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libpathan
 .if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libpathan+=	libpathan>=1.2.2
 BUILDLINK_PKGSRCDIR.libpathan?=	../../textproc/libpathan
+.endif	# LIBPATHAN_BUILDLINK3_MK
 
 .include "../../textproc/xerces-c/buildlink3.mk"
 
-.endif	# LIBPATHAN_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index 628e7296a92..ec7bfaa69c4 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML_BUILDLINK3_MK:=	${LIBXML_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	libxml
 .if !empty(LIBXML_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxml+=	libxml>=1.8.11
 BUILDLINK_PKGSRCDIR.libxml?=	../../textproc/libxml
+.endif	# LIBXML_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif	# LIBXML_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 0eb1270b840..92d7415537c 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libxml2
 .if !empty(LIBXML2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.2
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
+.endif	# LIBXML2_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
-.endif	# LIBXML2_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 927f025ecba..cc9d2b2175e 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXSLT_BUILDLINK3_MK:=	${LIBXSLT_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	libxslt
 .if !empty(LIBXSLT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.0
 BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
+.endif	# LIBXSLT_BUILDLINK3_MK
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif	# LIBXSLT_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 29456094231..9de2ac4d76d 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSP_BUILDLINK3_MK:=	${OPENSP_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	opensp
 .if !empty(OPENSP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.opensp+=	opensp>=1.5nb1
 BUILDLINK_PKGSRCDIR.opensp?=	../../textproc/opensp
+.endif	# OPENSP_BUILDLINK3_MK
 
 PTHREAD_OPTS+=          native
 
@@ -23,6 +24,4 @@ PTHREAD_OPTS+=          native
 .  include "../../devel/unproven-pthreads/buildlink3.mk"
 .endif
 
-.endif	# OPENSP_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 819fd2c3e85..3eb88c9c868 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYXML_BUILDLINK3_MK:=	${PYXML_BUILDLINK3_MK}+
@@ -16,9 +16,8 @@ BUILDLINK_PACKAGES+=	pyxml
 BUILDLINK_PKGBASE.pyxml?=	${PYPKGPREFIX}-xml
 BUILDLINK_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
+.endif	# PYXML_BUILDLINK3_MK
 
 .include "../../textproc/expat/buildlink3.mk"
 
-.endif	# PYXML_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index 77a65f2c6d0..d455259f720 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/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:15 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCROLLKEEPER_BUILDLINK3_MK:=	${SCROLLKEEPER_BUILDLINK3_MK}+
@@ -13,12 +13,14 @@ BUILDLINK_PACKAGES+=	scrollkeeper
 .if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
 BUILDLINK_PKGSRCDIR.scrollkeeper?=	../../textproc/scrollkeeper
+.endif	# SCROLLKEEPER_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
 
+.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
 BUILDLINK_TARGETS+=	scrollkeeper-buildlink-fake
 
 _SK_FAKE_UPDATE=	${BUILDLINK_DIR}/bin/scrollkeeper-update
@@ -41,7 +43,6 @@ scrollkeeper-buildlink-fake:
 		${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-rebuilddb' \$$*" >> ${_SK_FAKE_REBUILDDB};		\
 		${CHMOD} +x ${_SK_FAKE_REBUILDDB};			\
 	fi
-
 .endif	# SCROLLKEEPER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index 0a2ac62a402..166d2ec7fea 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/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}+
 XALAN_C_BUILDLINK3_MK:=	${XALAN_C_BUILDLINK3_MK}+
@@ -13,10 +13,9 @@ BUILDLINK_PACKAGES+=	xalan-c
 .if !empty(XALAN_C_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xalan-c+=	xalan-c>=1.6
 BUILDLINK_PKGSRCDIR.xalan-c?=	../../textproc/xalan-c
+.endif	# XALAN_C_BUILDLINK3_MK
 
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 
-.endif	# XALAN_C_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 3fe141e76f2..8e72d8ccdf5 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/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}+
 XERCES_C_BUILDLINK3_MK:=	${XERCES_C_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+=	xerces-c
 .if !empty(XERCES_C_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xerces-c+=	xerces-c>=2.3.0
 BUILDLINK_PKGSRCDIR.xerces-c?=	../../textproc/xerces-c
+.endif	# XERCES_C_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 
-.endif	# XERCES_C_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}