From 53aa38c7365a89400c454c28ff64b7746abd5629 Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 15 Apr 2002 12:13:38 +0000 Subject: update to 2.2.1 Changes: -Added new builtin function bool() and new builtin constants True and False to ease backporting of code developed for Python 2.3. In 2.2, bool() returns 1 or 0, True == 1, and False == 0. -C API: A type can now inherit its metatype from its base type. -Fixes --- lang/python22/Makefile | 8 ++++---- lang/python22/PLIST | 6 +++++- lang/python22/distinfo | 10 ++++----- lang/python22/patches/patch-aa | 22 ++++++++++---------- lang/python22/patches/patch-ac | 16 --------------- lang/python22/patches/patch-ad | 46 ------------------------------------------ 6 files changed, 24 insertions(+), 84 deletions(-) delete mode 100644 lang/python22/patches/patch-ac delete mode 100644 lang/python22/patches/patch-ad (limited to 'lang/python22') diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 77023e04b23..c96bb68b4f5 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2002/04/09 04:33:18 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/04/15 12:13:38 drochner Exp $ # -DISTNAME= Python-2.2 -PKGNAME= python22-2.2 +DISTNAME= Python-2.2.1 +PKGNAME= python22-2.2.1 CATEGORIES= lang -MASTER_SITES= ftp://ftp.python.org/pub/python/2.2/ +MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.1/ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org diff --git a/lang/python22/PLIST b/lang/python22/PLIST index a0714fa3d2e..bfa995f70e2 100644 --- a/lang/python22/PLIST +++ b/lang/python22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/28 09:12:07 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/04/15 12:13:38 drochner Exp $ bin/pydoc2.2 bin/python2.2 include/python2.2/Python.h @@ -1145,6 +1145,7 @@ lib/python2.2/test/data/msg_19.txt lib/python2.2/test/data/msg_20.txt lib/python2.2/test/data/msg_21.txt lib/python2.2/test/data/msg_22.txt +lib/python2.2/test/data/msg_23.txt lib/python2.2/test/double_const.py lib/python2.2/test/double_const.pyc lib/python2.2/test/double_const.pyo @@ -1572,6 +1573,9 @@ lib/python2.2/test/test_mmap.pyo lib/python2.2/test/test_mutants.py lib/python2.2/test/test_mutants.pyc lib/python2.2/test/test_mutants.pyo +lib/python2.2/test/test_netrc.py +lib/python2.2/test/test_netrc.pyc +lib/python2.2/test/test_netrc.pyo lib/python2.2/test/test_new.py lib/python2.2/test/test_new.pyc lib/python2.2/test/test_new.pyo diff --git a/lang/python22/distinfo b/lang/python22/distinfo index adeea7c43b5..b7764488ab4 100644 --- a/lang/python22/distinfo +++ b/lang/python22/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/04/09 04:33:19 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/04/15 12:13:38 drochner Exp $ -SHA1 (Python-2.2.tgz) = ff78e4ab501bdb089a81884187ce2f4b44091ba2 -Size (Python-2.2.tgz) = 6542443 bytes -SHA1 (patch-aa) = d6524d37f2e06075aa78c3675c415bc8ac15d3ab +SHA1 (Python-2.2.1.tgz) = 12905ad4bc4f3006366a495275259661db7b8604 +Size (Python-2.2.1.tgz) = 6535104 bytes +SHA1 (patch-aa) = 7f23b2b5b6f237ef2904f132dc634a8e8b5c540b SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09 -SHA1 (patch-ac) = 82e5f3505321df21adde4a9a1bf752d157fb61cd -SHA1 (patch-ad) = 7b532616983b152b0c313cc4a1e372483c8b0eb9 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e diff --git a/lang/python22/patches/patch-aa b/lang/python22/patches/patch-aa index c83e0ba56a8..25fa6519c6b 100644 --- a/lang/python22/patches/patch-aa +++ b/lang/python22/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2002/04/15 12:13:38 drochner Exp $ ---- setup.py.orig Mon Dec 17 12:24:43 2001 -+++ setup.py -@@ -192,11 +192,15 @@ +--- setup.py.orig Tue Mar 26 14:43:04 2002 ++++ setup.py Mon Apr 15 11:13:53 2002 +@@ -197,11 +197,15 @@ return platform def detect_modules(self): @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ try: have_unicode = unicode -@@ -256,7 +260,7 @@ +@@ -261,7 +265,7 @@ if have_unicode: exts.append( Extension('unicodedata', ['unicodedata.c']) ) # access to ISO C locale support @@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ # Modules with some UNIX dependencies -- on by default: # (If you have a really backward UNIX, select and socket may not be -@@ -314,13 +318,13 @@ +@@ -319,13 +323,13 @@ # These represent audio samples or images as strings: # Disabled on 64-bit platforms @@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ # readline if self.compiler.find_library_file(lib_dirs, 'readline'): -@@ -347,14 +351,10 @@ +@@ -352,14 +356,10 @@ # socket(2) # Detect SSL support for the socket module ssl_incs = find_file('openssl/ssl.h', inc_dirs, @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ if (ssl_incs is not None and ssl_libs is not None): -@@ -470,8 +470,8 @@ +@@ -475,8 +475,8 @@ if (self.compiler.find_library_file(lib_dirs, 'ncurses')): curses_libs = ['ncurses'] @@ -77,8 +77,8 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ +# libraries = curses_libs) ) elif (self.compiler.find_library_file(lib_dirs, 'curses') and platform != 'darwin'): - # OSX has an old Berkeley curses, not good enough for -@@ -481,8 +481,8 @@ + # OSX has an old Berkeley curses, not good enough for +@@ -486,8 +486,8 @@ else: curses_libs = ['curses', 'termcap'] @@ -89,7 +89,7 @@ $NetBSD: patch-aa,v 1.4 2002/04/09 04:33:20 jlam Exp $ # If the curses module is enabled, check for the panel module if (module_enabled(exts, '_curses') and -@@ -784,7 +784,7 @@ +@@ -793,7 +793,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python22/patches/patch-ac b/lang/python22/patches/patch-ac deleted file mode 100644 index 645fe7b9ef1..00000000000 --- a/lang/python22/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/03/22 15:20:24 drochner Exp $ - ---- Objects/floatobject.c.orig Tue Dec 11 21:31:34 2001 -+++ Objects/floatobject.c Fri Mar 22 15:21:16 2002 -@@ -577,9 +577,9 @@ - PyFPE_START_PROTECT("pow", return NULL) - ix = pow(iv, iw); - PyFPE_END_PROTECT(ix) -- Py_SET_ERANGE_IF_OVERFLOW(ix); -+ Py_ADJUST_ERANGE1(ix); - if (errno != 0) { -- /* XXX could it be another type of error? */ -+ assert(errno == ERANGE); - PyErr_SetFromErrno(PyExc_OverflowError); - return NULL; - } diff --git a/lang/python22/patches/patch-ad b/lang/python22/patches/patch-ad deleted file mode 100644 index 163699feca2..00000000000 --- a/lang/python22/patches/patch-ad +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/03/22 15:20:24 drochner Exp $ - ---- Include/pyport.h.orig Sat Oct 27 23:16:16 2001 -+++ Include/pyport.h Fri Mar 22 15:17:29 2002 -@@ -285,6 +285,41 @@ - errno = ERANGE; \ - } while(0) - -+/* Py_ADJUST_ERANGE1(x) -+ * Py_ADJUST_ERANGE2(x, y) -+ * Set errno to 0 before calling a libm function, and invoke one of these -+ * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful -+ * for functions returning complex results). This makes two kinds of -+ * adjustments to errno: (A) If it looks like the platform libm set -+ * errno=ERANGE due to underflow, clear errno. (B) If it looks like the -+ * platform libm overflowed but didn't set errno, force errno to ERANGE. In -+ * effect, we're trying to force a useful implementation of C89 errno -+ * behavior. -+ * Caution: -+ * This isn't reliable. See Py_OVERFLOWED comments. -+ * X and Y may be evaluated more than once. -+ */ -+#define Py_ADJUST_ERANGE1(X) \ -+ do { \ -+ if (errno == 0) { \ -+ if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ -+ errno = ERANGE; \ -+ } \ -+ else if (errno == ERANGE && (X) == 0.0) \ -+ errno = 0; \ -+ } while(0) -+ -+#define Py_ADJUST_ERANGE2(X, Y) \ -+ do { \ -+ if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL || \ -+ (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) { \ -+ if (errno == 0) \ -+ errno = ERANGE; \ -+ } \ -+ else if (errno == ERANGE) \ -+ errno = 0; \ -+ } while(0) -+ - /************************************************************************** - Prototypes that are missing from the standard include files on some systems - (and possibly only some versions of such systems.) -- cgit v1.2.3