cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Python to 3.2.2 (keep it unhooked).

Browse Source 
ok fgsch@.
This commit is contained in:
rpointel 2011-09-10 05:16:20 +00:00
parent 7f797d8a3f
commit 19e3c53a5e
10 changed files with 76 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/python3/3.2/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2011/07/20 12:06:57 rpointel Exp $
# $OpenBSD: Makefile,v 1.4 2011/09/10 05:16:20 rpointel Exp $
VERSION = 3.2
PATCHLEVEL = .1
PATCHLEVEL = .2
SHARED_LIBS = python3.2m 1.0
AUTOCONF_VERSION = 2.68

10
lang/python3/3.2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (Python-3.2.1.tgz) = bCqjSBytt733TmJf/8NSsg==
RMD160 (Python-3.2.1.tgz) = XLNNNndcMqYdrh06Uva+JTk/c0c=
SHA1 (Python-3.2.1.tgz) = AA/2XbmC+8ZPqVonN6f6Eoc+yTE=
SHA256 (Python-3.2.1.tgz) = fP8p2YRpbZ/ox76lTaW5rTas7zP/XPDT435NEvshxXI=
SIZE (Python-3.2.1.tgz) = 12713430
MD5 (Python-3.2.2.tgz) = PGOm2XMz9No1l2tqB1XrZw==
RMD160 (Python-3.2.2.tgz) = qKKv7BYFDBX6jJoMVNyKmy5fw1I=
SHA1 (Python-3.2.2.tgz) = tFn/R2sH5uSRCb6U575FdigOdo0=
SHA256 (Python-3.2.2.tgz) = rMahPLT+0LfoZxYySoQ34yZkW4B2F37t5aDK2Z7AMTw=
SIZE (Python-3.2.2.tgz) = 12732276

18
lang/python3/3.2/files/CHANGES.OpenBSD Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: CHANGES.OpenBSD,v 1.1 2011/09/10 05:16:20 rpointel Exp $
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. 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/python3.

11
lang/python3/3.2/patches/patch-Lib_test_test_capi_py
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Lib_test_test_capi_py,v 1.1 2011/07/20 12:06:57 rpointel Exp $
--- Lib/test/test_capi.py.orig Sat Jul 9 08:58:50 2011
+++ Lib/test/test_capi.py Mon Jul 11 15:15:28 2011
@@ -91,6 +91,7 @@
if False and support.verbose:
print("(%i)"%(len(l),))
+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
def test_pendingcalls_threaded(self):
#do every callback on a separate thread

14
lang/python3/3.2/patches/patch-Lib_test_test_fcntl_py Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Lib_test_test_fcntl_py,v 1.1 2011/09/10 05:16:20 rpointel Exp $
http://bugs.python.org/issue12821
--- Lib/test/test_fcntl.py.orig Sat Aug 13 19:31:23 2011
+++ Lib/test/test_fcntl.py Tue Aug 23 08:41:19 2011
@@ -28,7 +28,8 @@
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
'freebsd6', 'freebsd7', 'freebsd8',
'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4',
+ 'openbsd5'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'

12
lang/python3/3.2/patches/patch-Lib_test_test_tempfile_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.1 2011/09/10 05:16:20 rpointel Exp $
--- Lib/test/test_tempfile.py.orig Tue Aug 23 08:42:51 2011
+++ Lib/test/test_tempfile.py Tue Aug 23 08:43:21 2011
@@ -20,7 +20,7 @@
# TEST_FILES may need to be tweaked for systems depending on the maximum
# number of files that can be opened at one time (see ulimit -n)
-if sys.platform in ('openbsd3', 'openbsd4'):
+if sys.platform in ('openbsd3', 'openbsd4', 'openbsd5'):
TEST_FILES = 48
else:
TEST_FILES = 100

30
lang/python3/3.2/patches/patch-configure_in
View File

@ -1,25 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2011/07/20 12:06:57 rpointel Exp $
--- configure.in.orig Sat Jul 9 08:58:56 2011
+++ configure.in Wed Jul 20 10:19:37 2011
@@ -320,7 +320,7 @@
# As this has a different meaning on Linux, only define it on OpenBSD
AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features])
;;
- OpenBSD/4.@<:@789@:>@)
+ OpenBSD/4.@<:@789@:>@ | OpenBSD/5.*)
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE
# As this has a different meaning on Linux, only define it on OpenBSD
@@ -755,7 +755,7 @@
PY3LIBRARY=libpython3.so
fi
;;
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
+ Linux*|GNU*|NetBSD*|FreeBSD*|OpenBSD*|DragonFly*)
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -1772,7 +1772,7 @@
$OpenBSD: patch-configure_in,v 1.3 2011/09/10 05:16:20 rpointel Exp $
--- configure.in.orig Sat Sep 3 18:16:50 2011
+++ configure.in Mon Sep 5 20:00:17 2011
@@ -1773,7 +1773,7 @@
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
@ -28,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2011/07/20 12:06:57 rpointel Exp $
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
then
LDSHARED='$(CC) -shared'
@@ -1780,22 +1780,6 @@
@@ -1781,22 +1781,6 @@
else
LDSHARED="ld -Bshareable"
fi;;
@ -51,7 +33,7 @@ $OpenBSD: patch-configure_in,v 1.2 2011/07/20 12:06:57 rpointel Exp $
NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
@@ -1945,9 +1929,14 @@
@@ -1946,9 +1930,14 @@
# only check for sem_init if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then

