-don't build modules which don't work on 64-bit platforms

-don't even try to build the curses modules - its failure is detected
 during build but this causes a lot of noise

3 files changed, 35 insertions, 9 deletions

diff --git a/lang/python22/PLIST b/lang/python22/PLIST
index a8c234bcd3d..a0714fa3d2e 100644
--- a/lang/python22/PLIST
+++ b/lang/python22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 17:11:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/28 09:12:07 drochner Exp $
 bin/pydoc2.2
 bin/python2.2
 include/python2.2/Python.h
@@ -747,7 +747,6 @@ lib/python2.2/lib-dynload/_socket.so
 lib/python2.2/lib-dynload/_testcapi.so
 lib/python2.2/lib-dynload/_weakref.so
 lib/python2.2/lib-dynload/array.so
-lib/python2.2/lib-dynload/audioop.so
 lib/python2.2/lib-dynload/binascii.so
 lib/python2.2/lib-dynload/bsddb.so
 lib/python2.2/lib-dynload/cPickle.so
@@ -759,7 +758,6 @@ lib/python2.2/lib-dynload/errno.so
 lib/python2.2/lib-dynload/fcntl.so
 lib/python2.2/lib-dynload/fpectl.so
 lib/python2.2/lib-dynload/grp.so
-lib/python2.2/lib-dynload/imageop.so
 lib/python2.2/lib-dynload/math.so
 lib/python2.2/lib-dynload/md5.so
 lib/python2.2/lib-dynload/mmap.so
@@ -770,7 +768,6 @@ lib/python2.2/lib-dynload/pcre.so
 lib/python2.2/lib-dynload/pwd.so
 lib/python2.2/lib-dynload/regex.so
 lib/python2.2/lib-dynload/resource.so
-lib/python2.2/lib-dynload/rgbimg.so
 lib/python2.2/lib-dynload/rotor.so
 lib/python2.2/lib-dynload/select.so
 lib/python2.2/lib-dynload/sha.so
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 7b223804ce1..cce29b36156 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/15 17:11:03 drochner Exp $
+$NetBSD: distinfo,v 1.2 2002/01/28 09:12:08 drochner Exp $
 
 SHA1 (Python-2.2.tgz) = ff78e4ab501bdb089a81884187ce2f4b44091ba2
 Size (Python-2.2.tgz) = 6542443 bytes
-SHA1 (patch-aa) = bbeefa1602151c99fdc0bdf3ae991004b3a2d975
+SHA1 (patch-aa) = a75108ad0f6577fbbc5ceaa065e9a06f107cd78d
 SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09
diff --git a/lang/python22/patches/patch-aa b/lang/python22/patches/patch-aa
index 1f0e5a1b05d..1d9d71e6d4d 100644
--- a/lang/python22/patches/patch-aa
+++ b/lang/python22/patches/patch-aa
@@ -1,7 +1,36 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/15 17:11:03 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/28 09:12:09 drochner Exp $
 
---- setup.py.orig	Tue Jan 15 17:42:07 2002
-+++ setup.py	Tue Jan 15 17:42:30 2002
+--- setup.py.orig	Mon Dec 17 18:24:43 2001
++++ setup.py	Sun Jan 27 13:33:55 2002
+@@ -314,13 +314,13 @@
+         # These represent audio samples or images as strings:
+ 
+         # Disabled on 64-bit platforms
+-        if sys.maxint != 9223372036854775807L:
++#        if sys.maxint != 9223372036854775807L:
+             # Operations on audio samples
+-            exts.append( Extension('audioop', ['audioop.c']) )
++#            exts.append( Extension('audioop', ['audioop.c']) )
+             # Operations on images
+-            exts.append( Extension('imageop', ['imageop.c']) )
++#            exts.append( Extension('imageop', ['imageop.c']) )
+             # Read SGI RGB image files (but coded portably)
+-            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
++#            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
+ 
+         # readline
+         if self.compiler.find_library_file(lib_dirs, 'readline'):
+@@ -481,8 +481,8 @@
+             else:
+                 curses_libs = ['curses', 'termcap']
+ 
+-            exts.append( Extension('_curses', ['_cursesmodule.c'],
+-                                   libraries = curses_libs) )
++#            exts.append( Extension('_curses', ['_cursesmodule.c'],
++#                                   libraries = curses_libs) )
+ 
+         # If the curses module is enabled, check for the panel module
+         if (module_enabled(exts, '_curses') and
 @@ -784,7 +784,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],