summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/python20/Makefile4
-rw-r--r--lang/python20/distinfo3
-rw-r--r--lang/python20/patches/patch-ai13
-rw-r--r--lang/python21/Makefile4
-rw-r--r--lang/python21/distinfo3
-rw-r--r--lang/python21/patches/patch-ak13
-rw-r--r--lang/python22/Makefile4
-rw-r--r--lang/python22/distinfo3
-rw-r--r--lang/python22/patches/patch-aj13
-rw-r--r--lang/python23-nth/Makefile4
-rw-r--r--lang/python23/Makefile4
-rw-r--r--lang/python23/distinfo3
-rw-r--r--lang/python23/patches/patch-ai13
-rw-r--r--lang/python24/Makefile3
-rw-r--r--lang/python24/distinfo3
-rw-r--r--lang/python24/patches/patch-ao13
16 files changed, 87 insertions, 16 deletions
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 8f5750678a4..57376bea551 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2005/11/16 19:18:58 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/13 02:26:54 joerg Exp $
#
DISTNAME= Python-2.0.1
PKGNAME= python20-2.0.1
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.0.1/
EXTRACT_SUFX= .tgz
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index cf241236b0a..3574fc0c224 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/12/06 18:26:49 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/04/13 02:26:54 joerg Exp $
SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f
@@ -11,6 +11,7 @@ SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4
SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
SHA1 (patch-ah) = c48beff9fe4d4f61e21c0952f4a7547cae28c0bb
+SHA1 (patch-ai) = 87b430f97ec258d423f7841bf369970223323a6b
SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e
SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff --git a/lang/python20/patches/patch-ai b/lang/python20/patches/patch-ai
new file mode 100644
index 00000000000..2da7cd8dd64
--- /dev/null
+++ b/lang/python20/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/04/13 02:26:54 joerg Exp $
+
+--- Lib/distutils/util.py.orig 2000-10-14 04:07:39.000000000 +0000
++++ Lib/distutils/util.py
+@@ -54,6 +54,8 @@ def get_platform ():
+ # fall through to standard osname-release-machine representation
+ elif osname[:4] == "irix": # could be "irix64"!
+ return "%s-%s" % (osname, release)
++ elif osname[:9] == "dragonfly":
++ release = string.split(release, "-")[0]
+
+ return "%s-%s-%s" % (osname, release, machine)
+
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 85c38e269bf..78585b0b54e 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2006/04/10 08:37:26 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/13 02:26:54 joerg Exp $
#
DISTNAME= Python-2.1.3
PKGNAME= python21-2.1.3
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/
EXTRACT_SUFX= .tgz
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 2c04fe6a59a..9d8ce3d1491 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2005/11/16 19:18:58 joerg Exp $
+$NetBSD: distinfo,v 1.24 2006/04/13 02:26:54 joerg Exp $
SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
RMD160 (Python-2.1.3.tgz) = d7216480cf884507d97bf7932767871977fc1ccc
@@ -12,6 +12,7 @@ SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
+SHA1 (patch-ak) = 3c74315271e4eabf19eec80b213f5632ec9d6f02
SHA1 (patch-bb) = b672598198b9a2ee030f811345313ee01ba23d65
SHA1 (patch-bc) = 6566f6cc3394d597ea3d588459f5208f7439df0c
SHA1 (patch-bd) = 1fcff14864fbd52f350f63bec57e2952a4715ca4
diff --git a/lang/python21/patches/patch-ak b/lang/python21/patches/patch-ak
new file mode 100644
index 00000000000..d53600b5227
--- /dev/null
+++ b/lang/python21/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/04/13 02:26:54 joerg Exp $
+
+--- Lib/distutils/util.py.orig 2001-03-23 17:30:26.000000000 +0000
++++ Lib/distutils/util.py
+@@ -66,6 +66,8 @@ def get_platform ():
+ m = rel_re.match(release)
+ if m:
+ release = m.group()
++ elif osname[:9] == "dragonfly":
++ release = string.split(release, "-")[0]
+
+ return "%s-%s-%s" % (osname, release, machine)
+
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 05b8dc9a6d8..81523250d48 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/13 02:26:54 joerg Exp $
#
DISTNAME= Python-2.2.3
PKGNAME= python22-2.2.3
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/
EXTRACT_SUFX= .tgz
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index a2e9f89fd74..95cce391c27 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/01/09 21:22:57 joerg Exp $
+$NetBSD: distinfo,v 1.20 2006/04/13 02:26:54 joerg Exp $
SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
RMD160 (Python-2.2.3.tgz) = 3590f813582d65194b467f4ab450e360e35eb40e
@@ -11,6 +11,7 @@ SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
SHA1 (patch-ag) = 08dad489e37199127f7f5cb0b4cc30f40a29fdda
SHA1 (patch-ah) = 22eca366910a007feeb6e5870eadb9f5024783b1
SHA1 (patch-ai) = 02f530a08fd8b61a696ae43ddabd7e86e4af7727
+SHA1 (patch-aj) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
SHA1 (patch-al) = 9e1a69f0a1625054acc6ceed7242ac4d260c0948
SHA1 (patch-an) = 8e5b93bc65bb6d271e8e111949f715f7234f4371
SHA1 (patch-bb) = 59c5bdef790918e6653fce0cf8189f5c01e9d4d5
diff --git a/lang/python22/patches/patch-aj b/lang/python22/patches/patch-aj
new file mode 100644
index 00000000000..0569ca4cc09
--- /dev/null
+++ b/lang/python22/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2006/04/13 02:26:54 joerg Exp $
+
+--- Lib/distutils/util.py.orig 2004-07-18 06:16:08.000000000 +0000
++++ Lib/distutils/util.py
+@@ -66,6 +66,8 @@ def get_platform ():
+ m = rel_re.match(release)
+ if m:
+ release = m.group()
++ elif osname[:9] == "dragonfly":
++ release = string.split(release, "-")[0]
+
+ return "%s-%s-%s" % (osname, release, machine)
+
diff --git a/lang/python23-nth/Makefile b/lang/python23-nth/Makefile
index 3322c2f9539..a52c5753aaa 100644
--- a/lang/python23-nth/Makefile
+++ b/lang/python23-nth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/13 02:26:54 joerg Exp $
#
PKGNAME= python23-nth-2.3.5
-PKGREVISION= 4
+PKGREVISION= 5
CONFLICTS+= python-[0-9]*
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 20912c3c6a0..0e98d7ecaf7 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/13 02:26:54 joerg Exp $
#
PKGNAME= python23-2.3.5
-PKGREVISION= 6
+PKGREVISION= 7
CONFLICTS+= python-[0-9]*
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 315e5310a0e..504037f149f 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2005/11/16 19:18:59 joerg Exp $
+$NetBSD: distinfo,v 1.37 2006/04/13 02:26:54 joerg Exp $
SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -10,6 +10,7 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
SHA1 (patch-af) = f161ce64bb1b318926bd9c534fe7050d7ddb636f
SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
+SHA1 (patch-ai) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
SHA1 (patch-al) = 98818fe37c3bac94bee91fe4f3dd8633172bec49
SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
SHA1 (patch-bb) = 4bc4b8d73ed273bb753db5d6d971d446b730e165
diff --git a/lang/python23/patches/patch-ai b/lang/python23/patches/patch-ai
new file mode 100644
index 00000000000..2a1ae918727
--- /dev/null
+++ b/lang/python23/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.5 2006/04/13 02:26:54 joerg Exp $
+
+--- Lib/distutils/util.py.orig 2004-07-18 06:16:08.000000000 +0000
++++ Lib/distutils/util.py
+@@ -66,6 +66,8 @@ def get_platform ():
+ m = rel_re.match(release)
+ if m:
+ release = m.group()
++ elif osname[:9] == "dragonfly":
++ release = string.split(release, "-")[0]
+
+ return "%s-%s-%s" % (osname, release, machine)
+
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 947626beecf..1d6d58f6064 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/04/12 20:21:48 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/13 02:26:54 joerg Exp $
#
DISTNAME= Python-2.4.3
PKGNAME= python24-2.4.3
+PKGREVISION= 1
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.4.3/ \
http://www.python.org/ftp/python/2.4.3/
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 141eaa160c1..aeb739a0646 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/04/12 20:21:48 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/04/13 02:26:54 joerg Exp $
SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384
RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
SHA1 (patch-al) = 3dccd19d56685ab447c3629c4c360881dcca4c3d
SHA1 (patch-am) = a8be9e5d3558c27e38d4323601335ad3bcde1f85
SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
+SHA1 (patch-ao) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
diff --git a/lang/python24/patches/patch-ao b/lang/python24/patches/patch-ao
new file mode 100644
index 00000000000..d8fb9624e8f
--- /dev/null
+++ b/lang/python24/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2006/04/13 02:26:54 joerg Exp $
+
+--- Lib/distutils/util.py.orig 2004-07-18 06:16:08.000000000 +0000
++++ Lib/distutils/util.py
+@@ -66,6 +66,8 @@ def get_platform ():
+ m = rel_re.match(release)
+ if m:
+ release = m.group()
++ elif osname[:9] == "dragonfly":
++ release = string.split(release, "-")[0]
+
+ return "%s-%s-%s" % (osname, release, machine)
+