Hi,
Since the plan is to make 2.6 the default, some people have mentioned the
python update posted on ports@ some time ago, so below is the update as well
as moving the default.
I've not removed 2.5 for the time being as some have shown some concerns
and we can always kill it later.
So if you're interested in or using python please test the diff below,
specially on something else than i386 and amd64, although more testing on
those won't hurt.
I just tested it on i386 so far.
f.-
Index: devel/subversion/Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.71
diff -N -u -p devel/subversion/Makefile
--- devel/subversion/Makefile 23 Jun 2010 17:38:29 -0000 1.71
+++ devel/subversion/Makefile 23 Jun 2010 18:58:13 -0000
@@ -179,7 +179,7 @@ CONFIGURE_ARGS+=--without-apxs
.endif
REGRESS_DEPENDS=::lang/python/${MODPY_VERSION}
-MODPY_VERSION?= 2.5
+MODPY_VERSION?= 2.6
SUBST_VARS+= LOCALBASE SO_VERSION
pre-patch:
Index: lang/python/python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.31
diff -N -u -p lang/python/python.port.mk
--- lang/python/python.port.mk 27 Feb 2010 17:52:18 -0000 1.31
+++ lang/python/python.port.mk 23 Jun 2010 18:58:14 -0000
@@ -7,11 +7,9 @@ SHARED_ONLY= Yes
CATEGORIES+= lang/python
-# XXX x11/gtk+2 hardcodes this.
-MODPY_VERSION?= 2.5
-.if ${MODPY_VERSION} == 2.3
-MODPY_VSPEC = >=${MODPY_VERSION},<2.4
-.elif ${MODPY_VERSION} == 2.4
+# XXX devel/subversion, x11/gtk+2 and x11/pinot hardcode this.
+MODPY_VERSION?= 2.6
+.if ${MODPY_VERSION} == 2.4
MODPY_VSPEC = >=${MODPY_VERSION},<2.5
.elif ${MODPY_VERSION} == 2.5
MODPY_VSPEC = >=${MODPY_VERSION},<2.6
Index: lang/python/2.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.6/Makefile,v
retrieving revision 1.16
diff -N -u -p lang/python/2.6/Makefile
--- lang/python/2.6/Makefile 15 Apr 2010 18:35:02 -0000 1.16
+++ lang/python/2.6/Makefile 23 Jun 2010 18:58:14 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.16 2010/04/15 18:35:02 jasper Exp $
VERSION= 2.6
-PATCHLEVEL= .3
-PKG_PATCHLEVEL= p3
+PATCHLEVEL= .5
SHARED_LIBS= python2.6 1.0
# PSUBDIR= python/${VERSION}
Index: lang/python/2.6/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.6/distinfo,v
retrieving revision 1.4
diff -N -u -p lang/python/2.6/distinfo
--- lang/python/2.6/distinfo 16 Oct 2009 09:38:20 -0000 1.4
+++ lang/python/2.6/distinfo 23 Jun 2010 18:58:14 -0000
@@ -1,5 +1,5 @@
-MD5 (Python-2.6.3.tgz) = xIQlMhcPwKb56HhJfvwN3w==
-RMD160 (Python-2.6.3.tgz) = MA2Hj9fwI5MYjrMIsgyReTgHPUA=
-SHA1 (Python-2.6.3.tgz) = QaUefPXpit3OG2xOSpnqEoUxHfg=
-SHA256 (Python-2.6.3.tgz) = pxtVVAaQQl/YKrAIGa65LBsjy7RzCgzNLiXIM7IqgS4=
-SIZE (Python-2.6.3.tgz) = 13319447
+MD5 (Python-2.6.5.tgz) = zQS1uTg7bB/M2qmRr3Ys9A==
+RMD160 (Python-2.6.5.tgz) = H8cyzIpdCm6QfntysuWQhYy01Kw=
+SHA1 (Python-2.6.5.tgz) = VeMBXMYeohEePsm8sipift8UagA=
+SHA256 (Python-2.6.5.tgz) = szHa/c4zYYNP7ng3ldT2iufPfTeekTfC2OhTHOphXt4=
+SIZE (Python-2.6.5.tgz) = 13209175
Index: lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py
===================================================================
RCS file:
/cvs/ports/lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py,v
retrieving revision 1.3
diff -N -u -p lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py
--- lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py 16 Oct
2009 09:38:20 -0000 1.3
+++ lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py 23 Jun
2010 18:58:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_distutils_command_build_ext_py,v 1.3 2009/10/16 09:38:20
djm Exp $
---- Lib/distutils/command/build_ext.py.orig Wed Sep 9 21:39:41 2009
-+++ Lib/distutils/command/build_ext.py Mon Oct 5 07:12:37 2009
-@@ -750,13 +750,6 @@ class build_ext (Command):
+--- Lib/distutils/command/build_ext.py.orig Tue Oct 13 22:17:34 2009
++++ Lib/distutils/command/build_ext.py Thu Jun 17 13:04:43 2010
+@@ -755,13 +755,6 @@ class build_ext (Command):
return ext.libraries
else:
Index: lang/python/2.6/patches/patch-Lib_test_regrtest_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Lib_test_regrtest_py,v
retrieving revision 1.2
diff -N -u -p lang/python/2.6/patches/patch-Lib_test_regrtest_py
--- lang/python/2.6/patches/patch-Lib_test_regrtest_py 1 Jan 2009 21:03:27
-0000 1.2
+++ lang/python/2.6/patches/patch-Lib_test_regrtest_py 23 Jun 2010 18:58:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_test_regrtest_py,v 1.2 2009/01/01 21:03:27 djm Exp $
---- Lib/test/regrtest.py.orig Tue Sep 30 10:15:45 2008
-+++ Lib/test/regrtest.py Sun Dec 21 10:00:44 2008
-@@ -1074,6 +1074,7 @@ _expectations = {
+--- Lib/test/regrtest.py.orig Sun Nov 15 00:17:17 2009
++++ Lib/test/regrtest.py Thu Jun 17 13:04:43 2010
+@@ -1078,6 +1078,7 @@ _expectations = {
test_epoll
test_gdbm
test_locale
@@ -9,7 +9,7 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1.2 2009/01/01
test_normalization
test_ossaudiodev
test_pep277
-@@ -1101,6 +1102,8 @@ _expectations['freebsd5'] = _expectations['freebsd4']
+@@ -1105,6 +1106,8 @@ _expectations['freebsd5'] = _expectations['freebsd4']
_expectations['freebsd6'] = _expectations['freebsd4']
_expectations['freebsd7'] = _expectations['freebsd4']
_expectations['freebsd8'] = _expectations['freebsd4']
Index: lang/python/2.6/patches/patch-Lib_test_test_signal_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Lib_test_test_signal_py,v
retrieving revision 1.1
diff -N -u -p lang/python/2.6/patches/patch-Lib_test_test_signal_py
--- lang/python/2.6/patches/patch-Lib_test_test_signal_py 18 Oct 2008
12:03:56 -0000 1.1
+++ lang/python/2.6/patches/patch-Lib_test_test_signal_py 23 Jun 2010
18:58:14 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-Lib_test_test_signal_py,v 1.1 2008/10/
workarounds for breakage caused by libpthread
---- Lib/test/test_signal.py.orig Mon Apr 7 09:04:28 2008
-+++ Lib/test/test_signal.py Sun Sep 28 05:09:28 2008
+--- Lib/test/test_signal.py.orig Mon Nov 9 19:59:08 2009
++++ Lib/test/test_signal.py Thu Jun 17 13:04:43 2010
@@ -291,6 +291,9 @@ class SiginterruptTest(unittest.TestCase):
self.assertEquals(i, True)
@@ -14,7 +14,7 @@ workarounds for breakage caused by libpthread
i=self.readpipe_interrupted(lambda: signal.siginterrupt(self.signum,
0))
self.assertEquals(i, False)
-@@ -370,6 +373,9 @@ class ItimerTest(unittest.TestCase):
+@@ -377,6 +380,9 @@ class ItimerTest(unittest.TestCase):
self.assertEquals(self.hndl_called, True)
def test_itimer_prof(self):
Index: lang/python/2.6/patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Makefile_pre_in,v
retrieving revision 1.2
diff -N -u -p lang/python/2.6/patches/patch-Makefile_pre_in
--- lang/python/2.6/patches/patch-Makefile_pre_in 3 May 2009 22:26:27
-0000 1.2
+++ lang/python/2.6/patches/patch-Makefile_pre_in 23 Jun 2010 18:58:14
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26:27 djm Exp $
---- Makefile.pre.in.orig Tue Feb 24 22:07:44 2009
-+++ Makefile.pre.in Sun Apr 19 23:12:20 2009
+--- Makefile.pre.in.orig Thu Dec 24 14:19:38 2009
++++ Makefile.pre.in Thu Jun 17 13:51:01 2010
@@ -350,6 +350,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
@@ -10,15 +10,16 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26
# Default target
all: build_all
build_all: $(BUILDPYTHON) oldsharedmods sharedmods
-@@ -386,6 +388,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRAR
+@@ -385,7 +387,7 @@ coverage:
+ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+- $(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
-@@ -425,6 +428,11 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+@@ -425,6 +427,11 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS)
$(LIBC) $(LIBM) $(LDLAST)
@@ -30,7 +31,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26
# 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.
-@@ -760,14 +768,13 @@ bininstall: altbininstall
+@@ -760,14 +767,13 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@@ -46,7 +47,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -783,7 +790,8 @@ altbininstall: $(BUILDPYTHON)
+@@ -783,7 +789,8 @@ altbininstall: $(BUILDPYTHON)
$(INSTALL_SHARED) $(LDLIBRARY)
$(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
if test $(LDLIBRARY) != $(INSTSONAME); then \
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf
$(INSTSONAME) $(LDLIBRARY)) \
@@ -56,7 +57,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26
fi; \
else true; \
fi
-@@ -799,7 +807,7 @@ maninstall:
+@@ -799,7 +806,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
@@ -65,7 +66,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 2009/05/03 22:26
# Install the library
PLATDIR= plat-$(MACHDEP)
-@@ -906,8 +914,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+@@ -906,8 +913,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram,
lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
# Create the PLATDIR source directory, if one wasn't distributed..
Index: lang/python/2.6/patches/patch-Modules_socketmodule_c
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Modules_socketmodule_c,v
retrieving revision 1.2
diff -N -u -p lang/python/2.6/patches/patch-Modules_socketmodule_c
--- lang/python/2.6/patches/patch-Modules_socketmodule_c 3 May 2009
22:26:27 -0000 1.2
+++ lang/python/2.6/patches/patch-Modules_socketmodule_c 23 Jun 2010
18:58:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_socketmodule_c,v 1.2 2009/05/03 22:26:27 djm Exp $
---- Modules/socketmodule.c.orig Wed Apr 1 04:20:48 2009
-+++ Modules/socketmodule.c Sun Apr 19 10:28:55 2009
+--- Modules/socketmodule.c.orig Thu Feb 4 20:26:34 2010
++++ Modules/socketmodule.c Thu Jun 17 13:04:44 2010
@@ -93,9 +93,6 @@ Local naming conventions:
#include "Python.h"
#include "structmember.h"
@@ -11,12 +11,3 @@ $OpenBSD: patch-Modules_socketmodule_c,v 1.2 2009/05/0
/* Socket object documentation */
PyDoc_STRVAR(sock_doc,
"socket([family[, type[, proto]]]) -> socket object\n\
-@@ -3746,7 +3743,7 @@ socket_inet_aton(PyObject *self, PyObject *args)
-
- #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;
-
Index: lang/python/2.6/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-configure_in,v
retrieving revision 1.3
diff -N -u -p lang/python/2.6/patches/patch-configure_in
--- lang/python/2.6/patches/patch-configure_in 16 Oct 2009 09:38:20 -0000
1.3
+++ lang/python/2.6/patches/patch-configure_in 23 Jun 2010 18:58:14 -0000
@@ -1,16 +1,7 @@
$OpenBSD: patch-configure_in,v 1.3 2009/10/16 09:38:20 djm Exp $
---- configure.in.orig Tue Sep 29 23:01:59 2009
-+++ configure.in Mon Oct 5 07:12:38 2009
-@@ -262,7 +262,7 @@ case $ac_sys_system/$ac_sys_release in
- # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
- # even though select is a POSIX function. Reported by J. Ribbens.
- # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-- OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123@:>@)
-+ OpenBSD/*)
- define_xopen_source=no
- # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
- # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -1768,27 +1768,13 @@ then
+--- configure.in.orig Tue Mar 9 21:47:28 2010
++++ configure.in Thu Jun 17 13:04:44 2010
+@@ -1815,27 +1815,13 @@ then
;;
Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
BSD/OS*/4*) LDSHARED="gcc -shared";;
@@ -39,7 +30,7 @@ $OpenBSD: patch-configure_in,v 1.3 2009/10/16 09:38:20
NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
-@@ -1940,9 +1926,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for
HP-U
+@@ -1987,9 +1973,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for
HP-U
# only check for sem_init if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
Index: lang/python/2.6/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-setup_py,v
retrieving revision 1.4
diff -N -u -p lang/python/2.6/patches/patch-setup_py
--- lang/python/2.6/patches/patch-setup_py 16 Oct 2009 09:38:20 -0000
1.4
+++ lang/python/2.6/patches/patch-setup_py 23 Jun 2010 18:58:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm Exp $
---- setup.py.orig Sun Sep 20 20:37:33 2009
-+++ setup.py Mon Oct 5 07:12:38 2009
+--- setup.py.orig Mon Mar 8 07:08:25 2010
++++ setup.py Thu Jun 17 13:04:45 2010
@@ -19,6 +19,11 @@ from distutils.command.install_lib import install_lib
# This global variable is used to hold the list of modules to be disabled.
disabled_module_list = []
@@ -24,7 +24,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -614,8 +619,6 @@ class PyBuildExt(build_ext):
+@@ -617,8 +622,6 @@ class PyBuildExt(build_ext):
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -33,7 +33,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
]
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
-@@ -626,9 +629,7 @@ class PyBuildExt(build_ext):
+@@ -629,9 +632,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -44,7 +44,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -722,7 +723,7 @@ class PyBuildExt(build_ext):
+@@ -725,7 +726,7 @@ class PyBuildExt(build_ext):
# BerkeleyDB 4.6.x is not stable on many architectures.
arch = platform_machine()
if arch not in ('i386', 'i486', 'i586', 'i686',
@@ -53,7 +53,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
return False
return True
-@@ -785,6 +786,7 @@ class PyBuildExt(build_ext):
+@@ -788,6 +789,7 @@ class PyBuildExt(build_ext):
std_variants.append(os.path.join(dn, "db3.%d"%x))
db_inc_paths = std_variants + db_inc_paths
@@ -61,7 +61,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
-@@ -841,6 +843,7 @@ class PyBuildExt(build_ext):
+@@ -844,6 +846,7 @@ class PyBuildExt(build_ext):
db_incdir.replace("include", 'lib64'),
db_incdir.replace("include", 'lib'),
]
@@ -69,7 +69,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
# Look for a version specific db-X.Y before an ambiguoius dbX
-@@ -849,6 +852,7 @@ class PyBuildExt(build_ext):
+@@ -852,6 +855,7 @@ class PyBuildExt(build_ext):
# symlink to more general names?
for dblib in (('db-%d.%d' % db_ver),
('db%d%d' % db_ver),
@@ -77,7 +77,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
('db%d' % db_ver[0])):
dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib )
-@@ -896,6 +900,7 @@ class PyBuildExt(build_ext):
+@@ -899,6 +903,7 @@ class PyBuildExt(build_ext):
'/usr/local/include/sqlite',
'/usr/local/include/sqlite3',
]
@@ -85,7 +85,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
for x in MIN_SQLITE_VERSION_NUMBER])
-@@ -934,6 +939,7 @@ class PyBuildExt(build_ext):
+@@ -937,6 +942,7 @@ class PyBuildExt(build_ext):
os.path.join(sqlite_incdir, '..', '..', 'lib64'),
os.path.join(sqlite_incdir, '..', '..', 'lib'),
]
@@ -93,7 +93,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
sqlite_libfile = self.compiler.find_library_file(
sqlite_dirs_to_check + lib_dirs, 'sqlite3')
if sqlite_libfile:
-@@ -990,7 +996,7 @@ class PyBuildExt(build_ext):
+@@ -993,7 +999,7 @@ class PyBuildExt(build_ext):
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
f = "/usr/include/db.h"
@@ -102,7 +102,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -1205,10 +1211,8 @@ class PyBuildExt(build_ext):
+@@ -1209,10 +1215,8 @@ class PyBuildExt(build_ext):
define_macros = define_macros,
include_dirs = [expatinc],
sources = ['pyexpat.c',
@@ -114,7 +114,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
))
# Fredrik Lundh's cElementTree module. Note that this also
-@@ -1300,6 +1304,14 @@ class PyBuildExt(build_ext):
+@@ -1304,6 +1308,14 @@ class PyBuildExt(build_ext):
)
libraries = []
@@ -129,7 +129,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
else: # Linux and other unices
macros = dict(
HAVE_SEM_OPEN=1,
-@@ -1340,6 +1352,9 @@ class PyBuildExt(build_ext):
+@@ -1348,6 +1360,9 @@ class PyBuildExt(build_ext):
if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
'freebsd7', 'freebsd8'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
@@ -139,7 +139,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
else:
missing.append('ossaudiodev')
-@@ -1505,7 +1520,7 @@ class PyBuildExt(build_ext):
+@@ -1513,7 +1528,7 @@ class PyBuildExt(build_ext):
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
# if X11 libs are not found...
@@ -148,7 +148,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1550,8 +1565,7 @@ class PyBuildExt(build_ext):
+@@ -1558,8 +1573,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
@@ -158,7 +158,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
version)
if tklib and tcllib:
-@@ -1592,17 +1606,9 @@ class PyBuildExt(build_ext):
+@@ -1600,17 +1614,9 @@ class PyBuildExt(build_ext):
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
@@ -179,7 +179,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm
# If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin':
-@@ -1902,7 +1908,7 @@ def main():
+@@ -1911,7 +1917,7 @@ def main():
# Scripts to install
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
'Tools/scripts/2to3',
Index: lang/python/2.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-main,v
retrieving revision 1.5
diff -N -u -p lang/python/2.6/pkg/PLIST-main
--- lang/python/2.6/pkg/PLIST-main 20 Jan 2010 08:15:21 -0000 1.5
+++ lang/python/2.6/pkg/PLIST-main 23 Jun 2010 18:58:15 -0000
@@ -529,6 +529,12 @@ lib/python2.6/distutils/tests/
lib/python2.6/distutils/tests/__init__.py
lib/python2.6/distutils/tests/__init__.pyc
lib/python2.6/distutils/tests/__init__.pyo
+lib/python2.6/distutils/tests/setuptools_build_ext.py
+lib/python2.6/distutils/tests/setuptools_build_ext.pyc
+lib/python2.6/distutils/tests/setuptools_build_ext.pyo
+lib/python2.6/distutils/tests/setuptools_extension.py
+lib/python2.6/distutils/tests/setuptools_extension.pyc
+lib/python2.6/distutils/tests/setuptools_extension.pyo
lib/python2.6/distutils/tests/support.py
lib/python2.6/distutils/tests/support.pyc
lib/python2.6/distutils/tests/support.pyo
@@ -559,6 +565,9 @@ lib/python2.6/distutils/tests/test_filelist.pyo
lib/python2.6/distutils/tests/test_install.py
lib/python2.6/distutils/tests/test_install.pyc
lib/python2.6/distutils/tests/test_install.pyo
+lib/python2.6/distutils/tests/test_install_lib.py
+lib/python2.6/distutils/tests/test_install_lib.pyc
+lib/python2.6/distutils/tests/test_install_lib.pyo
lib/python2.6/distutils/tests/test_install_scripts.py
lib/python2.6/distutils/tests/test_install_scripts.pyc
lib/python2.6/distutils/tests/test_install_scripts.pyo
@@ -574,9 +583,15 @@ lib/python2.6/distutils/tests/test_sdist.pyo
lib/python2.6/distutils/tests/test_sysconfig.py
lib/python2.6/distutils/tests/test_sysconfig.pyc
lib/python2.6/distutils/tests/test_sysconfig.pyo
+lib/python2.6/distutils/tests/test_unixccompiler.py
+lib/python2.6/distutils/tests/test_unixccompiler.pyc
+lib/python2.6/distutils/tests/test_unixccompiler.pyo
lib/python2.6/distutils/tests/test_upload.py
lib/python2.6/distutils/tests/test_upload.pyc
lib/python2.6/distutils/tests/test_upload.pyo
+lib/python2.6/distutils/tests/test_util.py
+lib/python2.6/distutils/tests/test_util.pyc
+lib/python2.6/distutils/tests/test_util.pyo
lib/python2.6/distutils/tests/test_versionpredicate.py
lib/python2.6/distutils/tests/test_versionpredicate.pyc
lib/python2.6/distutils/tests/test_versionpredicate.pyo
@@ -727,6 +742,8 @@ lib/python2.6/email/test/data/msg_41.txt
lib/python2.6/email/test/data/msg_42.txt
lib/python2.6/email/test/data/msg_43.txt
lib/python2.6/email/test/data/msg_44.txt
+lib/python2.6/email/test/data/msg_45.txt
+lib/python2.6/email/test/data/msg_46.txt
lib/python2.6/email/test/test_email.py
lib/python2.6/email/test/test_email.pyc
lib/python2.6/email/test/test_email.pyo
@@ -1260,7 +1277,7 @@ lib/python2.6/keyword.py
lib/python2.6/keyword.pyc
lib/python2.6/keyword.pyo
lib/python2.6/lib-dynload/
-lib/python2.6/lib-dynload/Python-2.6.3-py2.6.egg-info
+lib/python2.6/lib-dynload/Python-2.6.5-py2.6.egg-info
lib/python2.6/lib-dynload/_bisect.so
lib/python2.6/lib-dynload/_bytesio.so
lib/python2.6/lib-dynload/_codecs_cn.so
@@ -1325,9 +1342,9 @@ lib/python2.6/lib-dynload/zlib.so
lib/python2.6/lib-old/
lib/python2.6/lib2to3/
lib/python2.6/lib2to3/Grammar.txt
-lib/python2.6/lib2to3/Grammar2.6.3.final.0.pickle
+lib/python2.6/lib2to3/Grammar2.6.5.final.0.pickle
lib/python2.6/lib2to3/PatternGrammar.txt
-lib/python2.6/lib2to3/PatternGrammar2.6.3.final.0.pickle
+lib/python2.6/lib2to3/PatternGrammar2.6.5.final.0.pickle
lib/python2.6/lib2to3/__init__.py
lib/python2.6/lib2to3/__init__.pyc
lib/python2.6/lib2to3/__init__.pyo
@@ -1431,6 +1448,9 @@ lib/python2.6/lib2to3/fixes/fix_nonzero.pyo
lib/python2.6/lib2to3/fixes/fix_numliterals.py
lib/python2.6/lib2to3/fixes/fix_numliterals.pyc
lib/python2.6/lib2to3/fixes/fix_numliterals.pyo
+lib/python2.6/lib2to3/fixes/fix_operator.py
+lib/python2.6/lib2to3/fixes/fix_operator.pyc
+lib/python2.6/lib2to3/fixes/fix_operator.pyo
lib/python2.6/lib2to3/fixes/fix_paren.py
lib/python2.6/lib2to3/fixes/fix_paren.pyc
lib/python2.6/lib2to3/fixes/fix_paren.pyo
@@ -1547,6 +1567,9 @@ lib/python2.6/lib2to3/tests/test_all_fixers.pyo
lib/python2.6/lib2to3/tests/test_fixers.py
lib/python2.6/lib2to3/tests/test_fixers.pyc
lib/python2.6/lib2to3/tests/test_fixers.pyo
+lib/python2.6/lib2to3/tests/test_main.py
+lib/python2.6/lib2to3/tests/test_main.pyc
+lib/python2.6/lib2to3/tests/test_main.pyo
lib/python2.6/lib2to3/tests/test_parser.py
lib/python2.6/lib2to3/tests/test_parser.pyc
lib/python2.6/lib2to3/tests/test_parser.pyo
Index: lang/python/2.6/pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-tests,v
retrieving revision 1.5
diff -N -u -p lang/python/2.6/pkg/PLIST-tests
--- lang/python/2.6/pkg/PLIST-tests 27 Oct 2009 23:35:09 -0000 1.5
+++ lang/python/2.6/pkg/PLIST-tests 23 Jun 2010 18:58:15 -0000
@@ -208,6 +208,9 @@ lib/python2.6/test/keycert.pem
lib/python2.6/test/list_tests.py
lib/python2.6/test/list_tests.pyc
lib/python2.6/test/list_tests.pyo
+lib/python2.6/test/lock_tests.py
+lib/python2.6/test/lock_tests.pyc
+lib/python2.6/test/lock_tests.pyo
lib/python2.6/test/mapping_tests.py
lib/python2.6/test/mapping_tests.pyc
lib/python2.6/test/mapping_tests.pyo
@@ -1057,6 +1060,9 @@ lib/python2.6/test/test_random.pyo
lib/python2.6/test/test_re.py
lib/python2.6/test/test_re.pyc
lib/python2.6/test/test_re.pyo
+lib/python2.6/test/test_readline.py
+lib/python2.6/test/test_readline.pyc
+lib/python2.6/test/test_readline.pyo
lib/python2.6/test/test_repr.py
lib/python2.6/test/test_repr.pyc
lib/python2.6/test/test_repr.pyo
