update Python22 to 2.2.3

This is a bugfix release.
Also, use the LINK_ALL_LIBGCC_HACK just introduced to link the
interpreter against libgcc. This should fix PR pkg/16144 in the
Python2.2 (and NetBSD-1.5) case.

7 files changed, 101 insertions, 38 deletions

diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile
index 1935f33f69a..ec69416d3ab 100644
--- a/lang/python22-pth/Makefile
+++ b/lang/python22-pth/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:18:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/06 17:31:19 drochner Exp $
 #
 
-DISTNAME=	Python-2.2.2
-PKGNAME=	python22-pth-2.2.2
-PKGREVISION=	2
+DISTNAME=	Python-2.2.3
+PKGNAME=	python22-pth-2.2.3
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.2.2/
+MASTER_SITES=	ftp://ftp.python.org/pub/python/2.2.3/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@netbsd.org
@@ -24,6 +23,7 @@ PTHREAD_OPTS=	require
 .if ${PTHREAD_TYPE} == "pth"
 CONFIGURE_ARGS+=	--with-pth
 .endif
+MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 
 INSTALL_TARGET=	altinstall
 
diff --git a/lang/python22-pth/PLIST.common b/lang/python22-pth/PLIST.common
index f006aabe1e9..b6705bd7735 100644
--- a/lang/python22-pth/PLIST.common
+++ b/lang/python22-pth/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/06/06 17:31:20 drochner Exp $
 bin/pydoc2p2
 bin/python2p2
 include/python2p2/Python.h
@@ -405,6 +405,9 @@ lib/python2p2/dumbdbm.pyo
 
 
 
+lib/python2p2/email/_parseaddr.py
+lib/python2p2/email/_parseaddr.pyc
+lib/python2p2/email/_parseaddr.pyo
 lib/python2p2/email/Charset.py
 lib/python2p2/email/Charset.pyc
 lib/python2p2/email/Charset.pyo
@@ -468,6 +471,55 @@ lib/python2p2/email/base64MIME.pyo
 lib/python2p2/email/quopriMIME.py
 lib/python2p2/email/quopriMIME.pyc
 lib/python2p2/email/quopriMIME.pyo
+lib/python2p2/email/test/__init__.py
+lib/python2p2/email/test/__init__.pyc
+lib/python2p2/email/test/__init__.pyo
+lib/python2p2/email/test/data/PyBanner048.gif
+lib/python2p2/email/test/data/audiotest.au
+lib/python2p2/email/test/data/msg_01.txt
+lib/python2p2/email/test/data/msg_02.txt
+lib/python2p2/email/test/data/msg_03.txt
+lib/python2p2/email/test/data/msg_04.txt
+lib/python2p2/email/test/data/msg_05.txt
+lib/python2p2/email/test/data/msg_06.txt
+lib/python2p2/email/test/data/msg_07.txt
+lib/python2p2/email/test/data/msg_08.txt
+lib/python2p2/email/test/data/msg_09.txt
+lib/python2p2/email/test/data/msg_10.txt
+lib/python2p2/email/test/data/msg_11.txt
+lib/python2p2/email/test/data/msg_12.txt
+lib/python2p2/email/test/data/msg_13.txt
+lib/python2p2/email/test/data/msg_14.txt
+lib/python2p2/email/test/data/msg_15.txt
+lib/python2p2/email/test/data/msg_16.txt
+lib/python2p2/email/test/data/msg_17.txt
+lib/python2p2/email/test/data/msg_18.txt
+lib/python2p2/email/test/data/msg_19.txt
+lib/python2p2/email/test/data/msg_20.txt
+lib/python2p2/email/test/data/msg_21.txt
+lib/python2p2/email/test/data/msg_22.txt
+lib/python2p2/email/test/data/msg_23.txt
+lib/python2p2/email/test/data/msg_24.txt
+lib/python2p2/email/test/data/msg_25.txt
+lib/python2p2/email/test/data/msg_26.txt
+lib/python2p2/email/test/data/msg_27.txt
+lib/python2p2/email/test/data/msg_28.txt
+lib/python2p2/email/test/data/msg_29.txt
+lib/python2p2/email/test/data/msg_30.txt
+lib/python2p2/email/test/data/msg_31.txt
+lib/python2p2/email/test/data/msg_32.txt
+lib/python2p2/email/test/data/msg_33.txt
+lib/python2p2/email/test/data/msg_34.txt
+lib/python2p2/email/test/data/msg_35.txt
+lib/python2p2/email/test/test_email.py
+lib/python2p2/email/test/test_email.pyc
+lib/python2p2/email/test/test_email.pyo
+lib/python2p2/email/test/test_email_codecs.py
+lib/python2p2/email/test/test_email_codecs.pyc
+lib/python2p2/email/test/test_email_codecs.pyo
+lib/python2p2/email/test/test_email_torture.py
+lib/python2p2/email/test/test_email_torture.pyc
+lib/python2p2/email/test/test_email_torture.pyo
 lib/python2p2/encodings/__init__.py
 lib/python2p2/encodings/__init__.pyc
 lib/python2p2/encodings/__init__.pyo
