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

files, not over and over again.

42 files changed, 113 insertions, 99 deletions

diff --git a/audio/py-mpd/buildlink3.mk b/audio/py-mpd/buildlink3.mk
index c503262c148..bf4fa38693a 100644
--- a/audio/py-mpd/buildlink3.mk
+++ b/audio/py-mpd/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/05 10:19:22 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:09 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MPD_BUILDLINK3_MK:=	${PY_MPD_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-mpd
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-mpd
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mpd
 
 .if ${PY_MPD_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-mpd+=	${PYPKGPREFIX}-mpd>=0.2.0
 BUILDLINK_PKGSRCDIR.py-mpd?=	../../audio/py-mpd
 .endif	# PY_MPD_BUILDLINK3_MK
diff --git a/audio/py-mutagen/buildlink3.mk b/audio/py-mutagen/buildlink3.mk
index f19f561c900..7ef36ed4fe4 100644
--- a/audio/py-mutagen/buildlink3.mk
+++ b/audio/py-mutagen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/15 03:03:47 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 17:30:09 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MUTAGEN_BUILDLINK3_MK:=	${PY_MUTAGEN_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mutagen
 
 .if ${PY_MUTAGEN_BUILDLINK3_MK} == "+"
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-mutagen+=	${PYPKGPREFIX}-mutagen>=1.9
 BUILDLINK_PKGSRCDIR.py-mutagen?=	../../audio/py-mutagen
 .endif	# PY_MUTAGEN_BUILDLINK3_MK
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index 21cac900efe..110603cc383 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/01/05 20:57:37 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 17:30:09 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYOGG_BUILDLINK3_MK:=	${PYOGG_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyogg
 
 .if !empty(PYOGG_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
 BUILDLINK_ABI_DEPENDS.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index e516f1c5805..4f2eac8d21e 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_ZODB_BUILDLINK3_MK:=	${PY_ZODB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyZODB
 
 .if !empty(PY_ZODB_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
 BUILDLINK_ABI_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
 BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index 2a3baa394eb..7ae58d71b96 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_LDAP_BUILDLINK3_MK:=	${PY_LDAP_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyldap
 
 .if !empty(PY_LDAP_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.2.0
 BUILDLINK_ABI_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.2.0
 BUILDLINK_PKGSRCDIR.pyldap?=	../../databases/py-ldap
diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk
index 2572b1f3ea3..fe83ca419d6 100644
--- a/databases/py-metakit/buildlink3.mk
+++ b/databases/py-metakit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_METAKIT_BUILDLINK3_MK:=	${PY_METAKIT_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymetakit
 
 .if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
 .include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-[0-9]*
 BUILDLINK_ABI_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
 BUILDLINK_PKGSRCDIR.pymetakit?=	../../databases/py-metakit
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
index 32a036c3e01..06d231d9ae9 100644
--- a/databases/py-psycopg/buildlink3.mk
+++ b/databases/py-psycopg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}psycopg
 
 .if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
 BUILDLINK_ABI_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
 BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
index c72353ee40b..c9ddab4b2a5 100644
--- a/devel/py-at-spi/buildlink3.mk
+++ b/devel/py-at-spi/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/31 19:52:35 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_AT_SPI_BUILDLINK3_MK:=	${PY_AT_SPI_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-at-spi
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-at-spi
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-at-spi
 
 .if ${PY_AT_SPI_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.20.1
 BUILDLINK_PKGSRCDIR.py-at-spi?=		../../devel/py-at-spi
 .endif	# PY_AT_SPI_BUILDLINK3_MK
diff --git a/devel/py-compizconfig/buildlink3.mk b/devel/py-compizconfig/buildlink3.mk
index cb3510ba462..fd1c74a24e7 100644
--- a/devel/py-compizconfig/buildlink3.mk
+++ b/devel/py-compizconfig/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/12 11:20:58 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_COMPIZCONFIG_BUILDLINK3_MK:=	${PY_COMPIZCONFIG_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-compizconfig
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-compizconfig
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-compizconfig
 
 .if !empty(PY_COMPIZCONFIG_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-compizconfig+=	${PYPKGPREFIX}-compizconfig>=0.6.0
 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-compizconfig?=	${PYPKGPREFIX}-compizconfig>=0.6.0
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-compizconfig?=	../../devel/py-compizconfig
diff --git a/devel/py-ctypes/buildlink3.mk b/devel/py-ctypes/buildlink3.mk
index dc0e7cee0a4..e712a04c784 100644
--- a/devel/py-ctypes/buildlink3.mk
+++ b/devel/py-ctypes/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/07/13 14:58:38 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_CTYPES_BUILDLINK3_MK:=	${PY_CTYPES_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-ctypes
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-ctypes
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-ctypes
 
 .if ${PY_CTYPES_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-ctypes+=	${PYPKGPREFIX}-ctypes>=1.0.0
 BUILDLINK_PKGSRCDIR.py-ctypes?=		../../devel/py-ctypes
 .endif	# PY_CTYPES_BUILDLINK3_MK
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
index d11764cb2de..66340934095 100644
--- a/devel/py-curses/buildlink3.mk
+++ b/devel/py-curses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_CURSES_BUILDLINK3_MK:=	${PY_CURSES_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycurses
 
 .if !empty(PY_CURSES_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses-[0-9]*
 BUILDLINK_ABI_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses>=0nb4
 BUILDLINK_PKGSRCDIR.pycurses?=	../../devel/py-curses
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
index d4b0bc897d1..372216860d8 100644
--- a/devel/py-cursespanel/buildlink3.mk
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_CURSESPANEL_BUILDLINK3_MK:=	${PY_CURSESPANEL_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pycursespanel
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pycursespanel
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycursespanel
 
 .if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
 BUILDLINK_ABI_DEPENDS.pycursespanel?=	${PYPKGPREFIX}-cursespanel>=0nb3
 BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 42beaf8e5f1..caf4eb10d9f 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/26 17:56:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 17:30:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GAME_BUILDLINK3_MK:=	${PY_GAME_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	${PYPKGPREFIX}-game
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-game
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${PYPKGPREFIX}-game
 
 .if !empty(PY_GAME_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.7.1nb4
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk
index 19391d7587e..d0dbf6e4aac 100644
--- a/devel/py-gobject/buildlink3.mk
+++ b/devel/py-gobject/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GOBJECT_BUILDLINK3_MK:=	${PY_GOBJECT_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pygobject
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pygobject
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pygobject
 
 .if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.10.1nb1
 BUILDLINK_PKGSRCDIR.pygobject?=	../../devel/py-gobject
 .endif	# PY_GOBJECT_BUILDLINK3_MK
diff --git a/devel/py-pexpect/buildlink3.mk b/devel/py-pexpect/buildlink3.mk
index 2068fd20a59..e28535bf082 100644
--- a/devel/py-pexpect/buildlink3.mk
+++ b/devel/py-pexpect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/11/19 13:44:22 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PEXPECT_BUILDLINK3_MK:=	${PY_PEXPECT_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-pexpect
 
 .if !empty(PY_PEXPECT_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-pexpect+=	${PYPKGPREFIX}-pexpect>=2.1
 BUILDLINK_ABI_DEPENDS.py-pexpect+=	${PYPKGPREFIX}-pexpect>=2.1
 BUILDLINK_PKGSRCDIR.py-pexpect?=		../../devel/py-pexpect
diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk
index 741000befc1..880f800af13 100644
--- a/graphics/py-cairo/buildlink3.mk
+++ b/graphics/py-cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_CAIRO_BUILDLINK3_MK:=	${PY_CAIRO_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pycairo
 
 .if !empty(PY_CAIRO_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pycairo+=	${PYPKGPREFIX}-cairo>=1.0.2
 BUILDLINK_ABI_DEPENDS.pycairo+=	${PYPKGPREFIX}-cairo>=1.0.2nb1
 BUILDLINK_PKGSRCDIR.pycairo?=	../../graphics/py-cairo
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index 8d3d158a310..b75bdf77033 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_IMAGING_BUILDLINK3_MK:=	${PY_IMAGING_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pyimaging
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pyimaging
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyimaging
 
 .if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_ABI_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging>=1.1.5nb1
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
diff --git a/graphics/py-matplotlib/buildlink3.mk b/graphics/py-matplotlib/buildlink3.mk
index 2c68b6d449d..eaae70abc68 100644
--- a/graphics/py-matplotlib/buildlink3.mk
+++ b/graphics/py-matplotlib/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MATPLOTLIB_BUILDLINK3_MK:=	${PY_MATPLOTLIB_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pymatplotlib
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pymatplotlib
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pymatplotlib
 
 .if !empty(PY_MATPLOTLIB_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pymatplotlib+=	${PYPKGPREFIX}-matplotlib>=0.87.2
 BUILDLINK_PKGSRCDIR.pymatplotlib?=	../../graphics/py-matplotlib
 .endif	# PY_MATPLOTLIB_BUILDLINK3_MK
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
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index e48e0bc040d..d327f8b0f3e 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pyorbit
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pyorbit
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyorbit
 
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
 BUILDLINK_ABI_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk
index 1e9b1941453..7f62bc01455 100644
--- a/net/py-soappy/buildlink3.mk
+++ b/net/py-soappy/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_SOAPPY_BUILDLINK3_MK:=	${PY_SOAPPY_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	py-SOAPpy
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-SOAPpy
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-SOAPpy
 
 .if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
 BUILDLINK_ABI_DEPENDS.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
 BUILDLINK_PKGSRCDIR.py-SOAPpy?=	../../net/py-soappy
diff --git a/security/py-amkCrypto/buildlink3.mk b/security/py-amkCrypto/buildlink3.mk
index 6c3d62d7ecf..5c2fe79a573 100644
--- a/security/py-amkCrypto/buildlink3.mk
+++ b/security/py-amkCrypto/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY24_AMKCRYPTO_BUILDLINK3_MK:=	${PY24_AMKCRYPTO_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-amkCrypto
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-amkCrypto
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-amkCrypto
 
 .if ${PY24_AMKCRYPTO_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-amkCrypto+=	${PYPKGPREFIX}-amkCrypto>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.py-amkCrypto?=	../../security/py-amkCrypto
 .endif	# PY24_AMKCRYPTO_BUILDLINK3_MK
diff --git a/security/py-gnupg/buildlink3.mk b/security/py-gnupg/buildlink3.mk
index 6f45e649b46..32fe4ac0d92 100644
--- a/security/py-gnupg/buildlink3.mk
+++ b/security/py-gnupg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/11/18 23:37:59 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNUPG_BUILDLINK3_MK:=	${PY_GNUPG_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gnupg
 
 .if !empty(PY_GNUPG_BUILDLINK3_MK:M+)
 .  include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-gnupg+=	${PYPKGPREFIX}-gnupg-[0-9]*
 BUILDLINK_ABI_DEPENDS.py-gnupg+=	${PYPKGPREFIX}-gnupg>=0.3.2
 BUILDLINK_PKGSRCDIR.py-gnupg?=		../../security/py-gnupg
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index c98c6c3814d..7269ca4eab6 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/08/23 09:45:58 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_DBUS_BUILDLINK3_MK:=		${PY_DBUS_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+=	py-dbus
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-dbus
 
 .if !empty(PY_DBUS_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
 BUILDLINK_ABI_DEPENDS.py-dbus?=	${PYPKGPREFIX}-dbus>=0.71
 BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
 .endif	# PY_DBUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk
index fc5e240e363..dfbe15058a4 100644
--- a/sysutils/py-notify/buildlink3.mk
+++ b/sysutils/py-notify/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/10 10:40:52 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_NOTIFY_BUILDLINK3_MK:=	${PY_NOTIFY_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-notify
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-notify
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-notify
 
 .if ${PY_NOTIFY_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.1.1
 BUILDLINK_PKGSRCDIR.py-notify?=	../../sysutils/py-notify
 .endif	# PY_NOTIFY_BUILDLINK3_MK
diff --git a/textproc/py-elementtree/buildlink3.mk b/textproc/py-elementtree/buildlink3.mk
index bed1b11c789..8cb0cf6dc34 100644
--- a/textproc/py-elementtree/buildlink3.mk
+++ b/textproc/py-elementtree/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/10 10:44:46 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_ELEMENTTREE_BUILDLINK3_MK:=	${PY_ELEMENTTREE_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-elementtree
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-elementtree
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-elementtree
 
 .if ${PY_ELEMENTTREE_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-elementtree+=	${PYPKGPREFIX}-elementtree>=1.2.6nb3
 BUILDLINK_PKGSRCDIR.py-elementtree=	../../textproc/py-elementtree
 .endif	# PY_ELEMENTTREE_BUILDLINK3_MK
diff --git a/textproc/py-libxml2/buildlink3.mk b/textproc/py-libxml2/buildlink3.mk
index e8f6929f75f..3b4b58c8abe 100644
--- a/textproc/py-libxml2/buildlink3.mk
+++ b/textproc/py-libxml2/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/22 17:20:45 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_LIBXML2_BUILDLINK3_MK:=	${PY_LIBXML2_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-libxml2
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-libxml2
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-libxml2
 
 .if ${PY_LIBXML2_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-libxml2+=	${PYPKGPREFIX}-libxml2>=2.6.27
 BUILDLINK_PKGSRCDIR.py-libxml2?=	../../textproc/py-libxml2
 .endif	# PY_LIBXML2_BUILDLINK3_MK
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index e59c577d920..3a8fe4c9b2d 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYXML_BUILDLINK3_MK:=	${PYXML_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pyxml
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	pyxml
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyxml
 
 .if !empty(PYXML_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
 BUILDLINK_ABI_DEPENDS.pyxml?=	${PYPKGPREFIX}-xml>=0.8.4nb2
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 938e4a57670..7c99741d404 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 17:30:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MXDATETIME_BUILDLINK3_MK:=	${PY_MXDATETIME_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	py-mxDateTime
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-mxDateTime
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-mxDateTime
 
 .if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
 BUILDLINK_ABI_DEPENDS.py-mxDateTime?=	${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
 BUILDLINK_PKGSRCDIR.py-mxDateTime?=	../../time/py-mxDateTime
diff --git a/www/py-gdata/buildlink3.mk b/www/py-gdata/buildlink3.mk
index c5acaf33001..f6cb7489d29 100644
--- a/www/py-gdata/buildlink3.mk
+++ b/www/py-gdata/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/16 20:06:11 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:13 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GDATA_BUILDLINK3_MK:=	${PY_GDATA_BUILDLINK3_MK}+
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	py-gdata
 .endif
@@ -14,6 +12,8 @@ BUILDLINK_PACKAGES+=	py-gdata
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-gdata
 
 .if ${PY_GDATA_BUILDLINK3_MK} == "+"
+.include "../../lang/python/pyversion.mk"
+
 BUILDLINK_API_DEPENDS.py-gdata+=	${PYPKGPREFIX}-gdata>=1.2.1
 BUILDLINK_PKGSRCDIR.py-gdata?=	../../www/py-gdata
 .endif	# PY_GDATA_BUILDLINK3_MK
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