From 70f395a1f5269737a0ab3aad891367c88bba729b Mon Sep 17 00:00:00 2001
From: Thomas Gellekum <tg@FreeBSD.org>
Date: Fri, 12 Apr 2002 10:33:42 +0000
Subject: Upgrade to Python-2.2.
PR: 36977
Submitted by: Hye-Shik Chang <perky@fallin.lv>
---
lang/python/Makefile | 3 +-
lang/python/distinfo | 2 +-
lang/python/files/patch-PyObject_DelItemString | 56 --------------------------
lang/python/pkg-plist | 9 ++---
4 files changed, 6 insertions(+), 64 deletions(-)
delete mode 100644 lang/python/files/patch-PyObject_DelItemString
(limited to 'lang/python')
diff --git a/lang/python/Makefile b/lang/python/Makefile
index a854209d72d8..82dcf8db72d2 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python/distinfo b/lang/python/distinfo
index 79f87b769e7c..efd74537ff1d 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0
+MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
diff --git a/lang/python/files/patch-PyObject_DelItemString b/lang/python/files/patch-PyObject_DelItemString
deleted file mode 100644
index 4f81f9e521b8..000000000000
--- a/lang/python/files/patch-PyObject_DelItemString
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: Include/abstract.h
-===================================================================
-RCS file: /home/python/cvs/python/dist/src/Include/abstract.h,v
-retrieving revision 2.42
-retrieving revision 2.43
-diff -u -r2.42 -r2.43
---- Include/abstract.h 28 Nov 2001 16:20:07 -0000 2.42
-+++ Include/abstract.h 5 Jan 2002 10:50:30 -0000 2.43
-@@ -445,6 +445,14 @@
- statement: o[key]=v.
- */
-
-+ DL_IMPORT(int) PyObject_DelItemString(PyObject *o, char *key);
-+
-+ /*
-+ Remove the mapping for object, key, from the object *o.
-+ Returns -1 on failure. This is equivalent to
-+ the Python statement: del o[key].
-+ */
-+
- DL_IMPORT(int) PyObject_DelItem(PyObject *o, PyObject *key);
-
- /*
-Index: Objects/abstract.c
-===================================================================
-RCS file: /home/python/cvs/python/dist/src/Objects/abstract.c,v
-retrieving revision 2.93
-retrieving revision 2.94
-diff -u -r2.93 -r2.94
---- Objects/abstract.c 24 Nov 2001 18:24:47 -0000 2.93
-+++ Objects/abstract.c 5 Jan 2002 10:50:30 -0000 2.94
-@@ -174,6 +174,24 @@
- return -1;
- }
-
-+int
-+PyObject_DelItemString(PyObject *o, char *key)
-+{
-+ PyObject *okey;
-+ int ret;
-+
-+ if (o == NULL || key == NULL) {
-+ null_error();
-+ return -1;
-+ }
-+ okey = PyString_FromString(key);
-+ if (okey == NULL)
-+ return -1;
-+ ret = PyObject_DelItem(o, okey);
-+ Py_DECREF(okey);
-+ return ret;
-+}
-+
- int PyObject_AsCharBuffer(PyObject *obj,
- const char **buffer,
- int *buffer_len)
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 06c1168cbf7a..2340b7709813 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -1400,6 +1400,7 @@ lib/%%PYTHON_VERSION%%/test/data/msg_19.txt
lib/%%PYTHON_VERSION%%/test/data/msg_20.txt
lib/%%PYTHON_VERSION%%/test/data/msg_21.txt
lib/%%PYTHON_VERSION%%/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/test/data/msg_23.txt
lib/%%PYTHON_VERSION%%/test/double_const.py
lib/%%PYTHON_VERSION%%/test/double_const.pyc
lib/%%PYTHON_VERSION%%/test/double_const.pyo
@@ -1827,6 +1828,9 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
+lib/%%PYTHON_VERSION%%/test/test_netrc.py
+lib/%%PYTHON_VERSION%%/test/test_netrc.pyc
+lib/%%PYTHON_VERSION%%/test/test_netrc.pyo
lib/%%PYTHON_VERSION%%/test/test_new.py
lib/%%PYTHON_VERSION%%/test/test_new.pyc
lib/%%PYTHON_VERSION%%/test/test_new.pyo
@@ -2232,10 +2236,6 @@ share/emacs/site-lisp/python-mode.el
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/demo.c
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/importexc.c
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/loop.c
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/extend/README
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/extend/make_clean
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/extend/make_shared
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/extend/make_static
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/imputil/importers.py
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/md5test/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/md5test/foo
@@ -2560,7 +2560,6 @@ share/emacs/site-lisp/python-mode.el
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/metaclasses
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/md5test
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/imputil
-%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/extend
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/embed
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/curses
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/comparisons
--
cgit v1.2.3