@@ -627,6 +679,9 @@ lib/python2p2/encodings/iso8859_9.pyo
 lib/python2p2/encodings/koi8_r.py
 lib/python2p2/encodings/koi8_r.pyc
 lib/python2p2/encodings/koi8_r.pyo
+lib/python2p2/encodings/koi8_u.py
+lib/python2p2/encodings/koi8_u.pyc
+lib/python2p2/encodings/koi8_u.pyo
 lib/python2p2/encodings/latin_1.py
 lib/python2p2/encodings/latin_1.pyc
 lib/python2p2/encodings/latin_1.pyo
@@ -1177,7 +1232,6 @@ lib/python2p2/test/greyrgb.uue
 lib/python2p2/test/output/test_MimeWriter
 lib/python2p2/test/output/test_asynchat
 lib/python2p2/test/output/test_augassign
-lib/python2p2/test/output/test_bastion
 lib/python2p2/test/output/test_binascii
 lib/python2p2/test/output/test_builtin
 lib/python2p2/test/output/test_cfgparser
diff --git a/lang/python22-pth/PLIST.common_end b/lang/python22-pth/PLIST.common_end
index 732ee0adb77..d0ac8cc62fe 100644
--- a/lang/python22-pth/PLIST.common_end
+++ b/lang/python22-pth/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2003/06/06 17:31:20 drochner Exp $
 @dirrm lib/python2p2/xml/sax
 @dirrm lib/python2p2/xml/parsers
 @dirrm lib/python2p2/xml/dom
@@ -13,6 +13,8 @@
 @dirrm lib/python2p2/lib-dynload
 @dirrm lib/python2p2/hotshot
 @dirrm lib/python2p2/encodings
+@dirrm lib/python2p2/email/test/data
+@dirrm lib/python2p2/email/test
 @dirrm lib/python2p2/email
 @dirrm lib/python2p2/distutils/command
 @dirrm lib/python2p2/distutils
diff --git a/lang/python22-pth/distinfo b/lang/python22-pth/distinfo
index 6abfc48ac39..0bcf09064aa 100644
--- a/lang/python22-pth/distinfo
+++ b/lang/python22-pth/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.3 2003/04/08 18:42:39 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/06/06 17:31:20 drochner Exp $
 
-SHA1 (Python-2.2.2.tgz) = 52e5dc6273c83973f8fc92a7f19c15f97e59fc0e
-Size (Python-2.2.2.tgz) = 6669400 bytes
-SHA1 (patch-aa) = 5541c162c96c4c8b46d207f258791443d0566ef3
+SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
+Size (Python-2.2.3.tgz) = 6709556 bytes
+SHA1 (patch-aa) = ea936cc5837c5455d1cb683c62963538212bdafa
 SHA1 (patch-ab) = e5f86717b067a80dd76f14b8d7df4a943eb533e3
 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
 SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
 SHA1 (patch-ag) = 46ce7c0e3dfdeb971a253bdcbbdd19b10a78c6c2
-SHA1 (patch-ah) = 2a068e6adb789397c64dc7b6ce8901c677edb13f
-SHA1 (patch-ai) = 252f70aa3a9a0b2cca4810f2c47eba0e988da073
+SHA1 (patch-ah) = b1ef2e68cc8037f38e46007c6c65389e91a429fd
+SHA1 (patch-ai) = ae1d8a7886604f9e973f4430f9c673a575452170
 SHA1 (patch-aj) = ccf82a79c38f848d31f5193b561be5a44481fedc
 SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
 SHA1 (patch-bb) = 238f713b049fe2d9cd7e1142dfd0d8c32a53982e
diff --git a/lang/python22-pth/patches/patch-aa b/lang/python22-pth/patches/patch-aa
index 6070d11da84..506460ece81 100644
--- a/lang/python22-pth/patches/patch-aa
+++ b/lang/python22-pth/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
 
