head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.18 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.16 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.14 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.12 pkgsrc-2011Q2-base:1.9 TNF:1.1.1 pkgsrc-2009Q4:1.9.0.10 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.8 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.6 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.4 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.2 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.8.0.32 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.30 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.28 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.26 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.24 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.22 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.20 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.18 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.16 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.14 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.12 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.10 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.8 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.6 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.4 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.2 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.4 tnf_020115:1.1.1.1; locks; strict; comment @# @; 1.9 date 2008.04.25.16.11.13; author tnn; state dead; branches; next 1.8; 1.8 date 2004.05.16.20.01.59; author minskim; state Exp; branches; next 1.7; 1.7 date 2003.06.06.17.31.19; author drochner; state Exp; branches; next 1.6; 1.6 date 2002.09.24.18.06.26; author tsarna; state Exp; branches; next 1.5; 1.5 date 2002.04.15.12.13.38; author drochner; state Exp; branches; next 1.4; 1.4 date 2002.04.09.04.33.20; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.03.22.15.20.24; author drochner; state Exp; branches; next 1.2; 1.2 date 2002.01.28.09.12.09; author drochner; state Exp; branches; next 1.1; 1.1 date 2002.01.15.17.11.03; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.01.15.17.11.03; author drochner; state Exp; branches; next ; desc @@ 1.9 log @De-orbit support for python 2.0 and python 2.2 under the "three major releases is enough" rule of thumb. (python 2.3 was released 5 years ago.) Keep python 1.5 and 2.1 though, because there are a handful of packages that still need them. @ text @$NetBSD: patch-aa,v 1.8 2004/05/16 20:01:59 minskim Exp $ --- setup.py.orig 2003-05-22 12:36:54.000000000 -0500 +++ setup.py @@@@ -210,11 +210,15 @@@@ class PyBuildExt(build_ext): return platform def detect_modules(self): - # Ensure that /usr/local is always used - if '/usr/local/lib' not in self.compiler.library_dirs: - self.compiler.library_dirs.insert(0, '/usr/local/lib') - if '/usr/local/include' not in self.compiler.include_dirs: - self.compiler.include_dirs.insert(0, '/usr/local/include' ) + # Add the buildlink directories for pkgsrc + if os.environ.has_key('BUILDLINK_DIR'): + dir = os.environ['BUILDLINK_DIR'] + libdir = dir + '/lib' + incdir = dir + '/include' + if libdir not in self.compiler.library_dirs: + self.compiler.library_dirs.insert(0, libdir) + if incdir not in self.compiler.include_dirs: + self.compiler.include_dirs.insert(0, incdir) try: have_unicode = unicode @@@@ -274,7 +278,7 @@@@ class PyBuildExt(build_ext): if have_unicode: exts.append( Extension('unicodedata', ['unicodedata.c']) ) # access to ISO C locale support - exts.append( Extension('_locale', ['_localemodule.c']) ) +# exts.append( Extension('_locale', ['_localemodule.c']) ) # Modules with some UNIX dependencies -- on by default: # (If you have a really backward UNIX, select and socket may not be @@@@ -330,16 +334,16 @@@@ class PyBuildExt(build_ext): # 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'): + if 0 and self.compiler.find_library_file(lib_dirs, 'readline'): readline_libs = ['readline'] if self.compiler.find_library_file(lib_dirs, 'ncurses'): @@@@ -363,14 +367,10 @@@@ class PyBuildExt(build_ext): # socket(2) # Detect SSL support for the socket module ssl_incs = find_file('openssl/ssl.h', inc_dirs, - ['/usr/local/ssl/include', - '/usr/contrib/ssl/include/' - ] + [] ) ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) + [] ) if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, @@@@ -413,9 +413,9 @@@@ class PyBuildExt(build_ext): exts.append( Extension('dbm', ['dbmmodule.c']) ) # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: - if (self.compiler.find_library_file(lib_dirs, 'gdbm')): - exts.append( Extension('gdbm', ['gdbmmodule.c'], - libraries = ['gdbm'] ) ) + #if (self.compiler.find_library_file(lib_dirs, 'gdbm')): + # exts.append( Extension('gdbm', ['gdbmmodule.c'], + # libraries = ['gdbm'] ) ) # Berkeley DB interface. # @@@@ -469,9 +469,9 @@@@ class PyBuildExt(build_ext): # FTP archive sites. One URL for it is: # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z - if (self.compiler.find_library_file(lib_dirs, 'gmp')): - exts.append( Extension('mpz', ['mpzmodule.c'], - libraries = ['gmp'] ) ) + #if (self.compiler.find_library_file(lib_dirs, 'gmp')): + # exts.append( Extension('mpz', ['mpzmodule.c'], + # libraries = ['gmp'] ) ) # Unix-only modules @@@@ -498,8 +498,8 @@@@ class PyBuildExt(build_ext): if (self.compiler.find_library_file(lib_dirs, 'ncurses')): curses_libs = ['ncurses'] - exts.append( Extension('_curses', ['_cursesmodule.c'], - libraries = curses_libs) ) +# exts.append( Extension('_curses', ['_cursesmodule.c'], +# 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 @@@@ -509,8 +509,8 @@@@ class PyBuildExt(build_ext): 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 @@@@ -544,23 +544,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 # @@@@ -581,11 +565,11 @@@@ class PyBuildExt(build_ext): else: expat_incs = find_file('xmlparse.h', inc_dirs, []) - if (expat_incs is not None and - self.compiler.find_library_file(lib_dirs, 'expat')): - exts.append( Extension('pyexpat', ['pyexpat.c'], - define_macros = expat_defs, - libraries = ['expat']) ) + #if (expat_incs is not None and + # self.compiler.find_library_file(lib_dirs, 'expat')): + # exts.append( Extension('pyexpat', ['pyexpat.c'], + # define_macros = expat_defs, + # libraries = ['expat']) ) # Platform-specific libraries if platform == 'linux2': @@@@ -808,7 +792,7 @@@@ def main(): ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install - scripts = ['Tools/scripts/pydoc'] + scripts = ['Tools/scripts/pydoc2.2'] ) # --install-platlib @ 1.8 log @Build python module for zlib unconditionally. This makes python2[12]{,-pth} build on platforms where zlib.h is not in /usr/include. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @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. @ text @d3 3 a5 3 --- setup.py.orig 2003-05-22 19:36:54.000000000 +0200 +++ setup.py 2003-06-02 18:58:56.000000000 +0200 @@@@ -210,11 +210,15 @@@@ d26 1 a26 1 @@@@ -274,7 +278,7 @@@@ d35 1 a35 1 @@@@ -330,16 +334,16 @@@@ d57 1 a57 1 @@@@ -363,14 +367,10 @@@@ d74 1 a74 1 @@@@ -413,9 +413,9 @@@@ d87 1 a87 1 @@@@ -469,9 +469,9 @@@@ d100 1 a100 1 @@@@ -498,8 +498,8 @@@@ d111 1 a111 1 @@@@ -509,8 +509,8 @@@@ d122 26 a147 1 @@@@ -581,11 +581,11 @@@@ d164 1 a164 1 @@@@ -808,7 +808,7 @@@@ @ 1.6 log @Add Zoularis/Linux support @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2002/04/15 12:13:38 drochner Exp $ d3 3 a5 3 --- setup.py.orig Tue Mar 26 08:43:04 2002 +++ setup.py Tue Sep 24 12:30:40 2002 @@@@ -197,11 +197,15 @@@@ d26 1 a26 1 @@@@ -261,7 +265,7 @@@@ d35 1 a35 1 @@@@ -319,16 +323,16 @@@@ d57 1 a57 1 @@@@ -352,14 +356,10 @@@@ d72 3 a74 3 if (ssl_incs is not None and ssl_libs is not None): @@@@ -390,9 +390,9 @@@@ d87 1 a87 1 @@@@ -446,9 +446,9 @@@@ d100 1 a100 1 @@@@ -475,8 +475,8 @@@@ d111 1 a111 1 @@@@ -486,8 +486,8 @@@@ d122 1 a122 1 @@@@ -566,11 +566,11 @@@@ d139 1 a139 1 @@@@ -793,7 +793,7 @@@@ @ 1.5 log @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 @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- setup.py.orig Tue Mar 26 14:43:04 2002 +++ setup.py Mon Apr 15 11:13:53 2002 d35 1 a35 1 @@@@ -319,13 +323,13 @@@@ d52 5 a56 1 if self.compiler.find_library_file(lib_dirs, 'readline'): d74 26 d122 17 @ 1.4 log @Teach the extension building process about buildlink, and allow passing LDFLAGS to the linker command when linking a python extension. This lets us pass the right flags to correctly find libraries required for certain extensions, e.g. zlib.so. @ text @d3 3 a5 3 --- setup.py.orig Mon Dec 17 12:24:43 2001 +++ setup.py @@@@ -192,11 +192,15 @@@@ d26 1 a26 1 @@@@ -256,7 +260,7 @@@@ d35 1 a35 1 @@@@ -314,13 +318,13 @@@@ d53 1 a53 1 @@@@ -347,14 +351,10 @@@@ d70 1 a70 1 @@@@ -470,8 +470,8 @@@@ d80 2 a81 2 # OSX has an old Berkeley curses, not good enough for @@@@ -481,8 +481,8 @@@@ d92 1 a92 1 @@@@ -784,7 +784,7 @@@@ @ 1.3 log @-remove hardwired "/usr/local" and "/usr/contrib" library search paths, as suggested by Johnny Lam -don't try to build the "locale" module - it doesn't work anyway -pull up a fix from Python CVS to get more consistent math exceptions (eg pow(1e-200,2) vs. math.pow(1e-200,2)) This will be part of 2.2.1. @ text @d3 4 a6 3 --- setup.py.orig Mon Dec 17 18:24:43 2001 +++ setup.py Fri Mar 22 12:28:30 2002 @@@@ -193,10 +193,10 @@@@ d9 1 a9 1 # Ensure that /usr/local is always used d14 9 a22 4 +# if '/usr/local/lib' not in self.compiler.library_dirs: +# self.compiler.library_dirs.insert(0, '/usr/local/lib') +# if '/usr/local/include' not in self.compiler.include_dirs: +# self.compiler.include_dirs.insert(0, '/usr/local/include' ) d26 1 a26 1 @@@@ -256,7 +256,7 @@@@ d35 1 a35 1 @@@@ -314,13 +314,13 @@@@ d53 1 a53 1 @@@@ -347,14 +347,10 @@@@ d70 12 a81 1 @@@@ -481,8 +477,8 @@@@ d92 1 a92 1 @@@@ -784,7 +780,7 @@@@ @ 1.2 log @-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 @ text @d4 25 a28 1 +++ setup.py Sun Jan 27 13:33:55 2002 d47 18 a64 1 @@@@ -481,8 +481,8 @@@@ d75 1 a75 1 @@@@ -784,7 +784,7 @@@@ @ 1.1 log @Initial revision @ text @d3 31 a33 2 --- setup.py.orig Tue Jan 15 17:42:07 2002 +++ setup.py Tue Jan 15 17:42:30 2002 @ 1.1.1.1 log @initial import of a Python-2.2 pkg @ text @@