From 367eed19feed744dba7b8ab45ae14c8d83feaf5b Mon Sep 17 00:00:00 2001 From: recht Date: Sun, 23 Jan 2005 20:41:45 +0000 Subject: 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. --- lang/python22-pth/Makefile | 27 ++++-- lang/python22-pth/PLIST | 2 + lang/python22-pth/buildlink3.mk | 27 ------ lang/python22-pth/distinfo | 15 ---- lang/python22-pth/patches/patch-aa | 172 ------------------------------------- lang/python22-pth/patches/patch-ab | 10 --- lang/python22-pth/patches/patch-ae | 23 ----- lang/python22-pth/patches/patch-af | 88 ------------------- lang/python22-pth/patches/patch-ag | 13 --- lang/python22-pth/patches/patch-ah | 12 --- lang/python22-pth/patches/patch-ai | 31 ------- lang/python22-pth/patches/patch-aj | 12 --- lang/python22-pth/patches/patch-ba | 32 ------- lang/python22-pth/patches/patch-bb | 18 ---- lang/python22-pth/patches/patch-bc | 33 ------- 15 files changed, 21 insertions(+), 494 deletions(-) create mode 100644 lang/python22-pth/PLIST delete mode 100644 lang/python22-pth/buildlink3.mk delete mode 100644 lang/python22-pth/distinfo delete mode 100644 lang/python22-pth/patches/patch-aa delete mode 100644 lang/python22-pth/patches/patch-ab delete mode 100644 lang/python22-pth/patches/patch-ae delete mode 100644 lang/python22-pth/patches/patch-af delete mode 100644 lang/python22-pth/patches/patch-ag delete mode 100644 lang/python22-pth/patches/patch-ah delete mode 100644 lang/python22-pth/patches/patch-ai delete mode 100644 lang/python22-pth/patches/patch-aj delete mode 100644 lang/python22-pth/patches/patch-ba delete mode 100644 lang/python22-pth/patches/patch-bb delete mode 100644 lang/python22-pth/patches/patch-bc (limited to 'lang/python22-pth') diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile index 009527bcdd7..5612fbdabf2 100644 --- a/lang/python22-pth/Makefile +++ b/lang/python22-pth/Makefile @@ -1,15 +1,26 @@ -# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $ +# $NetBSD: Makefile,v 1.15 2005/01/23 20:41:47 recht Exp $ # +DISTNAME= Python-2.2.3 PKGNAME= python22-pth-2.2.3 PKGREVISION= 3 +CATEGORIES= lang python +MASTER_SITES= # empty +DISTFILES= # empty -PTHREAD_OPTS= require -.include "../../mk/pthread.buildlink3.mk" -.if ${PTHREAD_TYPE} == "pth" -CONFIGURE_ARGS+= --with-pth -.endif +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.python.org/ +COMMENT= Interpreted, interactive, object-oriented programming language -PY_VER_SUFFIX= 2p2 +DEPENDS+= python22>=2.2.3:../../lang/python22 -.include "../../lang/python22/Makefile.common" +EXTRACT_ONLY= # empty +NO_CHECKSUM= yes +NO_CONFIGURE= yes +NO_BUILD= yes +NO_BUILDLINK= yes +NO_MTREE= yes + +do-install: # empty + +.include "../../mk/bsd.pkg.mk" diff --git a/lang/python22-pth/PLIST b/lang/python22-pth/PLIST new file mode 100644 index 00000000000..1fca9173c92 --- /dev/null +++ b/lang/python22-pth/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2005/01/23 20:41:47 recht Exp $ +@comment this plist intentionally left empty diff --git a/lang/python22-pth/buildlink3.mk b/lang/python22-pth/buildlink3.mk deleted file mode 100644 index 26fa57ccba5..00000000000 --- a/lang/python22-pth/buildlink3.mk +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYTHON22_PTH_BUILDLINK3_MK:= ${PYTHON22_PTH_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= python22-pth -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython22-pth} -BUILDLINK_PACKAGES+= python22-pth - -.if !empty(PYTHON22_PTH_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.python22-pth+= python22-pth>=2.2.2nb1 -BUILDLINK_PKGSRCDIR.python22-pth?= ../../lang/python22-pth - -.if defined(BUILDLINK_DEPMETHOD.python) -BUILDLINK_DEPMETHOD.python22-pth?= ${BUILDLINK_DEPMETHOD.python} -.endif - -BUILDLINK_INCDIRS.python22-pth+= include/python2p2 -BUILDLINK_LIBDIRS.python22-pth+= lib/python2p2/config -BUILDLINK_TRANSFORM+= l:python:python2p2 - -.endif # PYTHON22_PTH_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/python22-pth/distinfo b/lang/python22-pth/distinfo deleted file mode 100644 index 58d7cb6588d..00000000000 --- a/lang/python22-pth/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.6 2004/08/29 10:44:19 recht Exp $ - -SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400 -Size (Python-2.2.3.tgz) = 6709556 bytes -SHA1 (patch-aa) = d88a764938bba189e8ac509f370cc2c8525047a4 -SHA1 (patch-ab) = e5f86717b067a80dd76f14b8d7df4a943eb533e3 -SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e -SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52 -SHA1 (patch-ag) = 46ce7c0e3dfdeb971a253bdcbbdd19b10a78c6c2 -SHA1 (patch-ah) = b1ef2e68cc8037f38e46007c6c65389e91a429fd -SHA1 (patch-ai) = ae1d8a7886604f9e973f4430f9c673a575452170 -SHA1 (patch-aj) = ccf82a79c38f848d31f5193b561be5a44481fedc -SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc -SHA1 (patch-bb) = 389c439e8031257ca997455e10c8bd327b14638a -SHA1 (patch-bc) = 9fbe77ff35519a290ef1f70fcaa72a60009a36a1 diff --git a/lang/python22-pth/patches/patch-aa b/lang/python22-pth/patches/patch-aa deleted file mode 100644 index 639176ea37f..00000000000 --- a/lang/python22-pth/patches/patch-aa +++ /dev/null @@ -1,172 +0,0 @@ -$NetBSD: patch-aa,v 1.3 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/pydoc2p2'] - ) - - # --install-platlib diff --git a/lang/python22-pth/patches/patch-ab b/lang/python22-pth/patches/patch-ab deleted file mode 100644 index 97df59eaeb0..00000000000 --- a/lang/python22-pth/patches/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ - ---- Tools/scripts/pydoc2p2.orig Tue Jan 15 17:56:59 2002 -+++ Tools/scripts/pydoc2p2 Tue Jan 15 17:57:25 2002 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2p2 - - import pydoc - pydoc.cli() diff --git a/lang/python22-pth/patches/patch-ae b/lang/python22-pth/patches/patch-ae deleted file mode 100644 index 9b8b4a250c8..00000000000 --- a/lang/python22-pth/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ - ---- Lib/distutils/command/build_ext.py.orig Thu Dec 6 17:59:54 2001 -+++ Lib/distutils/command/build_ext.py -@@ -472,8 +472,18 @@ - # that go into the mix. - if ext.extra_objects: - objects.extend(ext.extra_objects) -+ -+ # Two possible sources for extra linker arguments: -+ # - 'extra_link_args' in Extension object -+ # - LDFLAGS environment variable -+ # The environment variable should take precedence, and -+ # any sensible compiler will give precedence to later -+ # command line args. Hence we combine them in order: - extra_args = ext.extra_link_args or [] - -+ -+ if os.environ.has_key('LDFLAGS'): -+ extra_args.extend(string.split(os.environ['LDFLAGS'])) - - self.compiler.link_shared_object( - objects, ext_filename, diff --git a/lang/python22-pth/patches/patch-af b/lang/python22-pth/patches/patch-af deleted file mode 100644 index 540c1f79ce1..00000000000 --- a/lang/python22-pth/patches/patch-af +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ - -Unofficial patch to support Basic Auth for XML-RPC. - ---- Lib/xmlrpclib.py.orig Tue Oct 15 18:52:10 2002 -+++ Lib/xmlrpclib.py Wed Oct 16 11:44:47 2002 -@@ -852,20 +852,55 @@ - - return self.parse_response(h.getfile()) - -+ ## -+ # Get authorization info from host parameter -+ # Host may be a string, or a (host, x509-dict) tuple; if a string, -+ # it is checked for a 'user:pw@host' format, and a "Basic Auth" -+ # header is created from the 'user:pw' info. -+ # -+ # @return A tuple of: (actual host, base64-encoded Authorization -+ # header or None, x509 info or empty dictionary) -+ -+ def get_host_info(self, host): -+ -+ x509 = {} -+ if isinstance(host,tuple): -+ host, x509 = host -+ -+ import urllib -+ auth, host = urllib.splituser(host) -+ -+ if auth: -+ auth='Basic %s' % auth.encode('base64').strip() -+ else: -+ auth=None -+ -+ return host, auth, x509 -+ - def getparser(self): - # get parser and unmarshaller - return getparser() - - def make_connection(self, host): - # create a HTTP connection object from a host descriptor -+ host, auth, x509 = self.get_host_info(host) - import httplib - return httplib.HTTP(host) - - def send_request(self, connection, handler, request_body): - connection.putrequest("POST", handler) - -+ ## -+ # Send host name (and authorization, if any) -+ # -+ # @param connection Connection handle. -+ # @param host Host object (per get_host_info). -+ - def send_host(self, connection, host): -+ host, auth, x509 = self.get_host_info(host) - connection.putheader("Host", host) -+ if auth: -+ connection.putheader("Authorization", auth) - - def send_user_agent(self, connection): - connection.putheader("User-Agent", self.user_agent) -@@ -901,11 +936,10 @@ - def make_connection(self, host): - # create a HTTPS connection object from a host descriptor - # host may be a string, or a (host, x509-dict) tuple -+ - import httplib -- if isinstance(host, TupleType): -- host, x509 = host -- else: -- x509 = {} -+ host, auth, x509 = self.get_host_info(host) -+ - try: - HTTPS = httplib.HTTPS - except AttributeError: -@@ -914,10 +948,6 @@ - else: - return apply(HTTPS, (host, None), x509) - -- def send_host(self, connection, host): -- if isinstance(host, TupleType): -- host, x509 = host -- connection.putheader("Host", host) - - class ServerProxy: - """uri [,options] -> a logical connection to an XML-RPC server diff --git a/lang/python22-pth/patches/patch-ag b/lang/python22-pth/patches/patch-ag deleted file mode 100644 index 12fac81925d..00000000000 --- a/lang/python22-pth/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ - ---- configure.orig Tue Oct 22 22:44:05 2002 -+++ configure Tue Oct 22 22:44:42 2002 -@@ -572,7 +572,7 @@ - - # Set VERSION so we only need to edit in one place (i.e., here) - --VERSION=2.2 -+VERSION=2p2 - - # Arguments passed to configure. - diff --git a/lang/python22-pth/patches/patch-ah b/lang/python22-pth/patches/patch-ah deleted file mode 100644 index d52ef1db3ad..00000000000 --- a/lang/python22-pth/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2003/06/07 14:37:02 cjep Exp $ ---- Include/patchlevel.h.orig 2003-05-30 15:41:07.000000000 +0200 -+++ Include/patchlevel.h 2003-06-02 20:04:34.000000000 +0200 -@@ -26,7 +26,7 @@ - #define PY_RELEASE_SERIAL 0 - - /* Version as a string */ --#define PY_VERSION "2.2.3" -+#define PY_VERSION "2p2.3" - - /* 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 >= ... */ diff --git a/lang/python22-pth/patches/patch-ai b/lang/python22-pth/patches/patch-ai deleted file mode 100644 index 4352431195a..00000000000 --- a/lang/python22-pth/patches/patch-ai +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2003/06/06 17:31:20 drochner Exp $ - ---- Makefile.pre.in.orig 2003-01-20 03:13:45.000000000 +0100 -+++ Makefile.pre.in 2003-06-06 19:17:56.000000000 +0200 -@@ -56,7 +56,7 @@ - OPT= @OPT@ - DEFS= @DEFS@ - CFLAGS= $(OPT) --CPPFLAGS= -I. -I$(srcdir)/Include $(DEFS) -+CPPFLAGS+= -I. -I$(srcdir)/Include $(DEFS) - LDFLAGS= @LDFLAGS@ - LDLAST= @LDLAST@ - SGI_ABI= @SGI_ABI@ -@@ -294,7 +294,7 @@ - $(BUILDPYTHON): Modules/$(MAINOBJ) $(LDLIBRARY) - $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ - Modules/$(MAINOBJ) \ -- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK} - - platform: $(BUILDPYTHON) - ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -@@ -407,7 +407,7 @@ - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) -- $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) -+ $(CC) $(LDFLAGS) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) - - Parser/grammar.o: $(srcdir)/Parser/grammar.c \ - $(srcdir)/Include/token.h \ diff --git a/lang/python22-pth/patches/patch-aj b/lang/python22-pth/patches/patch-aj deleted file mode 100644 index 4b6aa1fe4d9..00000000000 --- a/lang/python22-pth/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/04/08 18:42:40 drochner Exp $ - ---- Python/thread.c.orig 2003-04-08 20:30:53.000000000 +0200 -+++ Python/thread.c 2003-04-08 20:33:45.000000000 +0200 -@@ -107,6 +107,7 @@ - - #ifdef HAVE_PTH - #include "thread_pth.h" -+#undef _POSIX_THREADS - #endif - - #ifdef _POSIX_THREADS diff --git a/lang/python22-pth/patches/patch-ba b/lang/python22-pth/patches/patch-ba deleted file mode 100644 index a8a35b78d85..00000000000 --- a/lang/python22-pth/patches/patch-ba +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ - ---- Python/thread_pth.h.orig Thu Oct 12 22:58:32 2000 -+++ Python/thread_pth.h Fri Sep 6 18:34:12 2002 -@@ -30,6 +30,8 @@ - - #define CHECK_STATUS(name) if (status == -1) { printf("%d ", status); perror(name); error = 1; } - -+pth_attr_t PyThread_attr; -+ - /* - * Initialization. - */ -@@ -37,6 +39,9 @@ - static void PyThread__init_thread(void) - { - pth_init(); -+ PyThread_attr = pth_attr_new(); -+ pth_attr_set(PyThread_attr, PTH_ATTR_STACK_SIZE, 1<<18); -+ pth_attr_set(PyThread_attr, PTH_ATTR_JOINABLE, FALSE); - } - - /* -@@ -51,7 +56,7 @@ - if (!initialized) - PyThread_init_thread(); - -- th = pth_spawn(PTH_ATTR_DEFAULT, -+ th = pth_spawn(PyThread_attr, - (void* (*)(void *))func, - (void *)arg - ); diff --git a/lang/python22-pth/patches/patch-bb b/lang/python22-pth/patches/patch-bb deleted file mode 100644 index 23b069f7509..00000000000 --- a/lang/python22-pth/patches/patch-bb +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $ - ---- Lib/test/test_fcntl.py.orig 2002-08-23 18:06:46.000000000 +0200 -+++ Lib/test/test_fcntl.py 2004-08-28 12:01:15.000000000 +0200 -@@ -16,11 +16,11 @@ - else: - start_len = "qq" - --if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin', -+if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin', - 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', - 'bsdos2', 'bsdos3', 'bsdos4', - 'openbsd', 'openbsd2', 'openbsd3'): -- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0) -+ lockdata = struct.pack('qqihh', 0, 0, 0, fcntl.F_WRLCK, 0) - elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: - lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) - else: diff --git a/lang/python22-pth/patches/patch-bc b/lang/python22-pth/patches/patch-bc deleted file mode 100644 index 2f292e310a4..00000000000 --- a/lang/python22-pth/patches/patch-bc +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $ - ---- Lib/posixfile.py.orig 2001-10-25 00:03:35.000000000 +0200 -+++ Lib/posixfile.py 2004-08-28 12:02:35.000000000 +0200 -@@ -182,11 +182,11 @@ - # Hack by davem@magnet.com to get locking to go on freebsd; - # additions for AIX by Vladimir.Marangozov@imag.fr - import sys, os -- if sys.platform in ('netbsd1', -+ if sys.platform in ('netbsd1', 'netbsd2', - 'openbsd2', - 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', - 'bsdos2', 'bsdos3', 'bsdos4'): -- flock = struct.pack('lxxxxlxxxxlhh', \ -+ flock = struct.pack('qqihh', \ - l_start, l_len, os.getpid(), l_type, l_whence) - elif sys.platform in ['aix3', 'aix4']: - flock = struct.pack('hhlllii', \ -@@ -198,12 +198,12 @@ - flock = fcntl.fcntl(self._file_.fileno(), cmd, flock) - - if '?' in how: -- if sys.platform in ('netbsd1', -+ if sys.platform in ('netbsd1', 'netbsd2' - 'openbsd2', - 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', - 'bsdos2', 'bsdos3', 'bsdos4'): - l_start, l_len, l_pid, l_type, l_whence = \ -- struct.unpack('lxxxxlxxxxlhh', flock) -+ struct.unpack('qqihh', flock) - elif sys.platform in ['aix3', 'aix4']: - l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \ - struct.unpack('hhlllii', flock) -- cgit v1.2.3