head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.44 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.42 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.40 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.36 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.34 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.32 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.30 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.28 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.26 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.24 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.22 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.20 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.18 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.16 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.14 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.12 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.10 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2005.01.23.20.41.47; author recht; state dead; branches; next 1.3; 1.3 date 2004.05.16.20.01.59; author minskim; state Exp; branches; next 1.2; 1.2 date 2002.09.04.14.25.18; author drochner; state Exp; branches; next 1.1; 1.1 date 2002.08.20.19.58.58; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.08.20.19.58.58; author drochner; state Exp; branches; next ; desc @@ 1.4 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-ac,v 1.3 2004/05/16 20:01:59 minskim Exp $ --- 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): - # 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' ) - # 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 @@@@ 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'): @@@@ -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, - ['/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 and ssl_libs is not None): @@@@ -408,8 +398,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[: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 @@@@ 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 (os.path.exists('Modules/_curses_panel.c') and @@@@ -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 - scripts = ['Tools/scripts/pydoc'] + scripts = ['Tools/scripts/pydoc2p1'] ) # --install-platlib @ 1.3 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.2 log @the interpreter itself _can_ be built with buildlink2 @ text @d3 3 a5 3 --- setup.py.orig Thu Dec 27 22:51:02 2001 +++ setup.py Wed Aug 28 16:15:08 2002 @@@@ -145,12 +145,6 @@@@ d18 1 a18 1 @@@@ -265,13 +259,13 @@@@ d36 1 a36 1 @@@@ -296,14 +290,10 @@@@ d53 1 a53 1 @@@@ -408,8 +398,8 @@@@ d64 1 a64 1 @@@@ -417,8 +407,8 @@@@ d75 26 a100 1 @@@@ -609,7 +599,7 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $ d3 3 a5 3 --- setup.py.orig Thu Dec 27 16:51:02 2001 +++ setup.py @@@@ -145,11 +145,16 @@@@ d14 1 a14 11 + # 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) + d17 2 a18 1 @@@@ -265,13 +270,13 @@@@ d36 1 a36 1 @@@@ -296,14 +301,10 @@@@ d53 1 a53 1 @@@@ -408,8 +409,8 @@@@ d64 1 a64 1 @@@@ -417,8 +418,8 @@@@ d75 1 a75 1 @@@@ -609,7 +610,7 @@@@ @ 1.1.1.1 log @Build a Python version with thread support. For now, we only have devel/pth, which tends to coredumps sometimes. But a number of Python packages insists in threads, so we have to start somewhere. @ text @@