10
lang/python3/3.2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2011/07/20 12:06:57 rpointel Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2011/09/10 05:16:20 rpointel Exp $
@comment bin/2to3
bin/2to3-3.2
@comment bin/pydoc3
@ -1725,7 +1725,7 @@ lib/python3.2/json/scanner.py
lib/python3.2/json/tool.py
lib/python3.2/keyword.py
lib/python3.2/lib-dynload/
lib/python3.2/lib-dynload/Python-3.2.1-py3.2.egg-info
lib/python3.2/lib-dynload/Python-3.2.2-py3.2.egg-info
lib/python3.2/lib-dynload/_bisect.so
lib/python3.2/lib-dynload/_codecs_cn.so
lib/python3.2/lib-dynload/_codecs_hk.so
@ -1780,9 +1780,9 @@ lib/python3.2/lib-dynload/xxlimited.so
lib/python3.2/lib-dynload/zlib.so
lib/python3.2/lib2to3/
lib/python3.2/lib2to3/Grammar.txt
lib/python3.2/lib2to3/Grammar3.2.1.final.0.pickle
lib/python3.2/lib2to3/Grammar3.2.2.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar.txt
lib/python3.2/lib2to3/PatternGrammar3.2.1.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar3.2.2.final.0.pickle
lib/python3.2/lib2to3/__init__.py
lib/python3.2/lib2to3/__pycache__/
lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyc
@ -2529,3 +2529,5 @@ lib/python3.2/xmlrpc/client.py
lib/python3.2/xmlrpc/server.py
lib/python3.2/zipfile.py
@man man/man1/python3.2.1
share/doc/python3.2/
share/doc/python3.2/CHANGES.OpenBSD

9
lang/python3/3.2/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.2 2011/07/20 12:06:57 rpointel Exp $
@comment $OpenBSD: PLIST-tests,v 1.3 2011/09/10 05:16:20 rpointel Exp $
lib/python3.2/test/
lib/python3.2/test/185test.db
lib/python3.2/test/Sine-1000Hz-300ms.aif
@ -817,6 +817,11 @@ lib/python3.2/test/badsyntax_future8.py
lib/python3.2/test/badsyntax_future9.py
lib/python3.2/test/badsyntax_pep3120.py
lib/python3.2/test/buffer_tests.py
lib/python3.2/test/capath/
lib/python3.2/test/capath/4e1295a3.0
lib/python3.2/test/capath/5ed36f99.0
lib/python3.2/test/capath/6e88d7b8.0
lib/python3.2/test/capath/99d0fa06.0
lib/python3.2/test/cfgparser.1
lib/python3.2/test/cfgparser.2
lib/python3.2/test/cfgparser.3
@ -854,6 +859,8 @@ lib/python3.2/test/cjkencodings/shift_jisx0213-utf8.txt
lib/python3.2/test/cjkencodings/shift_jisx0213.txt
lib/python3.2/test/cmath_testcases.txt
lib/python3.2/test/curses_tests.py
lib/python3.2/test/data/
lib/python3.2/test/data/README
lib/python3.2/test/datetimetester.py
lib/python3.2/test/decimaltestdata/
lib/python3.2/test/decimaltestdata/abs.decTest

32
lang/python3/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.3 2011/07/20 12:06:57 rpointel Exp $
# $OpenBSD: Makefile.inc,v 1.4 2011/09/10 05:16:20 rpointel Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -68,28 +68,6 @@ LIB_DEPENDS-tkinter = ${MODTK_LIB_DEPENDS} \
lang/python3/${VERSION},-main
WANTLIB-tkinter = X11 ${MODTK_WANTLIB} python${VERSION}m
#.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
#PATCH_LIST = patch-* sup64-*
#PKG_ARGS+= -Dmm=0
#.else
#PKG_ARGS+= -Dmm=1
#.endif
# XXX fix ctypes on powerpc for python2.6
# The ctypes module is not supported on all platforms (in particular, ARM)
#.if ${VERSION} == "2.5" || ${VERSION} == "2.6" || ${VERSION} == "2.7"
#. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \
# ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || \
# ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "m68k" || \
# ${MACHINE_ARCH:Mmips64*} || \
# ( ${MACHINE_ARCH} == "powerpc" && ( ${VERSION} != "2.6" && ${VERSION} != "2.7" ) )
#PKG_ARGS+= -Dctypes=1
#. else
#PKG_ARGS+= -Dctypes=0
#. endif
#.endif
USE_GROFF = Yes
CONFIGURE_STYLE= autoconf
@ -126,7 +104,10 @@ post-build:
's@#! */usr/bin/env +python@#!${PREFIX}/bin/python${VERSION}@' \
${WRKSRC}/Tools/scripts/pydoc3
#post-install:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/python${VERSION}
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
# ${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/pydoc \
# ${PREFIX}/bin/pydoc${VERSION}
# @sed -e "s,@VERSION@,${VERSION},g" -e "s,@LOCALBASE@,${LOCALBASE},g" \
@ -134,9 +115,6 @@ post-build:
# ${INSTALL_SCRIPT} ${WRKSRC}/idle ${PREFIX}/bin/idle${VERSION}
# @cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python${VERSION}; \
# tar -xf -)
# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/python${VERSION}
# ${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
# ${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
# ${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/2to3 \
# ${PREFIX}/bin/python${VERSION}-2to3