[prev in list] [next in list] [prev in thread] [next in thread]
List: openbsd-ports
Subject: [UPDATE] Python 3.2.3 and python3 flavor use
From: Remi Pointel <remi.pointel () xiri ! fr>
Date: 2012-05-30 18:31:44
Message-ID: 4FC66790.1000902 () xiri ! fr
[Download RAW message or body]
Hi,
these are the diff to permit to have a port which uses Python 3.2.3 and
Python 2.7.3 (port whiches have python3 flavor).
So, if you want to test:
1) apply the python 3.2.3 diff
2) apply the python.port.mk diff
3) test with the devel/py-pip diff to understand how to use the python3
flavor (now you need to add ${MODPY_COMMENT} in the beginning of PLIST
file which are in conflict, like:
foo/bar/
foo/bar/${MODPY_PYCACHE}
to evitate that foo/bar/ == foo/bar/${MODPY_PYCACHE} when using python
2, we now have in PLIST:
foo/bar/
${MODPY_COMMENT}foo/bar/${MODPY_PYCACHE}
Please tests.
Cheers,
Remi.
["py-pip.diff" (text/plain)]
Index: PLIST
===================================================================
RCS file: /cvs/ports/devel/py-pip/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- PLIST 12 Apr 2011 18:31:21 -0000 1.1.1.1
+++ PLIST 30 May 2012 18:28:39 -0000
@@ -10,62 +10,65 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pip/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pip/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}_pkgutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}backwardcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}basecommand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}baseparser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}download.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}locations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}req.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}status_codes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/_pkgutil.py
-lib/python${MODPY_VERSION}/site-packages/pip/_pkgutil.pyc
lib/python${MODPY_VERSION}/site-packages/pip/backwardcompat.py
-lib/python${MODPY_VERSION}/site-packages/pip/backwardcompat.pyc
lib/python${MODPY_VERSION}/site-packages/pip/basecommand.py
-lib/python${MODPY_VERSION}/site-packages/pip/basecommand.pyc
lib/python${MODPY_VERSION}/site-packages/pip/baseparser.py
-lib/python${MODPY_VERSION}/site-packages/pip/baseparser.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}
lib/python${MODPY_VERSION}/site-packages/pip/commands/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}bundle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}completion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}freeze.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}uninstall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}unzip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/commands/${MODPY_PYCACHE}zip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/bundle.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/bundle.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/completion.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/completion.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/freeze.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/freeze.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/help.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/help.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/install.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/install.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/search.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/search.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/uninstall.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/uninstall.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/unzip.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/unzip.pyc
lib/python${MODPY_VERSION}/site-packages/pip/commands/zip.py
-lib/python${MODPY_VERSION}/site-packages/pip/commands/zip.pyc
lib/python${MODPY_VERSION}/site-packages/pip/download.py
-lib/python${MODPY_VERSION}/site-packages/pip/download.pyc
lib/python${MODPY_VERSION}/site-packages/pip/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/pip/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/pip/index.py
-lib/python${MODPY_VERSION}/site-packages/pip/index.pyc
lib/python${MODPY_VERSION}/site-packages/pip/locations.py
-lib/python${MODPY_VERSION}/site-packages/pip/locations.pyc
lib/python${MODPY_VERSION}/site-packages/pip/log.py
-lib/python${MODPY_VERSION}/site-packages/pip/log.pyc
lib/python${MODPY_VERSION}/site-packages/pip/req.py
-lib/python${MODPY_VERSION}/site-packages/pip/req.pyc
lib/python${MODPY_VERSION}/site-packages/pip/runner.py
-lib/python${MODPY_VERSION}/site-packages/pip/runner.pyc
+lib/python${MODPY_VERSION}/site-packages/pip/status_codes.py
lib/python${MODPY_VERSION}/site-packages/pip/util.py
-lib/python${MODPY_VERSION}/site-packages/pip/util.pyc
lib/python${MODPY_VERSION}/site-packages/pip/vcs/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}
lib/python${MODPY_VERSION}/site-packages/pip/vcs/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pip/vcs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}bazaar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}mercurial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pip/vcs/${MODPY_PYCACHE}subversion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pip/vcs/bazaar.py
-lib/python${MODPY_VERSION}/site-packages/pip/vcs/bazaar.pyc
lib/python${MODPY_VERSION}/site-packages/pip/vcs/git.py
-lib/python${MODPY_VERSION}/site-packages/pip/vcs/git.pyc
lib/python${MODPY_VERSION}/site-packages/pip/vcs/mercurial.py
-lib/python${MODPY_VERSION}/site-packages/pip/vcs/mercurial.pyc
lib/python${MODPY_VERSION}/site-packages/pip/vcs/subversion.py
-lib/python${MODPY_VERSION}/site-packages/pip/vcs/subversion.pyc
-lib/python${MODPY_VERSION}/site-packages/pip/venv.py
-lib/python${MODPY_VERSION}/site-packages/pip/venv.pyc
["python323.diff" (text/plain)]
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 9 May 2012 06:21:12 -0000 1.7
+++ Makefile 30 May 2012 05:25:10 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2012/05/09 06:21:12 ajacoutot Exp $
VERSION = 3.2
-PATCHLEVEL = .2
+PATCHLEVEL = .3
SHARED_LIBS = python3.2m 1.0
-REVISION = 3
VERSION_SPEC = >=3.2,<3.3
MAINTAINER = Remi Pointel <rpointel@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ distinfo 30 May 2012 05:25:10 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (Python-3.2.3.tgz) = 3POnOOcCjx3rQbGAvw4svA==
+RMD160 (Python-3.2.3.tgz) = uy51gHOaP9R4z96WSXo1ahcddRM=
+SHA1 (Python-3.2.3.tgz) = LGUCTLMsRG3u7+VYTtQGIwSAfWE=
+SHA256 (Python-3.2.3.tgz) = dMM+Fl7e91Ms75X9mjJaBoeLW/yKXQOBYVc/KD6vmAk=
+SIZE (Python-3.2.3.tgz) = 12787688
Index: patches/patch-Lib_tempfile_py
===================================================================
RCS file: patches/patch-Lib_tempfile_py
diff -N patches/patch-Lib_tempfile_py
--- patches/patch-Lib_tempfile_py 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Lib_tempfile_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $
---- Lib/tempfile.py.orig Wed Jun 22 14:12:22 2011
-+++ Lib/tempfile.py Wed Jun 22 14:12:37 2011
-@@ -139,7 +139,7 @@ def _candidate_tempdir_list():
- if _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:
Index: patches/patch-Lib_test_test_fcntl_py
===================================================================
RCS file: patches/patch-Lib_test_test_fcntl_py
diff -N patches/patch-Lib_test_test_fcntl_py
--- patches/patch-Lib_test_test_fcntl_py 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Lib_test_test_fcntl_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch 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'
Index: patches/patch-Lib_test_test_io_py
===================================================================
RCS file: patches/patch-Lib_test_test_io_py
diff -N patches/patch-Lib_test_test_io_py
--- patches/patch-Lib_test_test_io_py 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-Lib_test_test_io_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $
---- Lib/test/test_io.py.orig Sat Jul 9 08:58:50 2011
-+++ Lib/test/test_io.py Mon Jul 11 14:13:36 2011
-@@ -2694,12 +2694,15 @@
- if e.errno != errno.EBADF:
- raise
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupted_write_unbuffered(self):
- self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0)
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupted_write_buffered(self):
- self.check_interrupted_write(b"xy", b"xy", mode="wb")
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupted_write_text(self):
- self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii")
-
-@@ -2758,10 +2761,12 @@
- os.close(w)
- os.close(r)
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupterd_read_retry_buffered(self):
- self.check_interrupted_read_retry(lambda x: x.decode('latin1'),
- mode="rb")
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupterd_read_retry_text(self):
- self.check_interrupted_read_retry(lambda x: x,
- mode="r")
-@@ -2821,9 +2826,11 @@
- if e.errno != errno.EBADF:
- raise
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupterd_write_retry_buffered(self):
- self.check_interrupted_write_retry(b"x", mode="wb")
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_interrupterd_write_retry_text(self):
- self.check_interrupted_write_retry("x", mode="w", encoding="latin1")
-
Index: patches/patch-Lib_test_test_socket_py
===================================================================
RCS file: patches/patch-Lib_test_test_socket_py
diff -N patches/patch-Lib_test_test_socket_py
--- patches/patch-Lib_test_test_socket_py 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Lib_test_test_socket_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $
---- Lib/test/test_socket.py.orig Wed Jan 5 22:03:42 2011
-+++ Lib/test/test_socket.py Wed Jun 29 15:00:12 2011
-@@ -715,6 +715,7 @@
- c.close()
- s.close()
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_sendall_interrupted(self):
- self.check_sendall_interrupted(False)
-
Index: patches/patch-Lib_test_test_subprocess_py
===================================================================
RCS file: patches/patch-Lib_test_test_subprocess_py
diff -N patches/patch-Lib_test_test_subprocess_py
--- patches/patch-Lib_test_test_subprocess_py 20 Sep 2011 10:51:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Lib_test_test_subprocess_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $
---- Lib/test/test_subprocess.py.orig Mon Jan 3 23:24:52 2011
-+++ Lib/test/test_subprocess.py Wed Jun 29 15:36:22 2011
-@@ -1189,6 +1189,7 @@
- close_fds=False, pass_fds=(fd, )))
- self.assertIn('overriding close_fds', str(context.warning))
-
-+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD")
- def test_wait_when_sigchild_ignored(self):
- # NOTE: sigchild_ignore.py may not be an effective test on all OSes.
- sigchild_ignore = support.findfile("sigchild_ignore.py",
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.2/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 26 Sep 2011 19:06:58 -0000 1.3
+++ pkg/PLIST-main 30 May 2012 05:25:11 -0000
@@ -16,6 +16,7 @@ include/python3.2m/
include/python3.2m/Python-ast.h
include/python3.2m/Python.h
include/python3.2m/abstract.h
+include/python3.2m/accu.h
include/python3.2m/asdl.h
include/python3.2m/ast.h
include/python3.2m/bitset.h
@@ -853,6 +854,7 @@ lib/python3.2/distutils/command/install_
lib/python3.2/distutils/command/register.py
lib/python3.2/distutils/command/sdist.py
lib/python3.2/distutils/command/upload.py
+@comment lib/python3.2/distutils/command/wininst-9.0-${MACHINE_ARCH}.exe
@comment lib/python3.2/distutils/command/wininst-6.0.exe
@comment lib/python3.2/distutils/command/wininst-7.1.exe
@comment lib/python3.2/distutils/command/wininst-8.0.exe
@@ -1728,7 +1730,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.2-py3.2.egg-info
+lib/python3.2/lib-dynload/Python-3.2.3-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
@@ -1783,9 +1785,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.2.final.0.pickle
+lib/python3.2/lib2to3/Grammar3.2.3.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar.txt
-lib/python3.2/lib2to3/PatternGrammar3.2.2.final.0.pickle
+lib/python3.2/lib2to3/PatternGrammar3.2.3.final.0.pickle
lib/python3.2/lib2to3/__init__.py
lib/python3.2/lib2to3/__pycache__/
lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyc
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.2/pkg/PLIST-tests,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-tests
--- pkg/PLIST-tests 26 Sep 2011 19:06:58 -0000 1.3
+++ pkg/PLIST-tests 30 May 2012 05:25:12 -0000
@@ -60,8 +60,6 @@ lib/python3.2/test/__pycache__/pystone.c
lib/python3.2/test/__pycache__/pystone.cpython-32.pyo
lib/python3.2/test/__pycache__/re_tests.cpython-32.pyc
lib/python3.2/test/__pycache__/re_tests.cpython-32.pyo
-lib/python3.2/test/__pycache__/regex_tests.cpython-32.pyc
-lib/python3.2/test/__pycache__/regex_tests.cpython-32.pyo
lib/python3.2/test/__pycache__/regrtest.cpython-32.pyc
lib/python3.2/test/__pycache__/regrtest.cpython-32.pyo
lib/python3.2/test/__pycache__/relimport.cpython-32.pyc
@@ -546,6 +544,8 @@ lib/python3.2/test/__pycache__/test_pty.
lib/python3.2/test/__pycache__/test_pty.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyo
+lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyc
+lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pydoc.cpython-32.pyc
@@ -1090,7 +1090,9 @@ lib/python3.2/test/lock_tests.py
lib/python3.2/test/make_ssl_certs.py
lib/python3.2/test/mapping_tests.py
lib/python3.2/test/math_testcases.txt
+lib/python3.2/test/mime.types
lib/python3.2/test/mock_socket.py
+lib/python3.2/test/nokia.pem
lib/python3.2/test/nullcert.pem
lib/python3.2/test/outstanding_bugs.py
lib/python3.2/test/pickletester.py
@@ -1104,7 +1106,6 @@ lib/python3.2/test/randv2_32.pck
lib/python3.2/test/randv2_64.pck
lib/python3.2/test/randv3.pck
lib/python3.2/test/re_tests.py
-lib/python3.2/test/regex_tests.py
lib/python3.2/test/regrtest.py
lib/python3.2/test/relimport.py
lib/python3.2/test/reperf.py
@@ -1136,7 +1137,6 @@ lib/python3.2/test/subprocessdata/qcat.p
lib/python3.2/test/subprocessdata/qgrep.py
lib/python3.2/test/subprocessdata/sigchild_ignore.py
lib/python3.2/test/support.py
-lib/python3.2/test/svn_python_org_https_cert.pem
lib/python3.2/test/test___all__.py
lib/python3.2/test/test___future__.py
lib/python3.2/test/test__locale.py
@@ -1374,6 +1374,7 @@ lib/python3.2/test/test_property.py
lib/python3.2/test/test_pstats.py
lib/python3.2/test/test_pty.py
lib/python3.2/test/test_pwd.py
+lib/python3.2/test/test_py_compile.py
lib/python3.2/test/test_pyclbr.py
lib/python3.2/test/test_pydoc.py
lib/python3.2/test/test_pyexpat.py
["python_port_mk.diff" (text/plain)]
Index: python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.52
diff -u -r1.52 python.port.mk
--- python.port.mk 3 Apr 2012 09:21:42 -0000 1.52
+++ python.port.mk 30 May 2012 05:24:53 -0000
@@ -37,6 +37,9 @@
MODPY_FLAVOR =
MODPY_BIN_SUFFIX =
MODPY_PY_PREFIX = py-
+MODPY_PYCACHE =
+MODPY_PYC_MAGIC_TAG =
+MODPY_COMMENT = "@comment "
.elif ${_MODPY_MAJOR_VERSION} == 3
MODPY_LIB_SUFFIX = m
@@ -46,6 +49,11 @@
# use MODPY_SUFFIX for binaries to avoid conflict
MODPY_BIN_SUFFIX = -3
MODPY_PY_PREFIX = py3-
+MODPY_PYCACHE = "__pycache__/"
+MODPY_MAJORMINOR = ${MODPY_VERSION:C/\.//g}
+MODPY_PYC_MAGIC_TAG = "cpython-${MODPY_MAJORMINOR}."
+MODPY_COMMENT =
+
. else
ERRORS += "Fatal: unknown or unsupported _MODPY_MAJOR_VERSION: \
${_MODPY_MAJOR_VERSION}"
.endif
@@ -146,7 +154,7 @@
_MODPY_CMD= @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ./${MODPY_SETUP}
-SUBST_VARS:= MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX \
MODPY_PY_PREFIX ${SUBST_VARS} +SUBST_VARS:= MODPY_COMMENT MODPY_PYC_MAGIC_TAG \
MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX MODPY_PY_PREFIX \
MODPY_PYCACHE ${SUBST_VARS}
# set MODPY_BIN for executable scripts
MODPY_BIN_ADJ= perl -pi \
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic