head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.44 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.42 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.40 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.38 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.36 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.34 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.32 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.30 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.28 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.26 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.24 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.22 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.20 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.18 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.16 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.14 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.12 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.10 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.8 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.6 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.4 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.2 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.5.0.6 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2005.01.23.20.41.47; author recht; state dead; branches; next 1.5; 1.5 date 2004.06.02.12.29.28; author recht; state Exp; branches; next 1.4; 1.4 date 2003.12.23.17.24.42; author recht; state Exp; branches; next 1.3; 1.3 date 2003.12.08.21.13.56; author recht; state Exp; branches; next 1.2; 1.2 date 2003.08.18.20.57.14; author recht; state Exp; branches; next 1.1; 1.1 date 2003.08.04.08.29.32; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.08.04.08.29.32; author drochner; state Exp; branches; next ; desc @@ 1.6 log @Build Python with thread support by default and turn the existing python*-pth packages into meta-packages which will install the non-pth packages. Bump PKGREVISIONs on the non-pth versions to propagate the thread change, but leave the *-pth versions untouched to not affect existing installations. Sync all PYTHON_VERSIONS_AFFECTED lines in package Makefiles. @ text @$NetBSD: patch-aa,v 1.5 2004/06/02 12:29:28 recht Exp $ --- Include/patchlevel.h.orig 2004-05-19 05:14:27.000000000 +0200 +++ Include/patchlevel.h 2004-06-02 14:00:51.000000000 +0200 @@@@ -26,7 +26,7 @@@@ #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.3.4" +#define PY_VERSION "2p3.4" /* 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 >= ... */ @ 1.5 log @Update to 2.3.4 This is a bug-fix release for Python 2.3 that fixes a number of bugs, including a couple of weakref bugs and a bug in pickle version 2. There are also a number of fixes to the standard library, and some build fixes - see the release notes ( http://www.python.org/2.3.4/NEWS.html ) for details. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @update to 2.3.3 This is a bug-fix release for Python 2.3 that fixes a number of bugs, including a couple of serious errors with weakrefs and the cyclic garbage collector. There are also a number of fixes to the standard library - see the release notes ( http://www.python.org/2.3.3/NEWS.html )for details. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2003/12/08 21:13:56 recht Exp $ d3 2 a4 2 --- Include/patchlevel.h.orig 2003-10-01 08:47:48.000000000 +0200 +++ Include/patchlevel.h d9 2 a10 2 -#define PY_VERSION "2.3.3" +#define PY_VERSION "2p3.3" @ 1.3 log @Update to Python 2.3.2 Changes in Python: Quite a few fixes.. See NEWS for details. Changes in the pkg: - add FreeBSD patches from the FreeBSD port - add fix for a fatal bug in type's GC handling causes segfaults (via FreeBSD port) see http://cvs.sourceforge.net/viewcvs.py/python/python/dist/src/Misc/NEWS?r1=1.831.4.75&r2=1.831.4.76&diff_format=u - always build the db 1.85 module (on all platforms) @ text @d1 1 a1 1 $NetBSD$ d9 2 a10 2 -#define PY_VERSION "2.3.2" +#define PY_VERSION "2p3.2" @ 1.2 log @Split the PLIST into common and os dependent parts. Start with NetBSD and Linux. Disable the curses module on Linux. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2003/08/04 08:29:32 drochner Exp $ d3 8 a10 4 --- setup.py.orig 2003-07-10 14:48:39.000000000 +0200 +++ setup.py 2003-08-18 21:19:14.000000000 +0200 @@@@ -15,7 +15,7 @@@@ from distutils.command.install_lib import install_lib d12 2 a13 74 # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if @@@@ -240,9 +240,15 @@@@ return sys.platform def detect_modules(self): - # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/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) # fink installs lots of goodies in /sw/... - make sure we # check there @@@@ -396,13 +402,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'): @@@@ -436,9 +442,7 @@@@ depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) ssl_incs = find_file('openssl/ssl.h', inc_dirs, - ['/usr/local/ssl/include', - '/usr/contrib/ssl/include/' - ] + [] ) if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, @@@@ -446,9 +450,7 @@@@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) + [] ) if (ssl_incs is not None and ssl_libs is not None): @@@@ -1128,7 +1130,7 @@@@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] + scripts = ['Tools/scripts/pydoc2p3'] ) # --install-platlib @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d4 11 a14 2 +++ setup.py 2003-08-03 12:13:44.000000000 +0200 @@@@ -240,9 +240,13 @@@@ d21 9 a29 7 + # Add the buildlink directories for pkgsrc + if os.environ.has_key('BUILDLINK_DIR'): + dir = os.environ['BUILDLINK_DIR'] + libdir = dir + '/lib' + incdir = dir + '/include' + add_dir_to_list(self.compiler.library_dirs, libdir) + add_dir_to_list(self.compiler.include_dirs, incdir) d33 1 a33 1 @@@@ -396,7 +400,7 @@@@ d38 1 a38 1 + if 0 and sys.maxint != 9223372036854775807L: d40 2 a41 1 exts.append( Extension('audioop', ['audioop.c']) ) d43 5 a47 2 @@@@ -405,7 +409,7 @@@@ exts.append( Extension('rgbimg', ['rgbimgmodule.c']) ) d50 2 a51 6 - 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'): @@@@ -436,9 +440,7 @@@@ d62 1 a62 1 @@@@ -446,9 +448,7 @@@@ d73 1 a73 74 @@@@ -608,7 +608,7 @@@@ libraries=dblibs)) # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: - if (self.compiler.find_library_file(lib_dirs, 'gdbm')): + if 0 and (self.compiler.find_library_file(lib_dirs, 'gdbm')): exts.append( Extension('gdbm', ['gdbmmodule.c'], libraries = ['gdbm'] ) ) @@@@ -626,7 +626,7 @@@@ # 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')): + if 0 and (self.compiler.find_library_file(lib_dirs, 'gmp')): exts.append( Extension('mpz', ['mpzmodule.c'], libraries = ['gmp'] ) ) @@@@ -658,7 +658,7 @@@@ curses_libs = ['ncurses'] exts.append( Extension('_curses', ['_cursesmodule.c'], libraries = curses_libs) ) - elif (self.compiler.find_library_file(lib_dirs, 'curses') + elif 0 and (self.compiler.find_library_file(lib_dirs, 'curses') and platform != 'darwin'): # OSX has an old Berkeley curses, not good enough for # the _curses module. @@@@ -730,21 +730,21 @@@@ else: xmlbo = "4321" expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat') - exts.append(Extension('pyexpat', - sources = [ - 'pyexpat.c', - 'expat/xmlparse.c', - 'expat/xmlrole.c', - 'expat/xmltok.c', - ], - define_macros = [ - ('XML_NS', '1'), - ('XML_DTD', '1'), - ('BYTEORDER', xmlbo), - ('XML_CONTEXT_BYTES','1024'), - ], - include_dirs = [expatinc] - )) +# exts.append(Extension('pyexpat', +# sources = [ +# 'pyexpat.c', +# 'expat/xmlparse.c', +# 'expat/xmlrole.c', +# 'expat/xmltok.c', +# ], +# define_macros = [ +# ('XML_NS', '1'), +# ('XML_DTD', '1'), +# ('BYTEORDER', xmlbo), +# ('XML_CONTEXT_BYTES','1024'), +# ], +# include_dirs = [expatinc] +# )) # Dynamic loading module if sys.maxint == 0x7fffffff: @@@@ -867,7 +867,7 @@@@ self.extensions.extend(exts) # Call the method for detecting whether _tkinter can be compiled - self.detect_tkinter(inc_dirs, lib_dirs) +# self.detect_tkinter(inc_dirs, lib_dirs) def detect_tkinter_darwin(self, inc_dirs, lib_dirs): # The _tkinter module, using frameworks. Since frameworks are quite @@@@ -1128,7 +1128,9 @@@@ d78 1 a78 3 + scripts = ['Tools/scripts/pydoc2p3', +#'Tools/scripts/idle' + ] @ 1.1.1.1 log @Python-2.3 with thread support. Tested on -current/i386 only so far (this means, GNU pth support is untested). Suffers from stack shortage problems, thus doesn't get far in its selftest suite. @ text @@