Python 2.5

2006-11-01 20:59:18 +00:00 · 2006-11-01 20:59:18 +00:00 · c50d7b16d9
commit c50d7b16d9
parent d5e7960401
44 changed files with 4437 additions and 0 deletions
--- a/lang/python/2.5/Makefile
+++ b/lang/python/2.5/Makefile
@ -0,0 +1,15 @@
+# $OpenBSD: Makefile,v 1.1 2006/11/01 20:59:18 alek Exp $
+
+VERSION=		2.5
+PATCHLEVEL=
+PKG_PATCHLEVEL=		
+SHARED_LIBS=		python2.5 0.0
+
+# PSUBDIR=		python/${VERSION}
+AUTOCONF_VERSION=	2.59
+
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
+PATCH_LIST=		patch-* sup64-*
+.endif
+
+.include <bsd.port.mk>
--- a/lang/python/2.5/distinfo
+++ b/lang/python/2.5/distinfo
@ -0,0 +1,4 @@
+MD5 (Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
+RMD160 (Python-2.5.tgz) = 561c5fdf92cfc939b7c74fd69155c44c3d0584c3
+SHA1 (Python-2.5.tgz) = bab36b91f4d1c542323f4bdbd47e82917a70255b
+SIZE (Python-2.5.tgz) = 11019675
--- a/lang/python/2.5/files/CHANGES.OpenBSD
+++ b/lang/python/2.5/files/CHANGES.OpenBSD
@ -0,0 +1,24 @@
+As required by item 3 of the PSF license, here is a brief summary
+of changes made to this version of Python for the OpenBSD package.
+
+1.  tempfile.py was patched to not try /usr/tmp as a possible
+    tempfile directory.
+
+2.  libpython is created as a shared library, and the pthread stack
+    size was doubled to support this with complex applications such
+    as Zope.
+
+3.  OpenBSD threads are used for threading support.
+
+4.  The interpreter is called "python2.4" in order to support multiple
+    versions of Python coexisting on the same system.  If no "python"
+    binary exists, a symlink to "python2.4" is created when package
+    is installed.
+    Same process applies to IDLE binary (idle) and pydoc.
+
+5.  Regression tests have been taught about OpenBSD.
+
+These changes are available in the OpenBSD CVS repository
+<http://www.openbsd.org/anoncvs.html> in ports/lang/python.
+
+$OpenBSD: CHANGES.OpenBSD,v 1.1 2006/11/01 20:59:18 alek Exp $
--- a/lang/python/2.5/files/idle
+++ b/lang/python/2.5/files/idle
@ -0,0 +1,4 @@
+#!/bin/sh
+# $OpenBSD: idle,v 1.1 2006/11/01 20:59:18 alek Exp $
+
+/usr/bin/env python@VERSION@ @LOCALBASE@/lib/python@VERSION@/idlelib/idle.py
--- a/lang/python/2.5/patches/patch-Lib_distutils_command_build_ext_py
+++ b/lang/python/2.5/patches/patch-Lib_distutils_command_build_ext_py
@ -0,0 +1,18 @@
+$OpenBSD: patch-Lib_distutils_command_build_ext_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/distutils/command/build_ext.py.orig	Tue May 23 13:47:16 2006
+++ Lib/distutils/command/build_ext.py	Sat Oct 21 10:39:59 2006
+@@ -695,13 +695,6 @@ class build_ext (Command):
+             return ext.libraries
+ 
+         else:
+-            from distutils import sysconfig
+-            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+-                template = "python%d.%d"
+-                pythonlib = (template %
+-                             (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+-                return ext.libraries + [pythonlib]
+-            else:
+-                return ext.libraries
+            return ext.libraries
+ 
+ # class build_ext
--- a/lang/python/2.5/patches/patch-Lib_tempfile_py
+++ b/lang/python/2.5/patches/patch-Lib_tempfile_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-Lib_tempfile_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/tempfile.py.orig	Fri Jun 16 14:31:06 2006
+++ Lib/tempfile.py	Mon Sep 18 06:31:09 2006
+@@ -163,7 +163,7 @@ def _candidate_tempdir_list():
+     elif _os.name == 'nt':
+         dirlist.extend([ r'c:\temp', r'c:\tmp', r'\temp', r'\tmp' ])
+     else:
+-        dirlist.extend([ '/tmp', '/var/tmp', '/usr/tmp' ])
+        dirlist.extend([ '/tmp', '/var/tmp' ])
+ 
+     # As a last resort, the current directory.
+     try:
--- a/lang/python/2.5/patches/patch-Lib_test_regrtest_py
+++ b/lang/python/2.5/patches/patch-Lib_test_regrtest_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-Lib_test_regrtest_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/test/regrtest.py.orig	Mon Sep 18 06:33:05 2006
+++ Lib/test/regrtest.py	Mon Sep 18 06:31:49 2006
+@@ -1312,6 +1312,8 @@ _expectations['freebsd5'] = _expectation
+ _expectations['freebsd6'] = _expectations['freebsd4']
+ _expectations['freebsd7'] = _expectations['freebsd4']
+ 
+_expectations['openbsd4'] = _expectations['openbsd3']
+
+ class _ExpectedSkips:
+     def __init__(self):
+         import os.path
--- a/lang/python/2.5/patches/patch-Lib_test_test_dl_py
+++ b/lang/python/2.5/patches/patch-Lib_test_test_dl_py
@ -0,0 +1,31 @@
+$OpenBSD: patch-Lib_test_test_dl_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/test/test_dl.py.orig	Mon Apr 10 01:07:40 2006
+++ Lib/test/test_dl.py	Mon Sep 18 06:31:09 2006
+@@ -5,13 +5,22 @@
+ 
+ import dl
+ from test.test_support import verbose,TestSkipped
+import dircache
+ 
+libcNames = []
+libcName = ''
+for file in dircache.listdir('/usr/lib/'):
+        if '/libc.so.' in file:
+                libcNames.append(file)
+# Pick the most recent (highest number) libc
+if len(libcNames) > 0:
+	libcName = sorted(libcNames)[-1]
+if not libcName:
+	raise TestSkipped
+
+ sharedlibs = [
+-    ('/usr/lib/libc.so', 'getpid'),
+-    ('/lib/libc.so.6', 'getpid'),
+-    ('/usr/bin/cygwin1.dll', 'getpid'),
+-    ('/usr/lib/libc.dylib', 'getpid'),
+-    ]
+    (libcName, 'getpid'),
+]
+ 
+ for s, func in sharedlibs:
+     try:
--- a/lang/python/2.5/patches/patch-Lib_test_test_tempfile_py
+++ b/lang/python/2.5/patches/patch-Lib_test_test_tempfile_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/test/test_tempfile.py.orig	Tue Sep  5 12:54:42 2006
+++ Lib/test/test_tempfile.py	Mon Sep 18 06:31:10 2006
+@@ -30,7 +30,7 @@ if sys.platform == 'mac':
+ elif sys.platform in ('openbsd3', 'openbsd4'):
+     TEST_FILES = 48
+ else:
+-    TEST_FILES = 100
+    TEST_FILES = 48
+ 
+ # This is organized as one test for each chunk of code in tempfile.py,
+ # in order of their appearance in the file.  Testing which requires
--- a/lang/python/2.5/patches/patch-Lib_test_test_timeout_py
+++ b/lang/python/2.5/patches/patch-Lib_test_test_timeout_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-Lib_test_test_timeout_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/test/test_timeout.py.orig	Mon Jun 12 06:25:56 2006
+++ Lib/test/test_timeout.py	Mon Sep 18 06:31:10 2006
+@@ -108,7 +108,7 @@ class TimeoutTestCase(unittest.TestCase)
+ 
+     def testConnectTimeout(self):
+         # Test connect() timeout
+-        _timeout = 0.001
+        _timeout = 0.0001
+         self.sock.settimeout(_timeout)
+ 
+         # If we are too close to www.python.org, this test will fail.
--- a/lang/python/2.5/patches/patch-Makefile_pre_in
+++ b/lang/python/2.5/patches/patch-Makefile_pre_in
@ -0,0 +1,65 @@
+$OpenBSD: patch-Makefile_pre_in,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Makefile.pre.in.orig	Mon Jul 31 02:20:10 2006
+++ Makefile.pre.in	Mon Sep 18 06:31:10 2006
+@@ -337,6 +337,7 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+ 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+			-lpython$(VERSION) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ platform: $(BUILDPYTHON)
+ 	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+@@ -373,6 +374,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
+ 	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+ 
+# This rule for OpenBSD...
+$(LDLIBRARY):      $(LIBRARY)
+	$(LDSHARED) -o $@ $(LIBRARY_OBJS)
+
+
+ # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
+ # minimal framework (not including the Lib directory and such) in the current
+ # directory.
+@@ -650,13 +656,12 @@ bininstall:	altbininstall
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
+ 	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -sf python$(VERSION)-config python-config)
+ 
+ # Install the interpreter with $(VERSION) affixed
+ # This goes into $(exec_prefix)
+ altbininstall:	$(BUILDPYTHON)
+-	@for i in $(BINDIR) $(LIBDIR); \
+	@for i in $(BINDIR) $(LIBDIR) $(LIBPL); \
+ 	do \
+ 		if test ! -d $(DESTDIR)$$i; then \
+ 			echo "Creating directory $$i"; \
+@@ -665,14 +670,12 @@ altbininstall:	$(BUILDPYTHON)
+ 		fi; \
+ 	done
+ 	$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
+-	if test -f libpython$(VERSION)$(SO); then \
+	if test -f $(LDLIBRARY); then \
+ 		if test "$(SO)" = .dll; then \
+ 			$(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
+ 		else \
+-			$(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
+-			if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
+-				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
+-			fi \
+			$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBPL)/$(LDLIBRARY); \
+			(cd $(DESTDIR)$(LIBDIR); $(LN) -s python$(VERSION)/config/$(LDLIBRARY)); \
+ 		fi; \
+ 	else	true; \
+ 	fi
+@@ -688,7 +691,7 @@ maninstall:
+ 		fi; \
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/Misc/python.man \
+-		$(DESTDIR)$(MANDIR)/man1/python.1
+		$(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
+ 
+ # Install the library
+ PLATDIR=	plat-$(MACHDEP)
--- a/lang/python/2.5/patches/patch-Modules_makesetup
+++ b/lang/python/2.5/patches/patch-Modules_makesetup
@ -0,0 +1,11 @@
+$OpenBSD: patch-Modules_makesetup,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Modules/makesetup.orig	Fri Mar 29 19:00:19 2002
+++ Modules/makesetup	Thu Oct 19 03:59:06 2006
+@@ -164,6 +164,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
+			-pthread*)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;
--- a/lang/python/2.5/patches/patch-Modules_nismodule_c
+++ b/lang/python/2.5/patches/patch-Modules_nismodule_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-Modules_nismodule_c,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Modules/nismodule.c.orig	Tue Feb 28 03:46:16 2006
+++ Modules/nismodule.c	Mon Sep 18 06:31:10 2006
+@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
+ 	return map;
+ }
+ 
+-#ifdef __APPLE__
+#ifdef __OpenBSD__
+ typedef int (*foreachfunc)(unsigned long, char *, int, char *, int, void *);
+ #else
+ typedef int (*foreachfunc)(int, char *, int, char *, int, char *);
--- a/lang/python/2.5/patches/patch-Modules_socketmodule_c
+++ b/lang/python/2.5/patches/patch-Modules_socketmodule_c
@ -0,0 +1,45 @@
+$OpenBSD: patch-Modules_socketmodule_c,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Modules/socketmodule.c.orig	Tue Aug 15 08:10:24 2006
+++ Modules/socketmodule.c	Mon Sep 18 06:31:10 2006
+@@ -73,9 +73,6 @@ Local naming conventions:
+ #include "Python.h"
+ #include "structmember.h"
+ 
+-#undef MAX
+-#define MAX(x, y) ((x) < (y) ? (y) : (x))
+-
+ /* Socket object documentation */
+ PyDoc_STRVAR(sock_doc,
+ "socket([family[, type[, proto]]]) -> socket object\n\
+@@ -1927,12 +1924,18 @@ internal_connect(PySocketSockObject *s, 
+ 		if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
+ 			timeout = internal_select(s, 1);
+ 			if (timeout == 0) {
+-				res = connect(s->sock_fd, addr, addrlen);
+-				if (res < 0 && errno == EISCONN)
+-					res = 0;
+			  /* Bug #1019808: in case of an EINPROGRESS, use
+			     getsockopt(SO_ERROR) to get the real error. */
+			  socklen_t res_size = sizeof res;
+			  (void)getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
+					   &res, &res_size);
+			  if (res == EISCONN)
+			      res = 0;
+			  errno = res;
+ 			}
+-			else if (timeout == -1)
+			else if (timeout == -1) {
+ 				res = errno;		/* had error */
+			}
+ 			else
+ 				res = EWOULDBLOCK;	/* timed out */
+ 		}
+@@ -3602,7 +3605,7 @@ socket_inet_aton(PyObject *self, PyObjec
+ 
+ #if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
+ 	/* Have to use inet_addr() instead */
+-	unsigned long packed_addr;
+	int packed_addr;
+ #endif
+ 	char *ip_addr;
+ 
--- a/lang/python/2.5/patches/patch-Tools_scripts_pydoc
+++ b/lang/python/2.5/patches/patch-Tools_scripts_pydoc
@ -0,0 +1,9 @@
+$OpenBSD: patch-Tools_scripts_pydoc,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Tools/scripts/pydoc.orig	Tue Aug 10 03:27:55 2004
+++ Tools/scripts/pydoc	Mon Sep 18 06:31:10 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/env python2.4
+ 
+ import pydoc
+ if __name__ == '__main__':
--- a/lang/python/2.5/patches/patch-configure_in
+++ b/lang/python/2.5/patches/patch-configure_in
@ -0,0 +1,36 @@
+$OpenBSD: patch-configure_in,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- configure.in.orig	Tue Sep  5 12:54:42 2006
+++ configure.in	Mon Sep 18 06:31:10 2006
+@@ -1508,19 +1508,7 @@ then
+ 			LDSHARED="ld -Bshareable ${LDFLAGS}"
+ 		fi;;
+ 	OpenBSD*)
+-		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+-		then
+-				LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+-		else
+-				case `uname -r` in
+-				[[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
+-				   LDSHARED="ld -Bshareable ${LDFLAGS}"
+-				   ;;
+-				*)
+-				   LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+-				   ;;
+-				esac
+-		fi;;
+		LDSHARED="$CC -shared ${LDFLAGS}";;
+ 	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+ 	OpenUNIX*|UnixWare*)
+ 		if test "$GCC" = "yes"
+@@ -1662,9 +1650,10 @@ AC_CHECK_LIB(dld, shl_load)	# Dynamic li
+ 
+ # only check for sem_ini if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
+-    AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+#   AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+ 						# posix4 on Solaris 2.6
+ 						# pthread (first!) on Linux
+	LIBS="-pthread $(LIBS)"
+ fi
+ 
+ # check if we need libintl for locale functions
--- a/lang/python/2.5/patches/patch-setup_py
+++ b/lang/python/2.5/patches/patch-setup_py
@ -0,0 +1,371 @@
+$OpenBSD: patch-setup_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- setup.py.orig	Thu Aug 10 01:42:18 2006
+++ setup.py	Sat Oct 21 11:56:30 2006
+@@ -592,209 +592,14 @@ class PyBuildExt(build_ext):
+             exts.append( Extension('_sha512', ['sha512module.c']) )
+ 
+ 
+-        # Modules that provide persistent dictionary-like semantics.  You will
+-        # probably want to arrange for at least one of them to be available on
+-        # your machine, though none are defined by default because of library
+-        # dependencies.  The Python module anydbm.py provides an
+-        # implementation independent wrapper for these; dumbdbm.py provides
+-        # similar functionality (but slower of course) implemented in Python.
+-
+-        # Sleepycat Berkeley DB interface.  http://www.sleepycat.com
+-        #
+-        # This requires the Sleepycat DB code. The supported versions
+-        # are set below.  Visit http://www.sleepycat.com/ to download
+-        # a release.  Most open source OSes come with one or more
+-        # versions of BerkeleyDB already installed.
+-
+-        max_db_ver = (4, 4)
+-        min_db_ver = (3, 3)
+-        db_setup_debug = False   # verbose debug prints from this script?
+-
+-        # construct a list of paths to look for the header file in on
+-        # top of the normal inc_dirs.
+-        db_inc_paths = [
+-            '/usr/include/db4',
+-            '/usr/local/include/db4',
+-            '/opt/sfw/include/db4',
+-            '/sw/include/db4',
+-            '/usr/include/db3',
+-            '/usr/local/include/db3',
+-            '/opt/sfw/include/db3',
+-            '/sw/include/db3',
+-        ]
+-        # 4.x minor number specific paths
+-        for x in (0,1,2,3,4):
+-            db_inc_paths.append('/usr/include/db4%d' % x)
+-            db_inc_paths.append('/usr/include/db4.%d' % x)
+-            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
+-            db_inc_paths.append('/usr/local/include/db4%d' % x)
+-            db_inc_paths.append('/pkg/db-4.%d/include' % x)
+-            db_inc_paths.append('/opt/db-4.%d/include' % x)
+-        # 3.x minor number specific paths
+-        for x in (2,3):
+-            db_inc_paths.append('/usr/include/db3%d' % x)
+-            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
+-            db_inc_paths.append('/usr/local/include/db3%d' % x)
+-            db_inc_paths.append('/pkg/db-3.%d/include' % x)
+-            db_inc_paths.append('/opt/db-3.%d/include' % x)
+-
+-        # Add some common subdirectories for Sleepycat DB to the list,
+-        # based on the standard include directories. This way DB3/4 gets
+-        # picked up when it is installed in a non-standard prefix and
+-        # the user has added that prefix into inc_dirs.
+-        std_variants = []
+-        for dn in inc_dirs:
+-            std_variants.append(os.path.join(dn, 'db3'))
+-            std_variants.append(os.path.join(dn, 'db4'))
+-            for x in (0,1,2,3,4):
+-                std_variants.append(os.path.join(dn, "db4%d"%x))
+-                std_variants.append(os.path.join(dn, "db4.%d"%x))
+-            for x in (2,3):
+-                std_variants.append(os.path.join(dn, "db3%d"%x))
+-                std_variants.append(os.path.join(dn, "db3.%d"%x))
+-
+-        db_inc_paths = std_variants + db_inc_paths
+-
+-
+-        db_ver_inc_map = {}
+-
+-        class db_found(Exception): pass
+-        try:
+-            # See whether there is a Sleepycat header in the standard
+-            # search path.
+-            for d in inc_dirs + db_inc_paths:
+-                f = os.path.join(d, "db.h")
+-                if db_setup_debug: print "db: looking for db.h in", f
+-                if os.path.exists(f):
+-                    f = open(f).read()
+-                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
+-                    if m:
+-                        db_major = int(m.group(1))
+-                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
+-                        db_minor = int(m.group(1))
+-                        db_ver = (db_major, db_minor)
+-
+-                        if ( (not db_ver_inc_map.has_key(db_ver)) and
+-                           (db_ver <= max_db_ver and db_ver >= min_db_ver) ):
+-                            # save the include directory with the db.h version
+-                            # (first occurrance only)
+-                            db_ver_inc_map[db_ver] = d
+-                            print "db.h: found", db_ver, "in", d
+-                        else:
+-                            # we already found a header for this library version
+-                            if db_setup_debug: print "db.h: ignoring", d
+-                    else:
+-                        # ignore this header, it didn't contain a version number
+-                        if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
+-
+-            db_found_vers = db_ver_inc_map.keys()
+-            db_found_vers.sort()
+-
+-            while db_found_vers:
+-                db_ver = db_found_vers.pop()
+-                db_incdir = db_ver_inc_map[db_ver]
+-
+-                # check lib directories parallel to the location of the header
+-                db_dirs_to_check = [
+-                    os.path.join(db_incdir, '..', 'lib64'),
+-                    os.path.join(db_incdir, '..', 'lib'),
+-                    os.path.join(db_incdir, '..', '..', 'lib64'),
+-                    os.path.join(db_incdir, '..', '..', 'lib'),
+-                ]
+-                db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+-
+-                # Look for a version specific db-X.Y before an ambiguoius dbX
+-                # XXX should we -ever- look for a dbX name?  Do any
+-                # systems really not name their library by version and
+-                # symlink to more general names?
+-                for dblib in (('db-%d.%d' % db_ver),
+-                              ('db%d%d' % db_ver),
+-                              ('db%d' % db_ver[0])):
+-                    dblib_file = self.compiler.find_library_file(
+-                                    db_dirs_to_check + lib_dirs, dblib )
+-                    if dblib_file:
+-                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
+-                        raise db_found
+-                    else:
+-                        if db_setup_debug: print "db lib: ", dblib, "not found"
+-
+-        except db_found:
+-            print "db lib: using", db_ver, dblib
+-            if db_setup_debug: print "db: lib dir", dblib_dir, "inc dir", db_incdir
+-            db_incs = [db_incdir]
+-            dblibs = [dblib]
+-            # We add the runtime_library_dirs argument because the
+-            # BerkeleyDB lib we're linking against often isn't in the
+-            # system dynamic library search path.  This is usually
+-            # correct and most trouble free, but may cause problems in
+-            # some unusual system configurations (e.g. the directory
+-            # is on an NFS server that goes away).
+        if !!USE_BSDDB!!:
+             exts.append(Extension('_bsddb', ['_bsddb.c'],
+-                                  library_dirs=dblib_dir,
+-                                  runtime_library_dirs=dblib_dir,
+-                                  include_dirs=db_incs,
+-                                  libraries=dblibs))
+-        else:
+-            if db_setup_debug: print "db: no appropriate library found"
+-            db_incs = None
+-            dblibs = []
+-            dblib_dir = None
+                                  library_dirs=["!!LOCALBASE!!/lib/db4"],
+                                  runtime_library_dirs=["!!LOCALBASE!!/lib/db4"],
+                                  include_dirs=["!!LOCALBASE!!/include/db4"],
+                                  libraries=["db"]))
+ 
+-        # The sqlite interface
+-        sqlite_setup_debug = True   # verbose debug prints from this script?
+-
+-        # We hunt for #define SQLITE_VERSION "n.n.n"
+-        # We need to find >= sqlite version 3.0.8
+-        sqlite_incdir = sqlite_libdir = None
+-        sqlite_inc_paths = [ '/usr/include',
+-                             '/usr/include/sqlite',
+-                             '/usr/include/sqlite3',
+-                             '/usr/local/include',
+-                             '/usr/local/include/sqlite',
+-                             '/usr/local/include/sqlite3',
+-                           ]
+-        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
+-        MIN_SQLITE_VERSION = ".".join([str(x)
+-                                    for x in MIN_SQLITE_VERSION_NUMBER])
+-
+-        # Scan the default include directories before the SQLite specific
+-        # ones. This allows one to override the copy of sqlite on OSX,
+-        # where /usr/include contains an old version of sqlite.
+-        for d in inc_dirs + sqlite_inc_paths:
+-            f = os.path.join(d, "sqlite3.h")
+-            if os.path.exists(f):
+-                if sqlite_setup_debug: print "sqlite: found %s"%f
+-                incf = open(f).read()
+-                m = re.search(
+-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
+-                if m:
+-                    sqlite_version = m.group(1)
+-                    sqlite_version_tuple = tuple([int(x)
+-                                        for x in sqlite_version.split(".")])
+-                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
+-                        # we win!
+-                        print "%s/sqlite3.h: version %s"%(d, sqlite_version)
+-                        sqlite_incdir = d
+-                        break
+-                    else:
+-                        if sqlite_setup_debug:
+-                            print "%s: version %d is too old, need >= %s"%(d,
+-                                        sqlite_version, MIN_SQLITE_VERSION)
+-                elif sqlite_setup_debug:
+-                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
+-
+-        if sqlite_incdir:
+-            sqlite_dirs_to_check = [
+-                os.path.join(sqlite_incdir, '..', 'lib64'),
+-                os.path.join(sqlite_incdir, '..', 'lib'),
+-                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
+-                os.path.join(sqlite_incdir, '..', '..', 'lib'),
+-            ]
+-            sqlite_libfile = self.compiler.find_library_file(
+-                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
+-            sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
+-
+-        if sqlite_incdir and sqlite_libdir:
+	if !!USE_SQLITE!!:
+             sqlite_srcs = ['_sqlite/cache.c',
+                 '_sqlite/connection.c',
+                 '_sqlite/cursor.c',
+@@ -804,31 +609,14 @@ class PyBuildExt(build_ext):
+                 '_sqlite/row.c',
+                 '_sqlite/statement.c',
+                 '_sqlite/util.c', ]
+-
+             sqlite_defines = []
+-            if sys.platform != "win32":
+-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
+-            else:
+-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
+-
+-
+-            if sys.platform == 'darwin':
+-                # In every directory on the search path search for a dynamic
+-                # library and then a static library, instead of first looking
+-                # for dynamic libraries on the entiry path.
+-                # This way a staticly linked custom sqlite gets picked up
+-                # before the dynamic library in /usr/lib.
+-                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
+-            else:
+-                sqlite_extra_link_args = ()
+-
+            sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
+             exts.append(Extension('_sqlite3', sqlite_srcs,
+                                   define_macros=sqlite_defines,
+                                   include_dirs=["Modules/_sqlite",
+-                                                sqlite_incdir],
+-                                  library_dirs=sqlite_libdir,
+-                                  runtime_library_dirs=sqlite_libdir,
+-                                  extra_link_args=sqlite_extra_link_args,
+                                                "!!LOCALBASE!!/include"],
+                                  library_dirs=["!!LOCALBASE!!/lib"],
+                                  runtime_library_dirs=["!!LOCALBASE!!/lib"],
+                                   libraries=["sqlite3",]))
+ 
+         # Look for Berkeley db 1.85.   Note that it is built as a different
+@@ -878,8 +666,7 @@ class PyBuildExt(build_ext):
+                                                       ('DB_DBM_HSEARCH',None)],
+                                        libraries=dblibs))
+ 
+-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
+-        if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
+	if !!USE_GDBM!!:
+             exts.append( Extension('gdbm', ['gdbmmodule.c'],
+                                    libraries = ['gdbm'] ) )
+ 
+@@ -970,53 +757,34 @@ class PyBuildExt(build_ext):
+                                            libraries = ['z'],
+                                            extra_link_args = zlib_extra_link_args))
+ 
+-        # Gustavo Niemeyer's bz2 module.
+-        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
+-            if sys.platform == "darwin":
+-                bz2_extra_link_args = ('-Wl,-search_paths_first',)
+-            else:
+-                bz2_extra_link_args = ()
+        if !!USE_BZ2!!:
+             exts.append( Extension('bz2', ['bz2module.c'],
+-                                   libraries = ['bz2'],
+-                                   extra_link_args = bz2_extra_link_args) )
+                                   libraries = ['bz2']) )
+ 
+-        # Interface to the Expat XML parser
+-        #
+-        # Expat was written by James Clark and is now maintained by a
+-        # group of developers on SourceForge; see www.libexpat.org for
+-        # more information.  The pyexpat module was written by Paul
+-        # Prescod after a prototype by Jack Jansen.  The Expat source
+-        # is included in Modules/expat/.  Usage of a system
+-        # shared libexpat.so/expat.dll is not advised.
+-        #
+-        # More information on Expat can be found at www.libexpat.org.
+-        #
+-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+-        define_macros = [
+-            ('HAVE_EXPAT_CONFIG_H', '1'),
+-        ]
+-
+-        exts.append(Extension('pyexpat',
+-                              define_macros = define_macros,
+-                              include_dirs = [expatinc],
+-                              sources = ['pyexpat.c',
+-                                         'expat/xmlparse.c',
+-                                         'expat/xmlrole.c',
+-                                         'expat/xmltok.c',
+-                                         ],
+-                              ))
+-
+-        # Fredrik Lundh's cElementTree module.  Note that this also
+-        # uses expat (via the CAPI hook in pyexpat).
+-
+-        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
+-            define_macros.append(('USE_PYEXPAT_CAPI', None))
+-            exts.append(Extension('_elementtree',
+        if !!USE_EXPAT!!:
+            expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+            define_macros = [
+                ('HAVE_EXPAT_CONFIG_H', '1'),
+            ]
+           
+            exts.append(Extension('pyexpat',
+                                   define_macros = define_macros,
+-                                  include_dirs = [expatinc],
+-                                  sources = ['_elementtree.c'],
+                                  include_dirs = ["!!LOCALBASE!!/include", expatinc],
+                                  sources = ['pyexpat.c'],
+                                  libraries = ['expat'],
+                                   ))
+ 
+            # Fredrik Lundh's cElementTree module.  Note that this also
+            # uses expat (via the CAPI hook in pyexpat).
+            
+            if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
+                define_macros.append(('USE_PYEXPAT_CAPI', None))
+                exts.append(Extension('_elementtree',
+                                      define_macros = define_macros,
+                                      include_dirs = [expatinc],
+                                      sources = ['_elementtree.c'],
+                                      ))
+
+         # Hye-Shik Chang's CJKCodecs modules.
+         if have_unicode:
+             exts.append(Extension('_multibytecodec',
+@@ -1132,8 +900,16 @@ class PyBuildExt(build_ext):
+ 
+         self.extensions.extend(exts)
+ 
+-        # Call the method for detecting whether _tkinter can be compiled
+-        self.detect_tkinter(inc_dirs, lib_dirs)
+        if !!USE_TKINTER!!:
+           ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                           define_macros=[('WITH_APPINIT', 1)],
+                           include_dirs = ["!!LOCALBASE!!/include/tcl8.4", 
+                                           "!!LOCALBASE!!/include/tk8.4",
+                                           "!!X11BASE!!/include"],
+                           libraries = ["tk84", "tcl84", "X11"],
+                           library_dirs = ["!!LOCALBASE!!/lib", "!!X11BASE!!/lib"],
+                           )
+           self.extensions.append(ext)
+ 
+     def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
+         # The _tkinter module, using frameworks. Since frameworks are quite
+@@ -1515,8 +1291,7 @@ def main():
+           ext_modules=[Extension('_struct', ['_struct.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Lib/smtpd.py']
+          scripts = []
+         )
+ 
+ # --install-platlib
--- a/lang/python/2.5/patches/sup64-Lib_test_regrtest_py
+++ b/lang/python/2.5/patches/sup64-Lib_test_regrtest_py
@ -0,0 +1,13 @@
+$OpenBSD: sup64-Lib_test_regrtest_py,v 1.1 2006/11/01 20:59:18 alek Exp $
+--- Lib/test/regrtest.py.orig	Sun Oct 22 02:21:34 2006
+++ Lib/test/regrtest.py	Sun Oct 22 02:25:17 2006
+@@ -1246,6 +1246,9 @@ _expectations = {
+         """,
+     'openbsd3':
+         """
+        test_audioop
+        test_rgbimg
+        test_imageop
+         test_aepack
+         test_al
+         test_applesingle
--- a/lang/python/2.5/pkg/DESCR
+++ b/lang/python/2.5/pkg/DESCR
@ -0,0 +1,24 @@
+Python is an interpreted, interactive, object-oriented
+programming language that combines remarkable power with
+very clear syntax. For an introduction to programming in
+Python you are referred to the Python Tutorial. The Python
+Library Reference documents built-in and standard types,
+constants, functions and modules. Finally, the Python
+Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules
+written in C or C++.  On most systems such modules may be
+dynamically loaded. Python is also adaptable as an
+extension language for existing applications. See the
+internal documentation for hints.
+
+Flavors:
+   no_bsddb   - do not build bsdb package
+   no_expat   - do not build expat package
+   no_gdbm    - do not build gdbm package
+   no_idle    - do not build idle package
+   no_mpz     - do not build mpz package
+   no_tests   - do not build tests package
+   no_tkinter - do not build tkinter package
+   no_tools   - do not build tools package
--- a/lang/python/2.5/pkg/DESCR-bsddb
+++ b/lang/python/2.5/pkg/DESCR-bsddb
@ -0,0 +1,15 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the bsddb, for using the Berkeley DB library in
+Python.
--- a/lang/python/2.5/pkg/DESCR-bz2
+++ b/lang/python/2.5/pkg/DESCR-bz2
@ -0,0 +1 @@
+This package contains bzip2 compression module.
--- a/lang/python/2.5/pkg/DESCR-db
+++ b/lang/python/2.5/pkg/DESCR-db
@ -0,0 +1,14 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the Berkeley db module.
--- a/lang/python/2.5/pkg/DESCR-expat
+++ b/lang/python/2.5/pkg/DESCR-expat
@ -0,0 +1 @@
+This package contains support for the expat XML parser.
--- a/lang/python/2.5/pkg/DESCR-gdbm
+++ b/lang/python/2.5/pkg/DESCR-gdbm
@ -0,0 +1,15 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the gdbm, for using the GNU DBM library in
+Python.
--- a/lang/python/2.5/pkg/DESCR-idle
+++ b/lang/python/2.5/pkg/DESCR-idle
@ -0,0 +1,14 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains IDE for Python.
--- a/lang/python/2.5/pkg/DESCR-sqlite
+++ b/lang/python/2.5/pkg/DESCR-sqlite
@ -0,0 +1,15 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the sqlite3 module, for using the SQLite
+database library in Python.
--- a/lang/python/2.5/pkg/DESCR-tests
+++ b/lang/python/2.5/pkg/DESCR-tests
@ -0,0 +1,14 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the Python testsuite.
--- a/lang/python/2.5/pkg/DESCR-tkinter
+++ b/lang/python/2.5/pkg/DESCR-tkinter
@ -0,0 +1,15 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains the Tkinter module, for using the tk toolkit
+in Python.
--- a/lang/python/2.5/pkg/DESCR-tools
+++ b/lang/python/2.5/pkg/DESCR-tools
@ -0,0 +1,14 @@
+Python is an interpreted, interactive, object-oriented programming
+language that combines remarkable power with very clear syntax. For
+an introduction to programming in Python you are referred to the
+Python Tutorial. The Python Library Reference documents built-in
+and standard types, constants, functions and modules. Finally, the
+Python Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules written
+in C or C++.  On most systems such modules may be dynamically loaded.
+Python is also adaptable as an extension language for existing
+applications. See the internal documentation for hints.
+
+This package contains extra tools that Python users may find useful.
--- a/lang/python/2.5/pkg/MESSAGE
+++ b/lang/python/2.5/pkg/MESSAGE
@ -0,0 +1,4 @@
+If you want to use this package as your default system python, create
+symbolic links like so:
+ln -s ${PREFIX}/bin/python2.5 ${PREFIX}/bin/python
+ln -s ${PREFIX}/bin/pydoc2.5  ${PREFIX}/bin/pydoc
--- a/lang/python/2.5/pkg/MESSAGE-idle
+++ b/lang/python/2.5/pkg/MESSAGE-idle
@ -0,0 +1,3 @@
+If you want to use this package as your system default idle, create
+symbolic links like so:
+ln -s ${PREFIX}/bin/idle2.5 ${PREFIX}/bin/idle
--- a/lang/python/2.5/pkg/PFRAG.mm
+++ b/lang/python/2.5/pkg/PFRAG.mm
@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.mm,v 1.1 2006/11/01 20:59:18 alek Exp $
+lib/python2.5/lib-dynload/dl.so
+lib/python2.5/lib-dynload/imageop.so
+lib/python2.5/lib-dynload/rgbimg.so
--- a/lang/python/2.5/pkg/PLIST
+++ b/lang/python/2.5/pkg/PLIST
--- a/lang/python/2.5/pkg/PLIST-bsddb
+++ b/lang/python/2.5/pkg/PLIST-bsddb
@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-bsddb,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-bsddb->=2.5,<2.6
+lib/python2.5/lib-dynload/_bsddb.so
--- a/lang/python/2.5/pkg/PLIST-bz2
+++ b/lang/python/2.5/pkg/PLIST-bz2
@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-bz2,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-bz2->=2.5,<2.6
+lib/python2.5/lib-dynload/bz2.so
--- a/lang/python/2.5/pkg/PLIST-expat
+++ b/lang/python/2.5/pkg/PLIST-expat
@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST-expat,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-expat->=2.5,<2.6
+lib/python2.5/lib-dynload/_elementtree.so
+lib/python2.5/lib-dynload/pyexpat.so
--- a/lang/python/2.5/pkg/PLIST-gdbm
+++ b/lang/python/2.5/pkg/PLIST-gdbm
@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-gdbm,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-gdbm->=2.5,<2.6
+lib/python2.5/lib-dynload/gdbm.so
--- a/lang/python/2.5/pkg/PLIST-idle
+++ b/lang/python/2.5/pkg/PLIST-idle
@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-idle,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-idle->=2.5,<2.6
--- a/lang/python/2.5/pkg/PLIST-sqlite
+++ b/lang/python/2.5/pkg/PLIST-sqlite
@ -0,0 +1,36 @@
+@comment $OpenBSD: PLIST-sqlite,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-sqlite3->=2.5,<2.6
+lib/python2.5/lib-dynload/_sqlite3.so
+lib/python2.5/sqlite3/
+lib/python2.5/sqlite3/__init__.py
+lib/python2.5/sqlite3/__init__.pyc
+lib/python2.5/sqlite3/__init__.pyo
+lib/python2.5/sqlite3/dbapi2.py
+lib/python2.5/sqlite3/dbapi2.pyc
+lib/python2.5/sqlite3/dbapi2.pyo
+lib/python2.5/sqlite3/test/
+lib/python2.5/sqlite3/test/__init__.py
+lib/python2.5/sqlite3/test/__init__.pyc
+lib/python2.5/sqlite3/test/__init__.pyo
+lib/python2.5/sqlite3/test/dbapi.py
+lib/python2.5/sqlite3/test/dbapi.pyc
+lib/python2.5/sqlite3/test/dbapi.pyo
+lib/python2.5/sqlite3/test/factory.py
+lib/python2.5/sqlite3/test/factory.pyc
+lib/python2.5/sqlite3/test/factory.pyo
+lib/python2.5/sqlite3/test/hooks.py
+lib/python2.5/sqlite3/test/hooks.pyc
+lib/python2.5/sqlite3/test/hooks.pyo
+lib/python2.5/sqlite3/test/regression.py
+lib/python2.5/sqlite3/test/regression.pyc
+lib/python2.5/sqlite3/test/regression.pyo
+lib/python2.5/sqlite3/test/transactions.py
+lib/python2.5/sqlite3/test/transactions.pyc
+lib/python2.5/sqlite3/test/transactions.pyo
+lib/python2.5/sqlite3/test/types.py
+lib/python2.5/sqlite3/test/types.pyc
+lib/python2.5/sqlite3/test/types.pyo
+lib/python2.5/sqlite3/test/userfunctions.py
+lib/python2.5/sqlite3/test/userfunctions.pyc
+lib/python2.5/sqlite3/test/userfunctions.pyo
--- a/lang/python/2.5/pkg/PLIST-tests
+++ b/lang/python/2.5/pkg/PLIST-tests
--- a/lang/python/2.5/pkg/PLIST-tkinter
+++ b/lang/python/2.5/pkg/PLIST-tkinter
@ -0,0 +1,56 @@
+@comment $OpenBSD: PLIST-tkinter,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-tkinter->=2.5,<2.6
+lib/python2.5/lib-dynload/_tkinter.so
+lib/python2.5/lib-tk/
+lib/python2.5/lib-tk/Canvas.py
+lib/python2.5/lib-tk/Canvas.pyc
+lib/python2.5/lib-tk/Canvas.pyo
+lib/python2.5/lib-tk/Dialog.py
+lib/python2.5/lib-tk/Dialog.pyc
+lib/python2.5/lib-tk/Dialog.pyo
+lib/python2.5/lib-tk/FileDialog.py
+lib/python2.5/lib-tk/FileDialog.pyc
+lib/python2.5/lib-tk/FileDialog.pyo
+lib/python2.5/lib-tk/FixTk.py
+lib/python2.5/lib-tk/FixTk.pyc
+lib/python2.5/lib-tk/FixTk.pyo
+lib/python2.5/lib-tk/ScrolledText.py
+lib/python2.5/lib-tk/ScrolledText.pyc
+lib/python2.5/lib-tk/ScrolledText.pyo
+lib/python2.5/lib-tk/SimpleDialog.py
+lib/python2.5/lib-tk/SimpleDialog.pyc
+lib/python2.5/lib-tk/SimpleDialog.pyo
+lib/python2.5/lib-tk/Tix.py
+lib/python2.5/lib-tk/Tix.pyc
+lib/python2.5/lib-tk/Tix.pyo
+lib/python2.5/lib-tk/Tkconstants.py
+lib/python2.5/lib-tk/Tkconstants.pyc
+lib/python2.5/lib-tk/Tkconstants.pyo
+lib/python2.5/lib-tk/Tkdnd.py
+lib/python2.5/lib-tk/Tkdnd.pyc
+lib/python2.5/lib-tk/Tkdnd.pyo
+lib/python2.5/lib-tk/Tkinter.py
+lib/python2.5/lib-tk/Tkinter.pyc
+lib/python2.5/lib-tk/Tkinter.pyo
+lib/python2.5/lib-tk/tkColorChooser.py
+lib/python2.5/lib-tk/tkColorChooser.pyc
+lib/python2.5/lib-tk/tkColorChooser.pyo
+lib/python2.5/lib-tk/tkCommonDialog.py
+lib/python2.5/lib-tk/tkCommonDialog.pyc
+lib/python2.5/lib-tk/tkCommonDialog.pyo
+lib/python2.5/lib-tk/tkFileDialog.py
+lib/python2.5/lib-tk/tkFileDialog.pyc
+lib/python2.5/lib-tk/tkFileDialog.pyo
+lib/python2.5/lib-tk/tkFont.py
+lib/python2.5/lib-tk/tkFont.pyc
+lib/python2.5/lib-tk/tkFont.pyo
+lib/python2.5/lib-tk/tkMessageBox.py
+lib/python2.5/lib-tk/tkMessageBox.pyc
+lib/python2.5/lib-tk/tkMessageBox.pyo
+lib/python2.5/lib-tk/tkSimpleDialog.py
+lib/python2.5/lib-tk/tkSimpleDialog.pyc
+lib/python2.5/lib-tk/tkSimpleDialog.pyo
+lib/python2.5/lib-tk/turtle.py
+lib/python2.5/lib-tk/turtle.pyc
+lib/python2.5/lib-tk/turtle.pyo
--- a/lang/python/2.5/pkg/PLIST-tools
+++ b/lang/python/2.5/pkg/PLIST-tools
@ -0,0 +1,265 @@
+@comment $OpenBSD: PLIST-tools,v 1.1 2006/11/01 20:59:18 alek Exp $
+@option no-default-conflict
+@conflict python-tools->=2.5,<2.6
+lib/python2.5/Tools/
+lib/python2.5/Tools/README
+lib/python2.5/Tools/audiopy/
+lib/python2.5/Tools/audiopy/README
+lib/python2.5/Tools/audiopy/audiopy
+lib/python2.5/Tools/bgen/
+lib/python2.5/Tools/bgen/README
+lib/python2.5/Tools/bgen/bgen/
+lib/python2.5/Tools/bgen/bgen/bgen.py
+lib/python2.5/Tools/bgen/bgen/bgenBuffer.py
+lib/python2.5/Tools/bgen/bgen/bgenGenerator.py
+lib/python2.5/Tools/bgen/bgen/bgenGeneratorGroup.py
+lib/python2.5/Tools/bgen/bgen/bgenHeapBuffer.py
+lib/python2.5/Tools/bgen/bgen/bgenModule.py
+lib/python2.5/Tools/bgen/bgen/bgenObjectDefinition.py
+lib/python2.5/Tools/bgen/bgen/bgenOutput.py
+lib/python2.5/Tools/bgen/bgen/bgenStackBuffer.py
+lib/python2.5/Tools/bgen/bgen/bgenStringBuffer.py
+lib/python2.5/Tools/bgen/bgen/bgenType.py
+lib/python2.5/Tools/bgen/bgen/bgenVariable.py
+lib/python2.5/Tools/bgen/bgen/macsupport.py
+lib/python2.5/Tools/bgen/bgen/scantools.py
+lib/python2.5/Tools/buildbot/
+lib/python2.5/Tools/buildbot/Makefile
+lib/python2.5/Tools/buildbot/build.bat
+lib/python2.5/Tools/buildbot/clean.bat
+lib/python2.5/Tools/buildbot/external.bat
+lib/python2.5/Tools/buildbot/kill_python.bat
+lib/python2.5/Tools/buildbot/kill_python.c
+lib/python2.5/Tools/buildbot/kill_python.mak
+lib/python2.5/Tools/buildbot/test.bat
+lib/python2.5/Tools/compiler/
+lib/python2.5/Tools/compiler/ACKS
+lib/python2.5/Tools/compiler/README
+lib/python2.5/Tools/compiler/ast.txt
+lib/python2.5/Tools/compiler/astgen.py
+lib/python2.5/Tools/compiler/compile.py
+lib/python2.5/Tools/compiler/demo.py
+lib/python2.5/Tools/compiler/dumppyc.py
+lib/python2.5/Tools/compiler/regrtest.py
+lib/python2.5/Tools/compiler/stacktest.py
+lib/python2.5/Tools/faqwiz/
+lib/python2.5/Tools/faqwiz/README
+lib/python2.5/Tools/faqwiz/faqconf.py
+lib/python2.5/Tools/faqwiz/faqcust.py
+lib/python2.5/Tools/faqwiz/faqw.py
+lib/python2.5/Tools/faqwiz/faqwiz.py
+lib/python2.5/Tools/faqwiz/move-faqwiz.sh
+lib/python2.5/Tools/framer/
+lib/python2.5/Tools/framer/README.txt
+lib/python2.5/Tools/framer/TODO.txt
+lib/python2.5/Tools/framer/example.py
+lib/python2.5/Tools/framer/framer/
+lib/python2.5/Tools/framer/framer/__init__.py
+lib/python2.5/Tools/framer/framer/bases.py
+lib/python2.5/Tools/framer/framer/function.py
+lib/python2.5/Tools/framer/framer/member.py
+lib/python2.5/Tools/framer/framer/slots.py
+lib/python2.5/Tools/framer/framer/struct.py
+lib/python2.5/Tools/framer/framer/structparse.py
+lib/python2.5/Tools/framer/framer/template.py
+lib/python2.5/Tools/framer/framer/util.py
+lib/python2.5/Tools/freeze/
+lib/python2.5/Tools/freeze/README
+lib/python2.5/Tools/freeze/bkfile.py
+lib/python2.5/Tools/freeze/checkextensions.py
+lib/python2.5/Tools/freeze/checkextensions_win32.py
+lib/python2.5/Tools/freeze/extensions_win32.ini
+lib/python2.5/Tools/freeze/freeze.py
+lib/python2.5/Tools/freeze/hello.py
+lib/python2.5/Tools/freeze/makeconfig.py
+lib/python2.5/Tools/freeze/makefreeze.py
+lib/python2.5/Tools/freeze/makemakefile.py
+lib/python2.5/Tools/freeze/parsesetup.py
+lib/python2.5/Tools/freeze/win32.html
+lib/python2.5/Tools/freeze/winmakemakefile.py
+lib/python2.5/Tools/i18n/
+lib/python2.5/Tools/i18n/makelocalealias.py
+lib/python2.5/Tools/i18n/msgfmt.py
+lib/python2.5/Tools/i18n/pygettext.py
+lib/python2.5/Tools/modulator/
+lib/python2.5/Tools/modulator/EXAMPLE.py
+lib/python2.5/Tools/modulator/README
+lib/python2.5/Tools/modulator/ScrolledListbox.py
+lib/python2.5/Tools/modulator/Templates/
+lib/python2.5/Tools/modulator/Templates/copyright
+lib/python2.5/Tools/modulator/Templates/module_head
+lib/python2.5/Tools/modulator/Templates/module_method
+lib/python2.5/Tools/modulator/Templates/module_tail
+lib/python2.5/Tools/modulator/Templates/object_head
+lib/python2.5/Tools/modulator/Templates/object_method
+lib/python2.5/Tools/modulator/Templates/object_mlist
+lib/python2.5/Tools/modulator/Templates/object_new
+lib/python2.5/Tools/modulator/Templates/object_structure
+lib/python2.5/Tools/modulator/Templates/object_tail
+lib/python2.5/Tools/modulator/Templates/object_tp_as_mapping
+lib/python2.5/Tools/modulator/Templates/object_tp_as_number
+lib/python2.5/Tools/modulator/Templates/object_tp_as_sequence
+lib/python2.5/Tools/modulator/Templates/object_tp_call
+lib/python2.5/Tools/modulator/Templates/object_tp_compare
+lib/python2.5/Tools/modulator/Templates/object_tp_dealloc
+lib/python2.5/Tools/modulator/Templates/object_tp_getattr
+lib/python2.5/Tools/modulator/Templates/object_tp_hash
+lib/python2.5/Tools/modulator/Templates/object_tp_print
+lib/python2.5/Tools/modulator/Templates/object_tp_repr
+lib/python2.5/Tools/modulator/Templates/object_tp_setattr
+lib/python2.5/Tools/modulator/Templates/object_tp_str
+lib/python2.5/Tools/modulator/Tkextra.py
+lib/python2.5/Tools/modulator/genmodule.py
+lib/python2.5/Tools/modulator/modulator.py
+lib/python2.5/Tools/modulator/varsubst.py
+lib/python2.5/Tools/msi/
+lib/python2.5/Tools/msi/README.txt
+lib/python2.5/Tools/msi/msi.py
+lib/python2.5/Tools/msi/msilib.py
+lib/python2.5/Tools/msi/msisupport.c
+lib/python2.5/Tools/msi/msisupport.mak
+lib/python2.5/Tools/msi/schema.py
+lib/python2.5/Tools/msi/sequence.py
+lib/python2.5/Tools/msi/uisample.py
+lib/python2.5/Tools/msi/uuids.py
+lib/python2.5/Tools/pybench/
+lib/python2.5/Tools/pybench/Arithmetic.py
+lib/python2.5/Tools/pybench/Calls.py
+lib/python2.5/Tools/pybench/CommandLine.py
+lib/python2.5/Tools/pybench/Constructs.py
+lib/python2.5/Tools/pybench/Dict.py
+lib/python2.5/Tools/pybench/Exceptions.py
+lib/python2.5/Tools/pybench/Imports.py
+lib/python2.5/Tools/pybench/Instances.py
+lib/python2.5/Tools/pybench/LICENSE
+lib/python2.5/Tools/pybench/Lists.py
+lib/python2.5/Tools/pybench/Lookups.py
+lib/python2.5/Tools/pybench/NewInstances.py
+lib/python2.5/Tools/pybench/Numbers.py
+lib/python2.5/Tools/pybench/README
+lib/python2.5/Tools/pybench/Setup.py
+lib/python2.5/Tools/pybench/Strings.py
+lib/python2.5/Tools/pybench/Tuples.py
+lib/python2.5/Tools/pybench/Unicode.py
+lib/python2.5/Tools/pybench/clockres.py
+lib/python2.5/Tools/pybench/package/
+lib/python2.5/Tools/pybench/package/__init__.py
+lib/python2.5/Tools/pybench/package/submodule.py
+lib/python2.5/Tools/pybench/pybench.py
+lib/python2.5/Tools/pybench/systimes.py
+lib/python2.5/Tools/pynche/
+lib/python2.5/Tools/pynche/ChipViewer.py
+lib/python2.5/Tools/pynche/ColorDB.py
+lib/python2.5/Tools/pynche/DetailsViewer.py
+lib/python2.5/Tools/pynche/ListViewer.py
+lib/python2.5/Tools/pynche/Main.py
+lib/python2.5/Tools/pynche/PyncheWidget.py
+lib/python2.5/Tools/pynche/README
+lib/python2.5/Tools/pynche/StripViewer.py
+lib/python2.5/Tools/pynche/Switchboard.py
+lib/python2.5/Tools/pynche/TextViewer.py
+lib/python2.5/Tools/pynche/TypeinViewer.py
+lib/python2.5/Tools/pynche/X/
+lib/python2.5/Tools/pynche/X/rgb.txt
+lib/python2.5/Tools/pynche/X/xlicense.txt
+lib/python2.5/Tools/pynche/__init__.py
+lib/python2.5/Tools/pynche/html40colors.txt
+lib/python2.5/Tools/pynche/namedcolors.txt
+lib/python2.5/Tools/pynche/pyColorChooser.py
+lib/python2.5/Tools/pynche/pynche
+lib/python2.5/Tools/pynche/pynche.pyw
+lib/python2.5/Tools/pynche/webcolors.txt
+lib/python2.5/Tools/pynche/websafe.txt
+lib/python2.5/Tools/scripts/
+lib/python2.5/Tools/scripts/README
+lib/python2.5/Tools/scripts/byext.py
+lib/python2.5/Tools/scripts/byteyears.py
+lib/python2.5/Tools/scripts/checkappend.py
+lib/python2.5/Tools/scripts/checkpyc.py
+lib/python2.5/Tools/scripts/classfix.py
+lib/python2.5/Tools/scripts/cleanfuture.py
+lib/python2.5/Tools/scripts/combinerefs.py
+lib/python2.5/Tools/scripts/copytime.py
+lib/python2.5/Tools/scripts/crlf.py
+lib/python2.5/Tools/scripts/cvsfiles.py
+lib/python2.5/Tools/scripts/db2pickle.py
+lib/python2.5/Tools/scripts/diff.py
+lib/python2.5/Tools/scripts/dutree.doc
+lib/python2.5/Tools/scripts/dutree.py
+lib/python2.5/Tools/scripts/eptags.py
+lib/python2.5/Tools/scripts/finddiv.py
+lib/python2.5/Tools/scripts/findlinksto.py
+lib/python2.5/Tools/scripts/findnocoding.py
+lib/python2.5/Tools/scripts/fixcid.py
+lib/python2.5/Tools/scripts/fixdiv.py
+lib/python2.5/Tools/scripts/fixheader.py
+lib/python2.5/Tools/scripts/fixnotice.py
+lib/python2.5/Tools/scripts/fixps.py
+lib/python2.5/Tools/scripts/ftpmirror.py
+lib/python2.5/Tools/scripts/google.py
+lib/python2.5/Tools/scripts/gprof2html.py
+lib/python2.5/Tools/scripts/h2py.py
+lib/python2.5/Tools/scripts/hotshotmain.py
+lib/python2.5/Tools/scripts/idle
+lib/python2.5/Tools/scripts/ifdef.py
+lib/python2.5/Tools/scripts/lfcr.py
+lib/python2.5/Tools/scripts/linktree.py
+lib/python2.5/Tools/scripts/lll.py
+lib/python2.5/Tools/scripts/logmerge.py
+lib/python2.5/Tools/scripts/mailerdaemon.py
+lib/python2.5/Tools/scripts/md5sum.py
+lib/python2.5/Tools/scripts/methfix.py
+lib/python2.5/Tools/scripts/mkreal.py
+lib/python2.5/Tools/scripts/ndiff.py
+lib/python2.5/Tools/scripts/nm2def.py
+lib/python2.5/Tools/scripts/objgraph.py
+lib/python2.5/Tools/scripts/parseentities.py
+lib/python2.5/Tools/scripts/pathfix.py
+lib/python2.5/Tools/scripts/pdeps.py
+lib/python2.5/Tools/scripts/pickle2db.py
+lib/python2.5/Tools/scripts/pindent.py
+lib/python2.5/Tools/scripts/ptags.py
+lib/python2.5/Tools/scripts/pydoc
+@comment lib/python2.5/Tools/scripts/pydoc.orig
+lib/python2.5/Tools/scripts/pydocgui.pyw
+lib/python2.5/Tools/scripts/pysource.py
+lib/python2.5/Tools/scripts/redemo.py
+lib/python2.5/Tools/scripts/reindent.py
+lib/python2.5/Tools/scripts/rgrep.py
+lib/python2.5/Tools/scripts/setup.py
+lib/python2.5/Tools/scripts/suff.py
+lib/python2.5/Tools/scripts/svneol.py
+lib/python2.5/Tools/scripts/texcheck.py
+lib/python2.5/Tools/scripts/texi2html.py
+lib/python2.5/Tools/scripts/treesync.py
+lib/python2.5/Tools/scripts/untabify.py
+lib/python2.5/Tools/scripts/which.py
+lib/python2.5/Tools/scripts/xxci.py
+lib/python2.5/Tools/unicode/
+lib/python2.5/Tools/unicode/Makefile
+lib/python2.5/Tools/unicode/comparecodecs.py
+lib/python2.5/Tools/unicode/gencjkcodecs.py
+lib/python2.5/Tools/unicode/gencodec.py
+lib/python2.5/Tools/unicode/listcodecs.py
+lib/python2.5/Tools/unicode/makeunicodedata.py
+lib/python2.5/Tools/unicode/mkstringprep.py
+lib/python2.5/Tools/unicode/python-mappings/
+lib/python2.5/Tools/unicode/python-mappings/CP1140.TXT
+lib/python2.5/Tools/unicode/python-mappings/KOI8-U.TXT
+lib/python2.5/Tools/unicode/python-mappings/TIS-620.TXT
+lib/python2.5/Tools/versioncheck/
+lib/python2.5/Tools/versioncheck/README
+lib/python2.5/Tools/versioncheck/_checkversion.py
+lib/python2.5/Tools/versioncheck/checkversions.py
+lib/python2.5/Tools/versioncheck/pyversioncheck.py
+lib/python2.5/Tools/webchecker/
+lib/python2.5/Tools/webchecker/README
+lib/python2.5/Tools/webchecker/tktools.py
+lib/python2.5/Tools/webchecker/wcgui.py
+lib/python2.5/Tools/webchecker/wcmac.py
+lib/python2.5/Tools/webchecker/webchecker.py
+lib/python2.5/Tools/webchecker/websucker.py
+lib/python2.5/Tools/webchecker/wsgui.py
+lib/python2.5/Tools/world/
+lib/python2.5/Tools/world/README
+lib/python2.5/Tools/world/world
--- a/lang/python/2.5/pkg/UNMESSAGE
+++ b/lang/python/2.5/pkg/UNMESSAGE
@ -0,0 +1,3 @@
+Don't forget to remove ${PREFIX}/bin/python or/and
+${PREFIX}/bin/pydoc if they were symlinks to
+${PREFIX}/bin/python2.5 or to ${PREFIX}/bin/pydoc2.5.
--- a/lang/python/2.5/pkg/UNMESSAGE-idle
+++ b/lang/python/2.5/pkg/UNMESSAGE-idle
@ -0,0 +1,2 @@
+Don't forget to remove ${PREFIX}/bin/idle
+if it was a symlink to ${PREFIX}/bin/idle2.5.
				`@ -0,0 +1 @@`
				`This package contains bzip2 compression module.`
				`@ -0,0 +1 @@`
				`This package contains support for the expat XML parser.`