Hi, Ports!
Update Python 2.5.5 and 2.6.5. Also made small fixes
Tested on i386.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile.inc
--- Makefile.inc 25 Feb 2010 11:02:39 -0000 1.64
+++ Makefile.inc 22 Apr 2010 04:50:15 -0000
@@ -62,7 +62,7 @@ RUN_DEPENDS-idle= ${RUN_DEPENDS} \
::lang/python/${VERSION},-tkinter
LIB_DEPENDS-tkinter= tcl84:tcl->=8.4,<8.5:lang/tcl/8.4 \
tk84:tk->=8.4,<8.5:x11/tk/8.4
-WANTLIB-tkinter= X11 pthread-stubs xcb
+WANTLIB-tkinter= X11
FULLPKGNAME-bsddb= python-bsddb-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
FULLPKGNAME-gdbm= python-gdbm-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
@@ -112,6 +112,9 @@ MAKE_FLAGS+= LD_LIBRARY_PATH=${WRKSRC} P
FAKE_FLAGS+= RANLIB=:
ALL_TARGET?= everything ./Lib/plat-openbsd4
+
+post-extract:
+ @rm -r ${WRKDIST}/Modules/expat
post-configure:
@cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile
Index: 2.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.4/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- 2.4/Makefile 15 Apr 2010 18:35:02 -0000 1.28
+++ 2.4/Makefile 22 Apr 2010 04:50:15 -0000
@@ -2,7 +2,7 @@
VERSION= 2.4
PATCHLEVEL= .6
-PKG_PATCHLEVEL= p3
+PKG_PATCHLEVEL= p4
SHARED_LIBS= python2.4 1.0
BROKEN-mips64 = Floating point exception while generating pyc objects
@@ -11,7 +11,5 @@ BROKEN-mips64 = Floating point exception
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
PATCH_LIST= patch-* sup64-*
.endif
-
-ALL_TARGET?= all ${WRKSRC}/Lib/plat-openbsd4
.include <bsd.port.mk>
Index: 2.4/patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Makefile_pre_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_pre_in
--- 2.4/patches/patch-Makefile_pre_in 1 Jan 2009 21:03:27 -0000 1.4
+++ 2.4/patches/patch-Makefile_pre_in 22 Apr 2010 04:50:15 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-Makefile_pre_in,v 1.4 2009/01/01 21:03:27 djm Exp $
---- Makefile.pre.in.orig Mon Oct 9 03:41:25 2006
-+++ Makefile.pre.in Fri Dec 26 12:27:16 2008
-@@ -315,7 +315,7 @@ all: $(BUILDPYTHON) oldsharedmods sharedmods
+--- Makefile.pre.in.orig Sun Oct 8 23:41:25 2006
++++ Makefile.pre.in Wed Apr 21 22:43:52 2010
+@@ -308,6 +308,8 @@ LIBRARY_OBJS= \
+ #########################################################################
+ # Rules
+
++everything: all $(srcdir)/Lib/$(PLATDIR)
++
+ # Default target
+ all: $(BUILDPYTHON) oldsharedmods sharedmods
+
+@@ -315,7 +317,7 @@ all: $(BUILDPYTHON) oldsharedmods sharedmods
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
@@ -10,7 +19,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.4 20
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util
import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -364,6 +364,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
+@@ -364,6 +366,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
@@ -22,7 +31,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.4 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.
-@@ -626,7 +631,6 @@ bininstall: altbininstall
+@@ -626,7 +633,6 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@@ -30,7 +39,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.4 20
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
-@@ -637,7 +641,7 @@ altbininstall: $(BUILDPYTHON)
+@@ -637,7 +643,7 @@ altbininstall: $(BUILDPYTHON)
exit 1; \
fi; \
fi
@@ -39,7 +48,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.4 20
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -646,14 +650,12 @@ altbininstall: $(BUILDPYTHON)
+@@ -646,14 +652,12 @@ altbininstall: $(BUILDPYTHON)
fi; \
done
$(INSTALL_PROGRAM) $(BUILDPYTHON)
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
@@ -57,7 +66,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.4 20
fi; \
else true; \
fi
-@@ -669,7 +671,7 @@ maninstall:
+@@ -669,7 +673,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
Index: 2.5/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.5/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- 2.5/Makefile 15 Apr 2010 18:35:02 -0000 1.38
+++ 2.5/Makefile 22 Apr 2010 04:50:15 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.38 2010/04/15 18:35:02 jasper Exp $
VERSION= 2.5
-PATCHLEVEL= .4
-PKG_PATCHLEVEL= p5
+PATCHLEVEL= .5
+#PKG_PATCHLEVEL= p0
SHARED_LIBS= python2.5 1.0
BROKEN-mips64 = Floating point exception while generating pyc objects
@@ -14,8 +14,5 @@ PATCH_LIST= patch-* sup64-*
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --with-cxx_main
-
-post-extract:
- rm -r ${WRKDIST}/Modules/expat
.include <bsd.port.mk>
Index: 2.5/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.5/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- 2.5/distinfo 1 Jan 2009 21:03:27 -0000 1.5
+++ 2.5/distinfo 22 Apr 2010 04:50:15 -0000
@@ -1,5 +1,5 @@
-MD5 (Python-2.5.4.tgz) = rUeyN3j2TtraqotVNJhu7Q==
-RMD160 (Python-2.5.4.tgz) = mTXyxccGW19HxjnkUTa0sPhcvrk=
-SHA1 (Python-2.5.4.tgz) = RPSm5cpUpDFtPZ2LgmU7KIi9u3k=
-SHA256 (Python-2.5.4.tgz) = PTsgVhHuUDo4qUM9VkWlcWaEILshkkLH9Rr4XwVmTaY=
-SIZE (Python-2.5.4.tgz) = 11604497
+MD5 (Python-2.5.5.tgz) = q8AhOco49CWOjjcvfaBciA==
+RMD160 (Python-2.5.5.tgz) = 3VkOOO0fGkbADjm29has1ZklOkQ=
+SHA1 (Python-2.5.5.tgz) = v5ni1732C8TotiNs2Y+VoHmZY5M=
+SHA256 (Python-2.5.5.tgz) = A74QGcT+k9rrU7qeQpS/IqjtTLhUy9V+JOFva/Y+I5I=
+SIZE (Python-2.5.5.tgz) = 11606370
Index: 2.5/patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.5/patches/patch-Makefile_pre_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_pre_in
--- 2.5/patches/patch-Makefile_pre_in 1 Jan 2009 21:03:27 -0000 1.6
+++ 2.5/patches/patch-Makefile_pre_in 22 Apr 2010 04:50:15 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_pre_in,v 1.6 2009/01/01 21:03:27 djm Exp $
---- Makefile.pre.in.orig Mon Sep 22 10:22:44 2008
-+++ Makefile.pre.in Mon Dec 15 20:13:03 2008
+--- Makefile.pre.in.orig Mon Sep 22 06:22:44 2008
++++ Makefile.pre.in Wed Apr 21 22:34:54 2010
@@ -332,6 +332,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
@@ -10,15 +10,16 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 20
# Default target
all: $(BUILDPYTHON) oldsharedmods sharedmods
-@@ -340,6 +342,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRAR
+@@ -339,7 +341,7 @@ all: $(BUILDPYTHON) oldsharedmods sharedmods
+ $(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
-@@ -376,6 +379,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
+@@ -376,6 +378,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
@@ -30,7 +31,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 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.
-@@ -658,14 +666,13 @@ bininstall: altbininstall
+@@ -658,14 +665,13 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@@ -46,7 +47,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 20
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -674,14 +681,12 @@ altbininstall: $(BUILDPYTHON)
+@@ -674,14 +680,12 @@ altbininstall: $(BUILDPYTHON)
fi; \
done
$(INSTALL_PROGRAM) $(BUILDPYTHON)
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
@@ -64,7 +65,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 20
fi; \
else true; \
fi
-@@ -697,7 +702,7 @@ maninstall:
+@@ -697,7 +701,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
@@ -73,7 +74,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 20
# Install the library
PLATDIR= plat-$(MACHDEP)
-@@ -725,7 +730,7 @@ LIBSUBDIRS= lib-tk site-packages test test/output
test
+@@ -725,7 +729,7 @@ LIBSUBDIRS= lib-tk site-packages test test/output
test
distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
setuptools setuptools/command setuptools/tests
setuptools.egg-info \
curses $(MACHDEPS)
@@ -82,7 +83,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.6 20
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
if test ! -d $(DESTDIR)$$i; then \
-@@ -799,8 +804,8 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
+@@ -799,8 +803,8 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
# Create the PLATDIR source directory, if one wasn't distributed..
Index: 2.5/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.5/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- 2.5/pkg/PLIST-main 20 Jan 2010 08:15:21 -0000 1.10
+++ 2.5/pkg/PLIST-main 22 Apr 2010 04:50:16 -0000
@@ -1176,7 +1176,7 @@ lib/python2.5/keyword.py
lib/python2.5/keyword.pyc
lib/python2.5/keyword.pyo
lib/python2.5/lib-dynload/
-lib/python2.5/lib-dynload/Python-2.5.4-py2.5.egg-info
+lib/python2.5/lib-dynload/Python-2.5.5-py2.5.egg-info
lib/python2.5/lib-dynload/_bisect.so
lib/python2.5/lib-dynload/_codecs_cn.so
lib/python2.5/lib-dynload/_codecs_hk.so
Index: 2.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.6/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- 2.6/Makefile 15 Apr 2010 18:35:02 -0000 1.16
+++ 2.6/Makefile 22 Apr 2010 04:50:16 -0000
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2010/04/15 18:35:02 jasper Exp $
VERSION= 2.6
-PATCHLEVEL= .3
-PKG_PATCHLEVEL= p3
+PATCHLEVEL= .5
+#PKG_PATCHLEVEL= p0
SHARED_LIBS= python2.6 1.0
-# PSUBDIR= python/${VERSION}
-
BROKEN-mips64 = Floating point exception while generating pyc objects
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
@@ -16,8 +14,5 @@ PATCH_LIST= patch-* sup64-*
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --with-cxx_main
-
-post-extract:
- rm -r ${WRKDIST}/Modules/expat
.include <bsd.port.mk>
Index: 2.6/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.6/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- 2.6/distinfo 16 Oct 2009 09:38:20 -0000 1.4
+++ 2.6/distinfo 22 Apr 2010 04:50:16 -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: 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 -u -p -r1.3 patch-Lib_distutils_command_build_ext_py
--- 2.6/patches/patch-Lib_distutils_command_build_ext_py 16 Oct 2009
09:38:20 -0000 1.3
+++ 2.6/patches/patch-Lib_distutils_command_build_ext_py 22 Apr 2010
04:50:16 -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 Wed Oct 14 03:17:34 2009
++++ Lib/distutils/command/build_ext.py Wed Apr 21 20:16:42 2010
+@@ -755,13 +755,6 @@ class build_ext (Command):
return ext.libraries
else:
Index: 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 -u -p -r1.2 patch-Lib_test_regrtest_py
--- 2.6/patches/patch-Lib_test_regrtest_py 1 Jan 2009 21:03:27 -0000
1.2
+++ 2.6/patches/patch-Lib_test_regrtest_py 22 Apr 2010 04:50:16 -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 05:17:17 2009
++++ Lib/test/regrtest.py Wed Apr 21 20:16:42 2010
+@@ -1078,6 +1078,7 @@ _expectations = {
test_epoll
test_gdbm
test_locale
@@ -9,7 +9,7 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1
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: 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 -u -p -r1.1 patch-Lib_test_test_signal_py
--- 2.6/patches/patch-Lib_test_test_signal_py 18 Oct 2008 12:03:56 -0000
1.1
+++ 2.6/patches/patch-Lib_test_test_signal_py 22 Apr 2010 04:50:16 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-Lib_test_test_signal_py,
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 Tue Nov 10 00:59:08 2009
++++ Lib/test/test_signal.py Wed Apr 21 20:16:42 2010
@@ -291,6 +291,9 @@ class SiginterruptTest(unittest.TestCase):
self.assertEquals(i, True)
@@ -14,7 +14,7 @@ workarounds for breakage caused by libpt
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: 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 -u -p -r1.2 patch-Makefile_pre_in
--- 2.6/patches/patch-Makefile_pre_in 3 May 2009 22:26:27 -0000 1.2
+++ 2.6/patches/patch-Makefile_pre_in 22 Apr 2010 04:50:16 -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 19:19:38 2009
++++ Makefile.pre.in Wed Apr 21 21:20:30 2010
@@ -350,6 +350,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
@@ -10,15 +10,16 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
# 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 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.
-@@ -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 20
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 20
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 20
# 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: 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 -u -p -r1.2 patch-Modules_socketmodule_c
--- 2.6/patches/patch-Modules_socketmodule_c 3 May 2009 22:26:27 -0000
1.2
+++ 2.6/patches/patch-Modules_socketmodule_c 22 Apr 2010 04:50:16 -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 Fri Feb 5 01:26:34 2010
++++ Modules/socketmodule.c Wed Apr 21 20:35:40 2010
@@ -93,9 +93,6 @@ Local naming conventions:
#include "Python.h"
#include "structmember.h"
@@ -11,12 +11,3 @@ $OpenBSD: patch-Modules_socketmodule_c,v
/* 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: 2.6/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.6/patches/patch-configure_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_in
--- 2.6/patches/patch-configure_in 16 Oct 2009 09:38:20 -0000 1.3
+++ 2.6/patches/patch-configure_in 22 Apr 2010 04:50:16 -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 Wed Mar 10 02:47:28 2010
++++ configure.in Wed Apr 21 20:19:31 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/
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: 2.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- 2.6/pkg/PLIST-main 20 Jan 2010 08:15:21 -0000 1.5
+++ 2.6/pkg/PLIST-main 22 Apr 2010 04:50:16 -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_filel
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
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.
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_fix
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: 2.6/pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-tests
--- 2.6/pkg/PLIST-tests 27 Oct 2009 23:35:09 -0000 1.5
+++ 2.6/pkg/PLIST-tests 22 Apr 2010 04:50:16 -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
