Include pyversion.mk include the protected part of the buildlink3.mk

files, not over and over again.

4 files changed, 11 insertions, 10 deletions

diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index 9c143e7d4d8..48ee19f74d9 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NUMERIC_BUILDLINK3_MK:=	${PY_NUMERIC_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumeric
 
 .if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-[0-9]*
 BUILDLINK_ABI_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric>=23.7nb1
 BUILDLINK_PKGSRCDIR.pynumeric?=	../../math/py-Numeric
diff --git a/math/py-fpconst/buildlink3.mk b/math/py-fpconst/buildlink3.mk
index 4dfc3428968..0e63e393ba9 100644
--- a/math/py-fpconst/buildlink3.mk
+++ b/math/py-fpconst/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_FPCONST_BUILDLINK3_MK:=	${PY_FPCONST_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	py-fpconst
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-fpconst
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-fpconst
 
 .if !empty(PY_FPCONST_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-fpconst+=	${PYPKGPREFIX}-fpconst>=0.7.0
 BUILDLINK_ABI_DEPENDS.py-fpconst?=	${PYPKGPREFIX}-fpconst>=0.7.0nb1
 BUILDLINK_PKGSRCDIR.py-fpconst?=	../../math/py-fpconst
diff --git a/math/py-numarray/buildlink3.mk b/math/py-numarray/buildlink3.mk
index 1e2e25a8d12..f055cba912c 100644
--- a/math/py-numarray/buildlink3.mk
+++ b/math/py-numarray/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_NUMARRAY_BUILDLINK3_MK:=	${PY_NUMARRAY_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pynumarray
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pynumarray
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumarray
 
 .if !empty(PY_NUMARRAY_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pynumarray+=	${PYPKGPREFIX}-numarray>=1.1.1
 BUILDLINK_ABI_DEPENDS.pynumarray?=	${PYPKGPREFIX}-numarray>=1.3.3nb1
 BUILDLINK_PKGSRCDIR.pynumarray?=	../../math/py-numarray
diff --git a/math/py-numpy/buildlink3.mk b/math/py-numpy/buildlink3.mk
index 6c30e7945fb..a1757419913 100644
--- a/math/py-numpy/buildlink3.mk
+++ b/math/py-numpy/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/19 22:04:36 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NUMPY_BUILDLINK3_MK:=	${PY_NUMPY_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	pynumpy
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pynumpy
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pynumpy
 
 .if ${PY_NUMPY_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.0
 BUILDLINK_PKGSRCDIR.pynumpy?=	../../math/py-numpy
 .endif	# PY_NUMPY_BUILDLINK3_MK