[pkgsrc/trunk]: pkgsrc/lang Strip of anything after the version number in dis...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang Strip of anything after the version number in dis...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:20:53 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/99259c4a6b67
branches:  trunk
changeset: 511343:99259c4a6b67
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 13 02:26:54 2006 +0000

description:
Strip of anything after the version number in distutils.util.get_platform
on DragonFly. Since that version is used e.g. as part of the file name
for python eggs, it makes handling easier to match normal pkgsrc
platform policy. Bump revisions of all Python packages.

diffstat:

 lang/python20/Makefile         |   4 ++--
 lang/python20/distinfo         |   3 ++-
 lang/python20/patches/patch-ai |  13 +++++++++++++
 lang/python21/Makefile         |   4 ++--
 lang/python21/distinfo         |   3 ++-
 lang/python21/patches/patch-ak |  13 +++++++++++++
 lang/python22/Makefile         |   4 ++--
 lang/python22/distinfo         |   3 ++-
 lang/python22/patches/patch-aj |  13 +++++++++++++
 lang/python23-nth/Makefile     |   4 ++--
 lang/python23/Makefile         |   4 ++--
 lang/python23/distinfo         |   3 ++-
 lang/python23/patches/patch-ai |  13 +++++++++++++
 lang/python24/Makefile         |   3 ++-
 lang/python24/distinfo         |   3 ++-
 lang/python24/patches/patch-ao |  13 +++++++++++++
 16 files changed, 87 insertions(+), 16 deletions(-)

diffs (254 lines):

diff -r 8bbe09f13c02 -r 99259c4a6b67 lang/python20/Makefile
--- a/lang/python20/Makefile    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python20/Makefile    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python20/distinfo
--- a/lang/python20/distinfo    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python20/distinfo    Thu Apr 13 02:26:54 2006 +0000
@@ -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-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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python20/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python20/patches/patch-ai    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python21/Makefile
--- a/lang/python21/Makefile    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python21/Makefile    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python21/distinfo
--- a/lang/python21/distinfo    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python21/distinfo    Thu Apr 13 02:26:54 2006 +0000
@@ -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-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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python21/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python21/patches/patch-ak    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python22/Makefile
--- a/lang/python22/Makefile    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python22/Makefile    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python22/distinfo
--- a/lang/python22/distinfo    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python22/distinfo    Thu Apr 13 02:26:54 2006 +0000
@@ -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-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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python22/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python22/patches/patch-aj    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python23-nth/Makefile
--- a/lang/python23-nth/Makefile        Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python23-nth/Makefile        Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python23/Makefile
--- a/lang/python23/Makefile    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python23/Makefile    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python23/distinfo
--- a/lang/python23/distinfo    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python23/distinfo    Thu Apr 13 02:26:54 2006 +0000
@@ -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-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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python23/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python23/patches/patch-ai    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python24/Makefile
--- a/lang/python24/Makefile    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python24/Makefile    Thu Apr 13 02:26:54 2006 +0000
@@ -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 -r 8bbe09f13c02 -r 99259c4a6b67 lang/python24/distinfo
--- a/lang/python24/distinfo    Thu Apr 13 02:11:05 2006 +0000
+++ b/lang/python24/distinfo    Thu Apr 13 02:26:54 2006 +0000
@@ -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-al) = 3dccd19d56685ab447c3629c4c360881dcca4c3d
 SHA1 (patch-am) = a8be9e5d3558c27e38d4323601335ad3bcde1f85
 SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
+SHA1 (patch-ao) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
diff -r 8bbe09f13c02 -r 99259c4a6b67 lang/python24/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python24/patches/patch-ao    Thu Apr 13 02:26:54 2006 +0000
@@ -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)
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Switch to use libtunepimp. B...
Next by Date: [pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Use libtunepimp instead of t...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Switch to use libtunepimp. B...
Next by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Use libtunepimp instead of t...
Indexes:
Home | Main Index | Thread Index | Old Index