Track information in a new variable BUILDLINK_ORDER that informs us

of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

30 files changed, 60 insertions, 30 deletions

diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk
index e02adaa2af4..02aef9a2bfd 100644
--- a/math/R/buildlink3.mk
+++ b/math/R/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/06/09 11:15:32 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 R_BUILDLINK3_MK:=	${R_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	R
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NR}
 BUILDLINK_PACKAGES+=	R
+BUILDLINK_ORDER+=	R
 
 .if !empty(R_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.R+=	R>=1.7.0
diff --git a/math/blas/buildlink3.mk b/math/blas/buildlink3.mk
index 2ae379e8c1a..d47f3c3227f 100644
--- a/math/blas/buildlink3.mk
+++ b/math/blas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLAS_BUILDLINK3_MK:=	${BLAS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	blas
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblas}
 BUILDLINK_PACKAGES+=	blas
+BUILDLINK_ORDER+=	blas
 
 .if !empty(BLAS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.blas+=	blas>=1.0nb2
diff --git a/math/cln/buildlink3.mk b/math/cln/buildlink3.mk
index 6de742bc988..983b97e373b 100644
--- a/math/cln/buildlink3.mk
+++ b/math/cln/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:19 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLN_BUILDLINK3_MK:=	${CLN_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	cln
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncln}
 BUILDLINK_PACKAGES+=	cln
+BUILDLINK_ORDER+=	cln
 
 .if !empty(CLN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.cln+=		cln>=1.1.6
diff --git a/math/djbfft/buildlink3.mk b/math/djbfft/buildlink3.mk
index e137faa62d0..008ebdcaf62 100644
--- a/math/djbfft/buildlink3.mk
+++ b/math/djbfft/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DJBFFT_BUILDLINK3_MK:=	${DJBFFT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	djbfft
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndjbfft}
 BUILDLINK_PACKAGES+=	djbfft
+BUILDLINK_ORDER+=	djbfft
 
 .if !empty(DJBFFT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.djbfft+=	djbfft>=0.76
diff --git a/math/fftw/buildlink3.mk b/math/fftw/buildlink3.mk
index cdac914f88f..c5a36403489 100644
--- a/math/fftw/buildlink3.mk
+++ b/math/fftw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:20 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFTW_BUILDLINK3_MK:=	${FFTW_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fftw
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfftw}
 BUILDLINK_PACKAGES+=	fftw
+BUILDLINK_ORDER+=	fftw
 
 .if !empty(FFTW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fftw+=	fftw>=3.0
diff --git a/math/fftw2/buildlink3.mk b/math/fftw2/buildlink3.mk
index 9681664f9d7..f9f58fa3e4b 100644
--- a/math/fftw2/buildlink3.mk
+++ b/math/fftw2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:26 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFTW2_BUILDLINK3_MK:=	${FFTW2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fftw2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfftw2}
 BUILDLINK_PACKAGES+=	fftw2
+BUILDLINK_ORDER+=	fftw2
 
 .if !empty(FFTW2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fftw2+=	fftw2>=2.1.3
diff --git a/math/fftwf/buildlink3.mk b/math/fftwf/buildlink3.mk
index d107fdee731..9205e9943c1 100644
--- a/math/fftwf/buildlink3.mk
+++ b/math/fftwf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFTWF_BUILDLINK3_MK:=	${FFTWF_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	fftwf
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfftwf}
 BUILDLINK_PACKAGES+=	fftwf
+BUILDLINK_ORDER+=	fftwf
 
 .if !empty(FFTWF_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.fftwf+=	fftwf>=3.0
diff --git a/math/glpk/buildlink3.mk b/math/glpk/buildlink3.mk
index f47db34d78a..ef3760df4d7 100644
--- a/math/glpk/buildlink3.mk
+++ b/math/glpk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/05/23 10:17:20 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLPK_BUILDLINK3_MK:=	${GLPK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	glpk
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglpk}
 BUILDLINK_PACKAGES+=	glpk
+BUILDLINK_ORDER+=	glpk
 
 .if !empty(GLPK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glpk+=	glpk>=4.8nb1
diff --git a/math/gsl/buildlink3.mk b/math/gsl/buildlink3.mk
index dab5ac38bf7..e7a5ff37c2f 100644
--- a/math/gsl/buildlink3.mk
+++ b/math/gsl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSL_BUILDLINK3_MK:=	${GSL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gsl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsl}
 BUILDLINK_PACKAGES+=	gsl
+BUILDLINK_ORDER+=	gsl
 
 .if !empty(GSL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gsl+=		gsl>=1.4
diff --git a/math/guppi/buildlink3.mk b/math/guppi/buildlink3.mk
index 37537ca8685..4fe54a2383f 100644
--- a/math/guppi/buildlink3.mk
+++ b/math/guppi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUPPI_BUILDLINK3_MK:=	${GUPPI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	guppi
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguppi}
 BUILDLINK_PACKAGES+=	guppi
+BUILDLINK_ORDER+=	guppi
 
 .if !empty(GUPPI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.guppi+=	guppi>=0.40.3nb13
diff --git a/math/lapack/buildlink3.mk b/math/lapack/buildlink3.mk
index 10b66c5b54f..20ad925970a 100644
--- a/math/lapack/buildlink3.mk
+++ b/math/lapack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LAPACK_BUILDLINK3_MK:=	${LAPACK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	lapack
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlapack}
 BUILDLINK_PACKAGES+=	lapack
+BUILDLINK_ORDER+=	lapack
 
 .if !empty(LAPACK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.lapack+=	lapack>=20010201nb1
diff --git a/math/libffm/buildlink3.mk b/math/libffm/buildlink3.mk
index 7bd7c885ec9..a2f38249491 100644
--- a/math/libffm/buildlink3.mk
+++ b/math/libffm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBFFM_BUILDLINK3_MK:=	${LIBFFM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libffm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibffm}
 BUILDLINK_PACKAGES+=	libffm
+BUILDLINK_ORDER+=	libffm
 
 .if !empty(LIBFFM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libffm+=	libffm>=0.28
diff --git a/math/libmatheval/buildlink3.mk b/math/libmatheval/buildlink3.mk
index 57da79d1f43..58cbc382727 100644
--- a/math/libmatheval/buildlink3.mk
+++ b/math/libmatheval/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATHEVAL_BUILDLINK3_MK:=	${LIBMATHEVAL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libmatheval
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatheval}
 BUILDLINK_PACKAGES+=	libmatheval
+BUILDLINK_ORDER+=	libmatheval
 
 .if !empty(LIBMATHEVAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmatheval+=	libmatheval>=1.1.0
diff --git a/math/ltm/buildlink3.mk b/math/ltm/buildlink3.mk
index 9ad5f952241..9a1d35634e8 100644
--- a/math/ltm/buildlink3.mk
+++ b/math/ltm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LTM_BUILDLINK3_MK:=	${LTM_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	ltm
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nltm}
 BUILDLINK_PACKAGES+=	ltm
+BUILDLINK_ORDER+=	ltm
 
 .if !empty(LTM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ltm+=	ltm>=0.30
diff --git a/math/mpfr/buildlink3.mk b/math/mpfr/buildlink3.mk
index a5b9306a290..1d17f09eff5 100644
--- a/math/mpfr/buildlink3.mk
+++ b/math/mpfr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MPFR_BUILDLINK3_MK:=	${MPFR_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	mpfr
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpfr}
 BUILDLINK_PACKAGES+=	mpfr
+BUILDLINK_ORDER+=	mpfr
 
 .if !empty(MPFR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mpfr+=	mpfr>=2.0.3
diff --git a/math/ntl/buildlink3.mk b/math/ntl/buildlink3.mk
index 1a9626c8a52..43c78087e53 100644
--- a/math/ntl/buildlink3.mk
+++ b/math/ntl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:28 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NTL_BUILDLINK3_MK:=	${NTL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	ntl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nntl}
 BUILDLINK_PACKAGES+=	ntl
+BUILDLINK_ORDER+=	ntl
 
 .if !empty(NTL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ntl+=	ntl>=5.3.1
diff --git a/math/octave-current/buildlink3.mk b/math/octave-current/buildlink3.mk
index 3a237fb7df0..0eece9d6cd2 100644
--- a/math/octave-current/buildlink3.mk
+++ b/math/octave-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 22:39:29 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	octave-current
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Noctave-current}
 BUILDLINK_PACKAGES+=	octave-current
+BUILDLINK_ORDER+=	octave-current
 
 .if !empty(OCTAVE_CURRENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.octave-current+=	octave-current>=2.1.57
diff --git a/math/octave-forge/buildlink3.mk b/math/octave-forge/buildlink3.mk
index 5320d9dfdb9..37801de0998 100644
--- a/math/octave-forge/buildlink3.mk
+++ b/math/octave-forge/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OCTAVE_FORGE_BUILDLINK3_MK:=	${OCTAVE_FORGE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	octave-forge
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Noctave-forge}
 BUILDLINK_PACKAGES+=	octave-forge
+BUILDLINK_ORDER+=	octave-forge
 
 .if !empty(OCTAVE_FORGE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.octave-forge+=	octave-forge>=2005.06.13
diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk
index 19f431445cd..8b4d9b6eeca 100644
--- a/math/octave/buildlink3.mk
+++ b/math/octave/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 09:10:28 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCTAVE_BUILDLINK3_MK:=	${OCTAVE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	octave
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Noctave}
 BUILDLINK_PACKAGES+=	octave
+BUILDLINK_ORDER+=	octave
 
 .if !empty(OCTAVE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.octave+=	octave>=2.1.69
diff --git a/math/pari/buildlink3.mk b/math/pari/buildlink3.mk
index d325c958e46..bdf8ddeb90c 100644
--- a/math/pari/buildlink3.mk
+++ b/math/pari/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARI_BUILDLINK3_MK:=	${PARI_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pari
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npari}
 BUILDLINK_PACKAGES+=	pari
+BUILDLINK_ORDER+=	pari
 
 .if !empty(PARI_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pari+=	pari>=2.1.5nb1
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index eaf780d3088..b9d08155448 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/02 10:28:50 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NUMERIC_BUILDLINK3_MK:=	${PY_NUMERIC_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pynumeric
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npynumeric}
 BUILDLINK_PACKAGES+=	pynumeric
+BUILDLINK_ORDER+=	pynumeric
 
 .if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
diff --git a/math/py-fpconst/buildlink3.mk b/math/py-fpconst/buildlink3.mk
index 56aa0590a9c..1902da4305c 100644
--- a/math/py-fpconst/buildlink3.mk
+++ b/math/py-fpconst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_FPCONST_BUILDLINK3_MK:=	${PY_FPCONST_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	py-fpconst
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-fpconst}
 BUILDLINK_PACKAGES+=	py-fpconst
+BUILDLINK_ORDER+=	py-fpconst
 
 .if !empty(PY_FPCONST_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.py-fpconst+=	${PYPKGPREFIX}-fpconst>=0.7.0
diff --git a/math/py-numarray/buildlink3.mk b/math/py-numarray/buildlink3.mk
index 3c0154ce86c..6aa616d05a5 100644
--- a/math/py-numarray/buildlink3.mk
+++ b/math/py-numarray/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_NUMARRAY_BUILDLINK3_MK:=	${PY_NUMARRAY_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@ BUILDLINK_DEPENDS+=	pynumarray
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npynumarray}
 BUILDLINK_PACKAGES+=	pynumarray
+BUILDLINK_ORDER+=	pynumarray
 
 .if !empty(PY_NUMARRAY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pynumarray+=	${PYPKGPREFIX}-numarray>=1.1.1
diff --git a/math/qalculate/buildlink3.mk b/math/qalculate/buildlink3.mk
index 1978c96ff1e..b00a63cb8eb 100644
--- a/math/qalculate/buildlink3.mk
+++ b/math/qalculate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QALCULATE_BUILDLINK3_MK:=	${QALCULATE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	qalculate
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqalculate}
 BUILDLINK_PACKAGES+=	qalculate
+BUILDLINK_ORDER+=	qalculate
 
 .if !empty(QALCULATE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qalculate+=	qalculate>=0.8.2
diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk
index 52e7440e881..1512070d9ef 100644
--- a/math/scilab/buildlink3.mk
+++ b/math/scilab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 22:39:29 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	scilab
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nscilab}
 BUILDLINK_PACKAGES+=	scilab
+BUILDLINK_ORDER+=	scilab
 
 .if !empty(SCILAB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.scilab+=	scilab>=3.0
diff --git a/math/slatec/buildlink3.mk b/math/slatec/buildlink3.mk
index 1cb31a185a2..d499f1c647b 100644
--- a/math/slatec/buildlink3.mk
+++ b/math/slatec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SLATEC_BUILDLINK3_MK:=	${SLATEC_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	slatec
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nslatec}
 BUILDLINK_PACKAGES+=	slatec
+BUILDLINK_ORDER+=	slatec
 
 .if !empty(SLATEC_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.slatec+=	slatec>=4.1nb1
diff --git a/math/superlu/buildlink3.mk b/math/superlu/buildlink3.mk
index ce10d2563a9..0a81c6217aa 100644
--- a/math/superlu/buildlink3.mk
+++ b/math/superlu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SUPERLU_BUILDLINK3_MK:=	${SUPERLU_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	superlu
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsuperlu}
 BUILDLINK_PACKAGES+=	superlu
+BUILDLINK_ORDER+=	superlu
 
 .if !empty(SUPERLU_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.superlu+=	superlu>=2.0nb2
diff --git a/math/tasp-vsipl/buildlink3.mk b/math/tasp-vsipl/buildlink3.mk
index e454237726f..490ea55f2d6 100644
--- a/math/tasp-vsipl/buildlink3.mk
+++ b/math/tasp-vsipl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TASP_VSIPL_BUILDLINK3_MK:=	${TASP_VSIPL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	tasp-vsipl
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntasp-vsipl}
 BUILDLINK_PACKAGES+=	tasp-vsipl
+BUILDLINK_ORDER+=	tasp-vsipl
 
 .if !empty(TASP_VSIPL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.tasp-vsipl+=	tasp-vsipl>=20030710
diff --git a/math/udunits/buildlink3.mk b/math/udunits/buildlink3.mk
index 0679a13d20b..2f7e84fd788 100644
--- a/math/udunits/buildlink3.mk
+++ b/math/udunits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UDUNITS_BUILDLINK3_MK:=	${UDUNITS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	udunits
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nudunits}
 BUILDLINK_PACKAGES+=	udunits
+BUILDLINK_ORDER+=	udunits
 
 .if !empty(UDUNITS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.udunits+=	udunits>=1.11.7
diff --git a/math/yorick/buildlink3.mk b/math/yorick/buildlink3.mk
index 7d124aed4f3..3a8f99b7b5b 100644
--- a/math/yorick/buildlink3.mk
+++ b/math/yorick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:26 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 22:39:29 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 YORICK_BUILDLINK3_MK:=	${YORICK_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	yorick
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nyorick}
 BUILDLINK_PACKAGES+=	yorick
+BUILDLINK_ORDER+=	yorick
 
 .if !empty(YORICK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.yorick+=	yorick>=1.5.12