---- setup.py.orig	Tue Mar 26 08:43:04 2002
-+++ setup.py	Tue Sep 24 12:30:40 2002
-@@ -197,11 +197,15 @@
+--- setup.py.orig	2003-05-22 19:36:54.000000000 +0200
++++ setup.py	2003-06-02 20:01:58.000000000 +0200
+@@ -210,11 +210,15 @@
          return platform
  
      def detect_modules(self):
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
          try:
              have_unicode = unicode
-@@ -261,7 +265,7 @@
+@@ -274,7 +278,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.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
          # Modules with some UNIX dependencies -- on by default:
          # (If you have a really backward UNIX, select and socket may not be
-@@ -319,16 +323,16 @@
+@@ -330,16 +334,16 @@
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
              readline_libs = ['readline']
              if self.compiler.find_library_file(lib_dirs,
                                                   'ncurses'):
-@@ -352,14 +356,10 @@
+@@ -363,14 +367,10 @@
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -69,9 +69,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
 -                                     ] )
 +                                     [] )
  
-         if (ssl_incs is not None and
-             ssl_libs is not None):
-@@ -390,9 +390,9 @@
+         if ssl_incs is not None:
+             krb5_h = find_file('krb5.h', inc_dirs,
+@@ -413,9 +413,9 @@
                  exts.append( Extension('dbm', ['dbmmodule.c']) )
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
          # Berkeley DB interface.
          #
-@@ -446,9 +446,9 @@
+@@ -469,9 +469,9 @@
          # FTP archive sites. One URL for it is:
          # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
  
@@ -97,7 +97,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
  
          # Unix-only modules
-@@ -475,8 +475,8 @@
+@@ -498,8 +498,8 @@
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')
                and platform != 'darwin'):
                  # OSX has an old Berkeley curses, not good enough for
-@@ -486,8 +486,8 @@
+@@ -509,8 +509,8 @@
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -119,7 +119,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
          # If the curses module is enabled, check for the panel module
          if (module_enabled(exts, '_curses') and
-@@ -566,11 +566,11 @@
+@@ -581,11 +581,11 @@
          else:
              expat_incs = find_file('xmlparse.h', inc_dirs, [])
  
@@ -136,7 +136,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  
          # Platform-specific libraries
          if platform == 'linux2':
-@@ -793,7 +793,7 @@
+@@ -808,7 +808,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python22-pth/patches/patch-ah b/lang/python22-pth/patches/patch-ah
index a28f920cdec..9213728e44b 100644
--- a/lang/python22-pth/patches/patch-ah
+++ b/lang/python22-pth/patches/patch-ah
@@ -1,13 +1,11 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
---- Include/patchlevel.h.orig	Tue Oct 22 22:45:18 2002
-+++ Include/patchlevel.h	Tue Oct 22 22:46:00 2002
+--- Include/patchlevel.h.orig	2003-05-30 15:41:07.000000000 +0200
++++ Include/patchlevel.h	2003-06-02 20:04:34.000000000 +0200
 @@ -26,7 +26,7 @@
  #define PY_RELEASE_SERIAL	0
  
  /* Version as a string */
--#define PY_VERSION		"2.2.2"
-+#define PY_VERSION		"2p2.2"
+-#define PY_VERSION		"2.2.3"
++#define PY_VERSION		"2p2.3"
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
     Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
diff --git a/lang/python22-pth/patches/patch-ai b/lang/python22-pth/patches/patch-ai
index 6ca85d60897..4352431195a 100644
--- a/lang/python22-pth/patches/patch-ai
+++ b/lang/python22-pth/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2003/06/06 17:31:20 drochner Exp $
 
---- Makefile.pre.in.orig	Fri Aug 23 18:05:49 2002
-+++ Makefile.pre.in	Tue Oct 22 23:04:11 2002
+--- Makefile.pre.in.orig	2003-01-20 03:13:45.000000000 +0100
++++ Makefile.pre.in	2003-06-06 19:17:56.000000000 +0200
 @@ -56,7 +56,7 @@
  OPT=		@OPT@
  DEFS=		@DEFS@
@@ -11,6 +11,15 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
+@@ -294,7 +294,7 @@
+ $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/$(MAINOBJ) \
+-			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
+ 
+ platform: $(BUILDPYTHON)
+ 	./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
 @@ -407,7 +407,7 @@
  		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)