Share distfile related information for each python variants with

srcdist.mk to make update simplicity.

7 files changed, 39 insertions, 51 deletions

diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk
index a2ad5f1c123..ee536ab98d9 100644
--- a/lang/python/srcdist.mk
+++ b/lang/python/srcdist.mk
@@ -1,38 +1,11 @@
-# $NetBSD: srcdist.mk,v 1.33 2010/09/04 15:31:29 tron Exp $
+# $NetBSD: srcdist.mk,v 1.34 2010/09/17 07:11:41 obache Exp $
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${_PYTHON_VERSION} == "26"
+.sinclude "${.CURDIR}/${PYPKGSRCDIR}/dist.mk"
 
-DISTNAME=	Python-2.6.6
-EXTRACT_SUFX=	.tar.bz2
-DISTINFO_FILE=	${.CURDIR}/../../lang/python26/distinfo
-PATCHDIR=	${.CURDIR}/../../lang/python26/patches
-PYSUBDIR=	Python-2.6.6
+PYSUBDIR=	${DISTNAME}
 WRKSRC=		${WRKDIR}/${PYSUBDIR}
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.6/
-
-.elif ${_PYTHON_VERSION} == "25"
-
-DISTNAME=	Python-2.5.5
-EXTRACT_SUFX=	.tar.bz2
-DISTINFO_FILE=	${.CURDIR}/../../lang/python25/distinfo
-PATCHDIR=	${.CURDIR}/../../lang/python25/patches
-PYSUBDIR=	Python-2.5.5
-WRKSRC=		${WRKDIR}/${PYSUBDIR}
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.5/
-
-.elif ${_PYTHON_VERSION} == "24"
-
-DISTNAME=	Python-2.4.5
-EXTRACT_SUFX=	.tar.bz2
-DISTINFO_FILE=	${.CURDIR}/../../lang/python24/distinfo
-PATCHDIR=	${.CURDIR}/../../lang/python24/patches
-PYSUBDIR=	Python-2.4.5
-WRKSRC=		${WRKDIR}/${PYSUBDIR}
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.4/
-
-.endif
 
 .if defined(PYDISTUTILSPKG)
 # This is used for standard modules shipped with Python but build as
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 0504ef87edd..1ec076e4375 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.52 2010/01/21 16:28:51 heinz Exp $
+# $NetBSD: Makefile,v 1.53 2010/09/17 07:11:41 obache Exp $
 
-DISTNAME=	Python-2.4.5
-PKGNAME=	python24-2.4.5
+.include "dist.mk"
+
+PKGNAME=	python24-${PY_DISTVERSION}
 PKGREVISION=	6
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/2.4.5/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.python.org/
@@ -14,8 +13,6 @@ LICENSE=	python-software-foundation
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
-
 CONFLICTS+=	python-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/lang/python24/dist.mk b/lang/python24/dist.mk
new file mode 100644
index 00000000000..4296afb26e6
--- /dev/null
+++ b/lang/python24/dist.mk
@@ -0,0 +1,8 @@
+# $NetBSD: dist.mk,v 1.1 2010/09/17 07:11:41 obache Exp $
+
+PY_DISTVERSION=	2.4.5
+DISTNAME=	Python-${PY_DISTVERSION}
+EXTRACT_SUFX=	.tar.bz2
+DISTINFO_FILE=	${.CURDIR}/../../lang/python24/distinfo
+PATCHDIR=	${.CURDIR}/../../lang/python24/patches
+MASTER_SITES=	http://www.python.org/ftp/python/${PY_DISTVERSION}/
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 02f572086af..0e3afeea8aa 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2010/09/02 11:27:55 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2010/09/17 07:11:41 obache Exp $
 
-DISTNAME=	Python-2.5.5
-PKGNAME=	python25-2.5.5
+.include "dist.mk"
+
+PKGNAME=	python25-${PY_DISTVERSION}
 PKGREVISION=	1
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/2.5.5/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.python.org/
@@ -14,8 +13,6 @@ LICENSE=	python-software-foundation
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
-
 CONFLICTS+=	python-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/lang/python25/dist.mk b/lang/python25/dist.mk
new file mode 100644
index 00000000000..b175c63e451
--- /dev/null
+++ b/lang/python25/dist.mk
@@ -0,0 +1,8 @@
+# $NetBSD: dist.mk,v 1.1 2010/09/17 07:11:41 obache Exp $
+
+PY_DISTVERSION=	2.5.5
+DISTNAME=	Python-${PY_DISTVERSION}
+EXTRACT_SUFX=	.tar.bz2
+DISTINFO_FILE=	${.CURDIR}/../../lang/python25/distinfo
+PATCHDIR=	${.CURDIR}/../../lang/python25/patches
+MASTER_SITES=	http://www.python.org/ftp/python/${PY_DISTVERSION}/
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index b68f3f2a8d0..939cbc20a15 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2010/09/16 11:09:50 obache Exp $
+# $NetBSD: Makefile,v 1.29 2010/09/17 07:11:42 obache Exp $
 
-DISTNAME=	Python-2.6.6
-PKGNAME=	${DISTNAME:S/Python/python26/}
+.include "dist.mk"
+
+PKGNAME=	python26-${PY_DISTVERSION}
 PKGREVISION=	2
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/${PKGVERSION_NOREV}/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python.org/
@@ -14,8 +13,6 @@ LICENSE=	python-software-foundation
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
-
 CONFLICTS+=	python-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/lang/python26/dist.mk b/lang/python26/dist.mk
new file mode 100644
index 00000000000..7f27d140e6a
--- /dev/null
+++ b/lang/python26/dist.mk
@@ -0,0 +1,8 @@
+# $NetBSD: dist.mk,v 1.1 2010/09/17 07:11:42 obache Exp $
+
+PY_DISTVERSION=	2.6.6
+DISTNAME=	Python-${PY_DISTVERSION}
+EXTRACT_SUFX=	.tar.bz2
+DISTINFO_FILE=	${.CURDIR}/../../lang/python26/distinfo
+PATCHDIR=	${.CURDIR}/../../lang/python26/patches
+MASTER_SITES=	http://www.python.org/ftp/python/${PY_DISTVERSION}/