Build python module for zlib unconditionally. This makes

python2[12]{,-pth} build on platforms where zlib.h is not in
/usr/include.

2 files changed, 36 insertions, 11 deletions

diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
index d3cf1b2571f..2af6ddb4b83 100644
--- a/lang/python21-pth/distinfo
+++ b/lang/python21-pth/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/06/06 18:14:12 drochner Exp $
+$NetBSD: distinfo,v 1.8 2004/05/16 20:01:59 minskim Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
 SHA1 (patch-aa) = d87aebf7b89a559e83c13a039fbdb98b39835211
 SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db
-SHA1 (patch-ac) = 042664030635fdcc1516c66b12568f1d5cb987d1
+SHA1 (patch-ac) = 4da78f997fb45365eee6d266c73bc129fe865d12
 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
 SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db
 SHA1 (patch-af) = 4e446bd88334dbee441f6a8dc41e7eaeb771e773
diff --git a/lang/python21-pth/patches/patch-ac b/lang/python21-pth/patches/patch-ac
index 4ec68c75433..6f252fb856e 100644
--- a/lang/python21-pth/patches/patch-ac
+++ b/lang/python21-pth/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/16 20:01:59 minskim Exp $
 
---- setup.py.orig	Thu Dec 27 22:51:02 2001
-+++ setup.py	Wed Aug 28 16:15:08 2002
-@@ -145,12 +145,6 @@
+--- setup.py.orig	2001-12-27 15:51:02.000000000 -0600
++++ setup.py
+@@ -145,12 +145,6 @@ class PyBuildExt(build_ext):
          return platform
  
      def detect_modules(self):
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
-@@ -265,13 +259,13 @@
+@@ -265,13 +259,13 @@ class PyBuildExt(build_ext):
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          # readline
          if self.compiler.find_library_file(lib_dirs, 'readline'):
-@@ -296,14 +290,10 @@
+@@ -296,14 +290,10 @@ class PyBuildExt(build_ext):
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -408,8 +398,8 @@
+@@ -408,8 +398,8 @@ class PyBuildExt(build_ext):
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
          	# OSX has an old Berkeley curses, not good enough for the _curses module.
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +407,8 @@
+@@ -417,8 +407,8 @@ class PyBuildExt(build_ext):
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -72,7 +72,32 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          # If the curses module is enabled, check for the panel module
          if (os.path.exists('Modules/_curses_panel.c') and
-@@ -609,7 +599,7 @@
+@@ -451,23 +441,7 @@ class PyBuildExt(build_ext):
+         # Andrew Kuchling's zlib module.
+         # This require zlib 1.1.3 (or later).
+         # See http://www.cdrom.com/pub/infozip/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
+-        if zlib_inc is not None:
+-            zlib_h = zlib_inc[0] + '/zlib.h'
+-            version = '"0.0.0"'
+-            version_req = '"1.1.3"'
+-            fp = open(zlib_h)
+-            while 1:
+-                line = fp.readline()
+-                if not line:
+-                    break
+-                if line.find('#define ZLIB_VERSION', 0) == 0:
+-                    version = line.split()[2]
+-                    break
+-            if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
+-                    exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z']) )
++        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
+ 
+         # Interface to the Expat XML parser
+         #
+@@ -609,7 +583,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install