Hi,
This updates lang/python/2.6 tfrom 2.6.1 to 2.6.2 and simplifies the
Makefile patching a little bit. Please test.
Also, is there any interest in moving MODPY_VERSION to 2.6 in this
release?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.6/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 16 Mar 2009 11:40:24 -0000 1.4
+++ Makefile 20 Apr 2009 01:42:37 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2009/03/16 11:40:24 espie Exp $
VERSION= 2.6
-PATCHLEVEL= .1
-PKG_PATCHLEVEL= p0
+PATCHLEVEL= .2
+#PKG_PATCHLEVEL= p0
SHARED_LIBS= python2.6 1.0
# PSUBDIR= python/${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.6/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 1 Jan 2009 21:03:27 -0000 1.2
+++ distinfo 20 Apr 2009 01:42:37 -0000
@@ -1,5 +1,5 @@
-MD5 (Python-2.6.1.tgz) = UrPUIfQrrP3K9V9WwP+b5A==
-RMD160 (Python-2.6.1.tgz) = Dn9XumHXN1wUim/y5VDNSUOizos=
-SHA1 (Python-2.6.1.tgz) = Learu/nu77ygV0qv7Cpy5la6fQM=
-SHA256 (Python-2.6.1.tgz) = +2XpNnjhMn4+hVnMVuHgDtjAcWKyEoejUCZ3iSxcUVw=
-SIZE (Python-2.6.1.tgz) = 13046455
+MD5 (Python-2.6.2.tgz) = YOZP5V604jq91Nd/2tCMPQ==
+RMD160 (Python-2.6.2.tgz) = a2KkgbRtzuJo2otNhHyHxIGqJB8=
+SHA1 (Python-2.6.2.tgz) = 2suMREE4k/xXVdkdsmBCI0ZYyOA=
+SHA256 (Python-2.6.2.tgz) = 437N8knySPT+oietvKCcd4Zwtk/LXkWUfsPgk8vBLIY=
+SIZE (Python-2.6.2.tgz) = 13281177
Index: 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.1
diff -u -p -r1.1 patch-Lib_distutils_command_build_ext_py
--- patches/patch-Lib_distutils_command_build_ext_py 18 Oct 2008 12:03:56
-0000 1.1
+++ patches/patch-Lib_distutils_command_build_ext_py 20 Apr 2009 01:42:37
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_distutils_command_build_ext_py,v 1.1 2008/10/18 12:03:56
djm Exp $
---- Lib/distutils/command/build_ext.py.orig Sun Aug 17 14:16:04 2008
-+++ Lib/distutils/command/build_ext.py Mon Aug 25 07:43:08 2008
-@@ -758,13 +758,6 @@ class build_ext (Command):
+--- Lib/distutils/command/build_ext.py.orig Fri Feb 6 09:55:00 2009
++++ Lib/distutils/command/build_ext.py Sun Apr 19 10:28:50 2009
+@@ -760,13 +760,6 @@ class build_ext (Command):
return ext.libraries
else:
Index: patches/patch-Lib_test_test_fileio_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Lib_test_test_fileio_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Lib_test_test_fileio_py
--- patches/patch-Lib_test_test_fileio_py 18 Oct 2008 12:03:56 -0000
1.1
+++ patches/patch-Lib_test_test_fileio_py 20 Apr 2009 01:42:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_test_test_fileio_py,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Lib/test/test_fileio.py.orig Tue Sep 2 00:13:43 2008
-+++ Lib/test/test_fileio.py Wed Sep 17 10:49:32 2008
-@@ -150,6 +150,7 @@ class OtherFileTests(unittest.TestCase):
+--- Lib/test/test_fileio.py.orig Tue Jan 20 08:02:45 2009
++++ Lib/test/test_fileio.py Sun Apr 19 10:28:51 2009
+@@ -152,6 +152,7 @@ class OtherFileTests(unittest.TestCase):
self.assertEquals(f.writable(), True)
if sys.platform != "darwin" and \
not sys.platform.startswith('freebsd') and \
Index: patches/patch-Lib_test_test_sys_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Lib_test_test_sys_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Lib_test_test_sys_py
--- patches/patch-Lib_test_test_sys_py 18 Oct 2008 12:03:56 -0000 1.1
+++ patches/patch-Lib_test_test_sys_py 20 Apr 2009 01:42:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_test_test_sys_py,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Lib/test/test_sys.py.orig Mon Jul 14 18:42:18 2008
-+++ Lib/test/test_sys.py Mon Aug 25 07:43:08 2008
-@@ -348,10 +348,11 @@ class SysModuleTest(unittest.TestCase):
+--- Lib/test/test_sys.py.orig Mon Apr 6 07:21:05 2009
++++ Lib/test/test_sys.py Sun Apr 19 10:28:52 2009
+@@ -353,10 +353,11 @@ class SysModuleTest(unittest.TestCase):
self.assert_(vi[3] in ("alpha", "beta", "candidate", "final"))
self.assert_(isinstance(vi[4], int))
Index: patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Makefile_pre_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in 18 Oct 2008 12:03:56 -0000 1.1
+++ patches/patch-Makefile_pre_in 20 Apr 2009 01:42:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_pre_in,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Makefile.pre.in.orig Sat Sep 6 08:59:17 2008
-+++ Makefile.pre.in Wed Sep 17 10:49:33 2008
+--- Makefile.pre.in.orig Tue Feb 24 22:07:44 2009
++++ Makefile.pre.in Sun Apr 19 23:12:20 2009
@@ -350,6 +350,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
@@ -18,9 +18,9 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1 20
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util
import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -421,6 +424,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
+@@ -425,6 +428,11 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
+ $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS)
$(LIBC) $(LIBM) $(LDLAST)
+# This rule for OpenBSD...
+$(LDLIBRARY): $(LIBRARY)
@@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1 20
# 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.
-@@ -752,14 +760,13 @@ bininstall: altbininstall
+@@ -760,14 +768,13 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@@ -46,25 +46,17 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1 20
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -768,14 +775,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)); \
+@@ -783,7 +790,8 @@ altbininstall: $(BUILDPYTHON)
+ $(INSTALL_SHARED) $(LDLIBRARY)
$(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
+ if test $(LDLIBRARY) != $(INSTSONAME); then \
+ (cd $(DESTDIR)$(LIBDIR); $(LN) -sf
$(INSTSONAME) $(LDLIBRARY)) \
- fi \
-+ $(INSTALL_SHARED) $(LDLIBRARY)
$(DESTDIR)$(LIBPL)/$(LDLIBRARY); \
-+ (cd $(DESTDIR)$(LIBDIR); $(LN) -s
python$(VERSION)/config/$(LDLIBRARY)); \
++ fi ; \
++ (cd $(DESTDIR)$(LIBPL); $(LN) -sf
$(LIBDIR)/$(LDLIBRARY)) \
fi; \
else true; \
fi
-@@ -791,7 +796,7 @@ maninstall:
+@@ -799,7 +807,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
@@ -73,7 +65,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1 20
# Install the library
PLATDIR= plat-$(MACHDEP)
-@@ -898,8 +903,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+@@ -906,8 +914,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: patches/patch-Modules_mathmodule_c
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Modules_mathmodule_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Modules_mathmodule_c
--- patches/patch-Modules_mathmodule_c 18 Oct 2008 12:03:56 -0000 1.1
+++ patches/patch-Modules_mathmodule_c 20 Apr 2009 01:42:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_mathmodule_c,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Modules/mathmodule.c.orig Mon Aug 25 15:23:28 2008
-+++ Modules/mathmodule.c Mon Aug 25 15:25:09 2008
-@@ -183,7 +183,7 @@ math_1(PyObject *arg, double (*func) (double), int can
+--- Modules/mathmodule.c.orig Mon Dec 22 04:01:26 2008
++++ Modules/mathmodule.c Sun Apr 19 10:28:53 2009
+@@ -235,7 +235,7 @@ math_1(PyObject *arg, double (*func) (double), int can
else
errno = 0;
}
Index: patches/patch-Modules_socketmodule_c
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-Modules_socketmodule_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Modules_socketmodule_c
--- patches/patch-Modules_socketmodule_c 18 Oct 2008 12:03:56 -0000
1.1
+++ patches/patch-Modules_socketmodule_c 20 Apr 2009 01:42:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_socketmodule_c,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Modules/socketmodule.c.orig Wed Aug 13 00:49:50 2008
-+++ Modules/socketmodule.c Mon Aug 25 07:43:08 2008
+--- Modules/socketmodule.c.orig Wed Apr 1 04:20:48 2009
++++ Modules/socketmodule.c Sun Apr 19 10:28:55 2009
@@ -93,9 +93,6 @@ Local naming conventions:
#include "Python.h"
#include "structmember.h"
@@ -11,7 +11,7 @@ $OpenBSD: patch-Modules_socketmodule_c,v
/* Socket object documentation */
PyDoc_STRVAR(sock_doc,
"socket([family[, type[, proto]]]) -> socket object\n\
-@@ -3742,7 +3739,7 @@ socket_inet_aton(PyObject *self, PyObject *args)
+@@ -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 */
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-configure_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_in
--- patches/patch-configure_in 18 Oct 2008 12:03:56 -0000 1.1
+++ patches/patch-configure_in 20 Apr 2009 01:42:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1 2008/10/18 12:03:56 djm Exp $
---- configure.in.orig Mon Sep 8 05:18:16 2008
-+++ configure.in Wed Sep 17 10:56:06 2008
-@@ -251,7 +251,7 @@ case $ac_sys_system/$ac_sys_release in
+--- configure.in.orig Tue Mar 31 03:56:14 2009
++++ configure.in Sun Apr 19 10:28:55 2009
+@@ -253,7 +253,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.
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.1 2008/
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
-@@ -1674,27 +1674,13 @@ then
+@@ -1683,27 +1683,13 @@ then
;;
Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
BSD/OS*/4*) LDSHARED="gcc -shared";;
@@ -39,9 +39,9 @@ $OpenBSD: patch-configure_in,v 1.1 2008/
NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
-@@ -1846,9 +1832,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for
HP-U
+@@ -1855,9 +1841,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for
HP-U
- # only check for sem_ini if thread support is requested
+ # only check for sem_init 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
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 1 Jan 2009 21:03:27 -0000 1.2
+++ patches/patch-setup_py 20 Apr 2009 01:42:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.2 2009/01/01 21:03:27 djm Exp $
---- setup.py.orig Wed Nov 5 07:43:31 2008
-+++ setup.py Fri Dec 26 12:40:47 2008
+--- setup.py.orig Wed Apr 1 04:20:48 2009
++++ setup.py Sun Apr 19 10:28:55 2009
@@ -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.2 2009/01/0
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -613,8 +618,6 @@ class PyBuildExt(build_ext):
+@@ -614,8 +619,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.2 2009/01/0
]
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
-@@ -625,9 +628,7 @@ class PyBuildExt(build_ext):
+@@ -626,9 +629,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.2 2009/01/0
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -721,7 +722,7 @@ class PyBuildExt(build_ext):
+@@ -722,7 +723,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.2 2009/01/0
return False
return True
-@@ -784,6 +785,7 @@ class PyBuildExt(build_ext):
+@@ -785,6 +786,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.2 2009/01/0
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
-@@ -840,6 +842,7 @@ class PyBuildExt(build_ext):
+@@ -841,6 +843,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.2 2009/01/0
db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
# Look for a version specific db-X.Y before an ambiguoius dbX
-@@ -848,6 +851,7 @@ class PyBuildExt(build_ext):
+@@ -849,6 +852,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.2 2009/01/0
('db%d' % db_ver[0])):
dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib )
-@@ -895,6 +899,7 @@ class PyBuildExt(build_ext):
+@@ -896,6 +900,7 @@ class PyBuildExt(build_ext):
'/usr/local/include/sqlite',
'/usr/local/include/sqlite3',
]
@@ -85,7 +85,7 @@ $OpenBSD: patch-setup_py,v 1.2 2009/01/0
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
for x in MIN_SQLITE_VERSION_NUMBER])
-@@ -933,6 +938,7 @@ class PyBuildExt(build_ext):
+@@ -934,6 +939,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.2 2009/01/0
sqlite_libfile = self.compiler.find_library_file(
sqlite_dirs_to_check + lib_dirs, 'sqlite3')
if sqlite_libfile:
-@@ -989,7 +995,7 @@ class PyBuildExt(build_ext):
+@@ -990,7 +996,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.2 2009/01/0
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -1193,10 +1199,8 @@ class PyBuildExt(build_ext):
+@@ -1205,10 +1211,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.2 2009/01/0
))
# Fredrik Lundh's cElementTree module. Note that this also
-@@ -1279,6 +1283,14 @@ class PyBuildExt(build_ext):
+@@ -1300,6 +1304,14 @@ class PyBuildExt(build_ext):
)
libraries = []
@@ -129,7 +129,7 @@ $OpenBSD: patch-setup_py,v 1.2 2009/01/0
else: # Linux and other unices
macros = dict(
HAVE_SEM_OPEN=1,
-@@ -1319,6 +1331,9 @@ class PyBuildExt(build_ext):
+@@ -1340,6 +1352,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.2 2009/01/0
else:
missing.append('ossaudiodev')
-@@ -1473,7 +1488,7 @@ class PyBuildExt(build_ext):
+@@ -1494,7 +1509,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.2 2009/01/0
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1520,8 +1535,7 @@ class PyBuildExt(build_ext):
+@@ -1541,8 +1556,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.2 2009/01/0
tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
version)
if tklib and tcllib:
-@@ -1562,17 +1576,9 @@ class PyBuildExt(build_ext):
+@@ -1583,17 +1597,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.2 2009/01/0
# If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin':
-@@ -1872,7 +1878,7 @@ def main():
+@@ -1893,7 +1899,7 @@ def main():
# Scripts to install
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
'Tools/scripts/2to3',
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 1 Jan 2009 21:03:27 -0000 1.2
+++ pkg/PLIST-main 20 Apr 2009 01:42:37 -0000
@@ -156,6 +156,7 @@ lib/python2.6/Tools/pybench/With.py
lib/python2.6/Tools/scripts/
lib/python2.6/Tools/scripts/2to3
lib/python2.6/Tools/scripts/patchcheck.py
+lib/python2.6/Tools/scripts/reindent-rst.py
lib/python2.6/Tools/scripts/win_add2path.py
lib/python2.6/Tools/ssl/
lib/python2.6/Tools/ssl/get-remote-certificate.py
@@ -528,6 +529,9 @@ lib/python2.6/distutils/tests/__init__.p
lib/python2.6/distutils/tests/support.py
lib/python2.6/distutils/tests/support.pyc
lib/python2.6/distutils/tests/support.pyo
+lib/python2.6/distutils/tests/test_bdist_wininst.py
+lib/python2.6/distutils/tests/test_bdist_wininst.pyc
+lib/python2.6/distutils/tests/test_bdist_wininst.pyo
lib/python2.6/distutils/tests/test_build_ext.py
lib/python2.6/distutils/tests/test_build_ext.pyc
lib/python2.6/distutils/tests/test_build_ext.pyo
@@ -546,12 +550,24 @@ lib/python2.6/distutils/tests/test_core.
lib/python2.6/distutils/tests/test_dist.py
lib/python2.6/distutils/tests/test_dist.pyc
lib/python2.6/distutils/tests/test_dist.pyo
+lib/python2.6/distutils/tests/test_filelist.py
+lib/python2.6/distutils/tests/test_filelist.pyc
+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_scripts.py
lib/python2.6/distutils/tests/test_install_scripts.pyc
lib/python2.6/distutils/tests/test_install_scripts.pyo
+lib/python2.6/distutils/tests/test_msvc9compiler.py
+lib/python2.6/distutils/tests/test_msvc9compiler.pyc
+lib/python2.6/distutils/tests/test_msvc9compiler.pyo
+lib/python2.6/distutils/tests/test_register.py
+lib/python2.6/distutils/tests/test_register.pyc
+lib/python2.6/distutils/tests/test_register.pyo
+lib/python2.6/distutils/tests/test_sdist.py
+lib/python2.6/distutils/tests/test_sdist.pyc
+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
@@ -1241,7 +1257,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.1-py2.6.egg-info
+lib/python2.6/lib-dynload/Python-2.6.2-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
@@ -1306,9 +1322,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.1.final.0.pickle
+lib/python2.6/lib2to3/Grammar2.6.2.final.0.pickle
lib/python2.6/lib2to3/PatternGrammar.txt
-lib/python2.6/lib2to3/PatternGrammar2.6.1.final.0.pickle
+lib/python2.6/lib2to3/PatternGrammar2.6.2.final.0.pickle
lib/python2.6/lib2to3/__init__.py
lib/python2.6/lib2to3/__init__.pyc
lib/python2.6/lib2to3/__init__.pyo
@@ -1379,6 +1395,9 @@ lib/python2.6/lib2to3/fixes/fix_input.py
lib/python2.6/lib2to3/fixes/fix_intern.py
lib/python2.6/lib2to3/fixes/fix_intern.pyc
lib/python2.6/lib2to3/fixes/fix_intern.pyo
+lib/python2.6/lib2to3/fixes/fix_isinstance.py
+lib/python2.6/lib2to3/fixes/fix_isinstance.pyc
+lib/python2.6/lib2to3/fixes/fix_isinstance.pyo
lib/python2.6/lib2to3/fixes/fix_itertools.py
lib/python2.6/lib2to3/fixes/fix_itertools.pyc
lib/python2.6/lib2to3/fixes/fix_itertools.pyo
@@ -1421,6 +1440,9 @@ lib/python2.6/lib2to3/fixes/fix_raise.py
lib/python2.6/lib2to3/fixes/fix_raw_input.py
lib/python2.6/lib2to3/fixes/fix_raw_input.pyc
lib/python2.6/lib2to3/fixes/fix_raw_input.pyo
+lib/python2.6/lib2to3/fixes/fix_reduce.py
+lib/python2.6/lib2to3/fixes/fix_reduce.pyc
+lib/python2.6/lib2to3/fixes/fix_reduce.pyo
lib/python2.6/lib2to3/fixes/fix_renames.py
lib/python2.6/lib2to3/fixes/fix_renames.pyc
lib/python2.6/lib2to3/fixes/fix_renames.pyo
@@ -1510,9 +1532,6 @@ lib/python2.6/lib2to3/tests/
lib/python2.6/lib2to3/tests/__init__.py
lib/python2.6/lib2to3/tests/__init__.pyc
lib/python2.6/lib2to3/tests/__init__.pyo
-lib/python2.6/lib2to3/tests/benchmark.py
-lib/python2.6/lib2to3/tests/benchmark.pyc
-lib/python2.6/lib2to3/tests/benchmark.pyo
lib/python2.6/lib2to3/tests/pytree_idempotency.py
lib/python2.6/lib2to3/tests/pytree_idempotency.pyc
lib/python2.6/lib2to3/tests/pytree_idempotency.pyo
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-tests,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tests
--- pkg/PLIST-tests 1 Jan 2009 21:03:28 -0000 1.2
+++ pkg/PLIST-tests 20 Apr 2009 01:42:38 -0000
@@ -1362,6 +1362,9 @@ lib/python2.6/test/test_zipfile64.pyo
lib/python2.6/test/test_zipimport.py
lib/python2.6/test/test_zipimport.pyc
lib/python2.6/test/test_zipimport.pyo
+lib/python2.6/test/test_zipimport_support.py
+lib/python2.6/test/test_zipimport_support.pyc
+lib/python2.6/test/test_zipimport_support.pyo
lib/python2.6/test/test_zlib.py
lib/python2.6/test/test_zlib.pyc
lib/python2.6/test/test_zlib.pyo
@@ -1392,3 +1395,4 @@ lib/python2.6/test/wrongcert.pem
lib/python2.6/test/xmltests.py
lib/python2.6/test/xmltests.pyc
lib/python2.6/test/xmltests.pyo
+lib/python2.6/test/zipdir.zip
Index: pkg/PLIST-tools
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-tools,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-tools
--- pkg/PLIST-tools 18 Oct 2008 12:03:56 -0000 1.1
+++ pkg/PLIST-tools 20 Apr 2009 01:42:38 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-tools,v 1.1 2008/10/18 12:03:56 djm Exp $
@option no-default-conflict
@conflict python-tools->=2.6,<2.6
-lib/python2.6/Tools/
lib/python2.6/Tools/README
lib/python2.6/Tools/audiopy/
lib/python2.6/Tools/audiopy/README
@@ -23,7 +22,6 @@ lib/python2.6/Tools/bgen/bgen/bgenType.p
lib/python2.6/Tools/bgen/bgen/bgenVariable.py
lib/python2.6/Tools/bgen/bgen/macsupport.py
lib/python2.6/Tools/bgen/bgen/scantools.py
-lib/python2.6/Tools/buildbot/
lib/python2.6/Tools/buildbot/build.bat
lib/python2.6/Tools/buildbot/buildmsi.bat
lib/python2.6/Tools/buildbot/clean.bat
@@ -109,7 +107,6 @@ lib/python2.6/Tools/modulator/Tkextra.py
lib/python2.6/Tools/modulator/genmodule.py
lib/python2.6/Tools/modulator/modulator.py
lib/python2.6/Tools/modulator/varsubst.py
-lib/python2.6/Tools/msi/
lib/python2.6/Tools/msi/README.txt
lib/python2.6/Tools/msi/msi.py
lib/python2.6/Tools/msi/msilib.py
@@ -119,7 +116,6 @@ lib/python2.6/Tools/msi/schema.py
lib/python2.6/Tools/msi/sequence.py
lib/python2.6/Tools/msi/uisample.py
lib/python2.6/Tools/msi/uuids.py
-lib/python2.6/Tools/pybench/
lib/python2.6/Tools/pybench/Arithmetic.py
lib/python2.6/Tools/pybench/Calls.py
lib/python2.6/Tools/pybench/CommandLine.py
@@ -167,7 +163,6 @@ lib/python2.6/Tools/pynche/pynche
lib/python2.6/Tools/pynche/pynche.pyw
lib/python2.6/Tools/pynche/webcolors.txt
lib/python2.6/Tools/pynche/websafe.txt
-lib/python2.6/Tools/scripts/
lib/python2.6/Tools/scripts/README
lib/python2.6/Tools/scripts/byext.py
lib/python2.6/Tools/scripts/byteyears.py
