From 572cec3939d3a28810a3297ec5ad4a5d7abb3a7e Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 20 Mar 2009 17:30:09 +0000 Subject: Include pyversion.mk include the protected part of the buildlink3.mk files, not over and over again. --- x11/py-Pmw/buildlink3.mk | 6 +++--- x11/py-Tk/buildlink3.mk | 6 +++--- x11/py-Xlib/buildlink3.mk | 6 +++--- x11/py-gnome2-extras/buildlink3.mk | 3 ++- x11/py-qt3-base/buildlink3.mk | 6 +++--- x11/py-qt3-modules/buildlink3.mk | 3 ++- x11/py-qt4/buildlink3.mk | 6 +++--- x11/py-sip/buildlink3.mk | 6 +++--- x11/py-wxWidgets/buildlink3.mk | 6 +++--- 9 files changed, 25 insertions(+), 23 deletions(-) (limited to 'x11') diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk index bd2d9231fca..abd918e22e1 100644 --- a/x11/py-Pmw/buildlink3.mk +++ b/x11/py-Pmw/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_PMW_BUILDLINK3_MK:= ${PY_PMW_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pypmw .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= pypmw BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pypmw .if !empty(PY_PMW_BUILDLINK3_MK:M+) +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.pypmw+= ${PYPKGPREFIX}-Pmw-[0-9]* BUILDLINK_ABI_DEPENDS.pypmw?= ${PYPKGPREFIX}-Pmw>=1.2nb1 BUILDLINK_PKGSRCDIR.pypmw?= ../../x11/py-Pmw diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk index c907a37f686..715edde4676 100644 --- a/x11/py-Tk/buildlink3.mk +++ b/x11/py-Tk/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.7 2007/07/13 10:42:44 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYTK_BUILDLINK3_MK:= ${PYTK_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pytk .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= pytk BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pytk .if !empty(PYTK_BUILDLINK3_MK:M+) +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.pytk+= ${PYPKGPREFIX}-Tk-[0-9]* BUILDLINK_ABI_DEPENDS.pytk?= ${PYPKGPREFIX}-Tk>=0nb4 BUILDLINK_PKGSRCDIR.pytk?= ../../x11/py-Tk diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk index 2643ea39f99..a3d422c5b6f 100644 --- a/x11/py-Xlib/buildlink3.mk +++ b/x11/py-Xlib/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_XLIB_BUILDLINK3_MK:= ${PY_XLIB_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= py-Xlib .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= py-Xlib BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-Xlib .if !empty(PY_XLIB_BUILDLINK3_MK:M+) +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.py-Xlib+= ${PYPKGPREFIX}-Xlib>=0.12 BUILDLINK_ABI_DEPENDS.py-Xlib?= ${PYPKGPREFIX}-Xlib>=0.12nb1 BUILDLINK_PKGSRCDIR.py-Xlib?= ../../x11/py-Xlib diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk index 9b35638816f..e63c487b105 100644 --- a/x11/py-gnome2-extras/buildlink3.mk +++ b/x11/py-gnome2-extras/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYGNOME2EX_BUILDLINK3_MK:= ${PYGNOME2EX_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygnome2ex .if ${PYGNOME2EX_BUILDLINK3_MK} == "+" .include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3 BUILDLINK_ABI_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb7 BUILDLINK_PKGSRCDIR.pygnome2ex?= ../../x11/py-gnome2-extras diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk index 5d2d04b0d3c..93ce13793bc 100644 --- a/x11/py-qt3-base/buildlink3.mk +++ b/x11/py-qt3-base/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/10/08 14:23:24 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYQT3_BASE_BUILDLINK3_MK:= ${PYQT3_BASE_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pyqt3-base .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= pyqt3-base BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-base .if !empty(PYQT3_BASE_BUILDLINK3_MK:M+) +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11 BUILDLINK_ABI_DEPENDS.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.15.1nb3 BUILDLINK_PKGSRCDIR.pyqt3-base?= ../../x11/py-qt3-base diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk index 0f7be138420..51e6ba2275f 100644 --- a/x11/py-qt3-modules/buildlink3.mk +++ b/x11/py-qt3-modules/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/09/20 07:59:11 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYQT3_MOD_BUILDLINK3_MK:= ${PYQT3_MOD_BUILDLINK3_MK}+ @@ -13,6 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-mod .if !empty(PYQT3_MOD_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.11 BUILDLINK_ABI_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.15.1nb3 BUILDLINK_PKGSRCDIR.pyqt3-mod?= ../../x11/py-qt3-modules diff --git a/x11/py-qt4/buildlink3.mk b/x11/py-qt4/buildlink3.mk index 794c67fd49c..953eee04824 100644 --- a/x11/py-qt4/buildlink3.mk +++ b/x11/py-qt4/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.1 2008/12/14 16:19:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_QT4_BUILDLINK3_MK:= ${PY_QT4_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= py-qt4 .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= py-qt4 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-qt4 .if ${PY_QT4_BUILDLINK3_MK} == "+" +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.4.4 BUILDLINK_PKGSRCDIR.py-qt4?= ../../x11/py-qt4 .endif # PY_QT4_BUILDLINK3_MK diff --git a/x11/py-sip/buildlink3.mk b/x11/py-sip/buildlink3.mk index 0e0cd4f383b..665f6ad8420 100644 --- a/x11/py-sip/buildlink3.mk +++ b/x11/py-sip/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/08 14:10:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_SIP_BUILDLINK3_MK:= ${PY_SIP_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= py-sip .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= py-sip BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-sip .if ${PY_SIP_BUILDLINK3_MK} == "+" +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.7.7 BUILDLINK_PKGSRCDIR.py-sip?= ../../x11/py-sip .endif # PY_SIP_BUILDLINK3_MK diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk index f61b6413f38..968d52de47a 100644 --- a/x11/py-wxWidgets/buildlink3.mk +++ b/x11/py-wxWidgets/buildlink3.mk @@ -1,10 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/09/22 20:21:04 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:14 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_WXWIDGETS_BUILDLINK3_MK:= ${PY_WXWIDGETS_BUILDLINK3_MK}+ -.include "../../lang/python/pyversion.mk" - .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= ${PYPKGPREFIX}-wxWidgets .endif @@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-wxWidgets BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-wxWidgets .if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+) +.include "../../lang/python/pyversion.mk" + BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb4 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets -- cgit v1.2.3