[UPDATE] lang/python/3.3 to 3.3.3

2013-11-18 Thread Remi Pointel

Hi,

this is the diff to update Python from 3.3.2 to 3.3.3.

Changelog: http://hg.python.org/cpython/file/c3896275c0f6/Misc/NEWS

I just tested on amd64, si if you could test on others arch it would be 
good.


Thanks,

Remi.? pkg/PLIST-main.orig2
Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.3/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile27 Oct 2013 18:32:55 -  1.6
+++ Makefile18 Nov 2013 10:28:16 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.6 2013/10/27 18:32:55 fgsch Exp $
 
 VERSION =  3.3
-PATCHLEVEL =   .2
-REVISION = 0
-SHARED_LIBS =  python3.3m 0.0
+PATCHLEVEL =   .3
+SHARED_LIBS =  python3.3m 1.0
 VERSION_SPEC = =3.3,3.4
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.3/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 May 2013 12:37:05 -  1.2
+++ distinfo18 Nov 2013 10:28:16 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.3.2.tgz) = 3mZPyjuOCrIPtCv+0aNuJvEW8YU+iK2hLbyTh2EDYXI=
-SIZE (Python-3.3.2.tgz) = 16530940
+SHA256 (Python-3.3.3.tgz) = MLYIOb/grootuhHpCTKEWbuO5KJYr+dJSwayztoIDvw=
+SIZE (Python-3.3.3.tgz) = 16808057
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.3/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  22 May 2013 12:37:05 -  1.3
+++ pkg/PLIST-main  18 Nov 2013 10:28:17 -
@@ -1643,9 +1643,9 @@ lib/python3.3/lib-dynload/xxlimited.so
 lib/python3.3/lib-dynload/zlib.so
 lib/python3.3/lib2to3/
 lib/python3.3/lib2to3/Grammar.txt
-lib/python3.3/lib2to3/Grammar3.3.2.final.0.pickle
+lib/python3.3/lib2to3/Grammar3.3.3.final.0.pickle
 lib/python3.3/lib2to3/PatternGrammar.txt
-lib/python3.3/lib2to3/PatternGrammar3.3.2.final.0.pickle
+lib/python3.3/lib2to3/PatternGrammar3.3.3.final.0.pickle
 lib/python3.3/lib2to3/__init__.py
 lib/python3.3/lib2to3/__main__.py
 lib/python3.3/lib2to3/__pycache__/
@@ -1895,6 +1895,7 @@ lib/python3.3/lib2to3/tests/data/README
 lib/python3.3/lib2to3/tests/data/bom.py
 lib/python3.3/lib2to3/tests/data/crlf.py
 lib/python3.3/lib2to3/tests/data/different_encoding.py
+lib/python3.3/lib2to3/tests/data/false_encoding.py
 lib/python3.3/lib2to3/tests/data/fixers/
 lib/python3.3/lib2to3/tests/data/fixers/bad_order.py
 lib/python3.3/lib2to3/tests/data/fixers/myfixes/
@@ -2324,7 +2325,6 @@ lib/python3.3/venv/__pycache__/__main__.
 lib/python3.3/venv/scripts/
 lib/python3.3/venv/scripts/posix/
 lib/python3.3/venv/scripts/posix/activate
-lib/python3.3/venv/scripts/posix/pydoc
 lib/python3.3/warnings.py
 lib/python3.3/wave.py
 lib/python3.3/weakref.py
Index: pkg/PLIST-tests
===
RCS file: /cvs/ports/lang/python/3.3/pkg/PLIST-tests,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tests
--- pkg/PLIST-tests 22 May 2013 12:37:05 -  1.2
+++ pkg/PLIST-tests 18 Nov 2013 10:28:17 -
@@ -12,6 +12,8 @@ lib/python3.3/test/__pycache__/__init__.
 lib/python3.3/test/__pycache__/__init__.cpython-33.pyo
 lib/python3.3/test/__pycache__/__main__.cpython-33.pyc
 lib/python3.3/test/__pycache__/__main__.cpython-33.pyo
+lib/python3.3/test/__pycache__/audiotests.cpython-33.pyc
+lib/python3.3/test/__pycache__/audiotests.cpython-33.pyo
 lib/python3.3/test/__pycache__/autotest.cpython-33.pyc
 lib/python3.3/test/__pycache__/autotest.cpython-33.pyo
 lib/python3.3/test/__pycache__/buffer_tests.cpython-33.pyc
@@ -92,8 +94,6 @@ lib/python3.3/test/__pycache__/ssl_serve
 lib/python3.3/test/__pycache__/ssl_servers.cpython-33.pyo
 lib/python3.3/test/__pycache__/string_tests.cpython-33.pyc
 lib/python3.3/test/__pycache__/string_tests.cpython-33.pyo
-lib/python3.3/test/__pycache__/support.cpython-33.pyc
-lib/python3.3/test/__pycache__/support.cpython-33.pyo
 lib/python3.3/test/__pycache__/test___all__.cpython-33.pyc
 lib/python3.3/test/__pycache__/test___all__.cpython-33.pyo
 lib/python3.3/test/__pycache__/test___future__.cpython-33.pyc
@@ -392,6 +392,8 @@ lib/python3.3/test/__pycache__/test_http
 lib/python3.3/test/__pycache__/test_httplib.cpython-33.pyo
 lib/python3.3/test/__pycache__/test_httpservers.cpython-33.pyc
 lib/python3.3/test/__pycache__/test_httpservers.cpython-33.pyo
+lib/python3.3/test/__pycache__/test_idle.cpython-33.pyc
+lib/python3.3/test/__pycache__/test_idle.cpython-33.pyo
 lib/python3.3/test/__pycache__/test_imaplib.cpython-33.pyc
 lib/python3.3/test/__pycache__/test_imaplib.cpython-33.pyo
 lib/python3.3/test/__pycache__/test_imp.cpython-33.pyc
@@ -422,8 +424,6 @@ lib/python3.3/test/__pycache__/test_iter
 lib/python3.3/test/__pycache__/test_iterlen.cpython-33.pyo
 lib/python3.3/test/__pycache__/test_itertools.cpython-33.pyc
 

UPDATE: lang/python/3.3

2013-05-17 Thread Federico G. Schwindt
Trivial update to 3.3.2.
OK?

f.-

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.3/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile18 May 2013 04:13:16 -  1.4
+++ Makefile18 May 2013 04:50:11 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.4 2013/05/18 04:13:16 fgsch Exp $
 
 VERSION =  3.3
-REVISION = 1
-PATCHLEVEL =   .1
+PATCHLEVEL =   .2
 SHARED_LIBS =  python3.3m 0.0
 VERSION_SPEC = =3.3,3.4
 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.3/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo28 Apr 2013 01:29:57 -  1.1.1.1
+++ distinfo18 May 2013 04:50:11 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.3.1.tgz) = Zx3DYy8xHmPGczcDqgoa2QyZJ33cgpnTnkh3GKUDGb0=
-SIZE (Python-3.3.1.tgz) = 16521332
+SHA256 (Python-3.3.2.tgz) = 3mZPyjuOCrIPtCv+0aNuJvEW8YU+iK2hLbyTh2EDYXI=
+SIZE (Python-3.3.2.tgz) = 16530940
Index: files/CHANGES.OpenBSD
===
RCS file: /cvs/ports/lang/python/3.3/files/CHANGES.OpenBSD,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 CHANGES.OpenBSD
--- files/CHANGES.OpenBSD   28 Apr 2013 01:29:57 -  1.1.1.1
+++ files/CHANGES.OpenBSD   18 May 2013 04:50:12 -
@@ -7,7 +7,5 @@ of changes made to this version of Pytho
 
 2.  INSTSONAME could be incorrect, configure.ac was patched to fix it.
 
-3.  select.kevent has been modified to work with OpenBSD.
-
 These changes are available in the OpenBSD CVS repository
 http://www.openbsd.org/anoncvs.html in ports/lang/python/3.3.
Index: patches/patch-Lib_test_test_kqueue_py
===
RCS file: patches/patch-Lib_test_test_kqueue_py
diff -N patches/patch-Lib_test_test_kqueue_py
--- patches/patch-Lib_test_test_kqueue_py   28 Apr 2013 01:29:57 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Lib_test_test_kqueue_py,v 1.1.1.1 2013/04/28 01:29:57 fgsch 
Exp $
 Lib/test/test_kqueue.py.orig   Wed Apr 17 17:41:28 2013
-+++ Lib/test/test_kqueue.pyWed Apr 17 17:41:40 2013
-@@ -101,7 +101,8 @@ class TestKQueue(unittest.TestCase):
- pass # FreeBSD doesn't raise an exception here
- server, addr = serverSocket.accept()
- 
--if sys.platform.startswith(darwin):
-+if sys.platform.startswith(darwin) or \
-+   sys.platform.startswith(openbsd):
- flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE
- else:
- flags = 0
Index: patches/patch-Modules_selectmodule_c
===
RCS file: /cvs/ports/lang/python/3.3/patches/patch-Modules_selectmodule_c,v
retrieving revision 1.2
diff -p -u -r1.2 patch-Modules_selectmodule_c
--- patches/patch-Modules_selectmodule_c18 May 2013 04:13:16 -  
1.2
+++ patches/patch-Modules_selectmodule_c18 May 2013 04:50:12 -
@@ -1,7 +1,4 @@
 $OpenBSD: patch-Modules_selectmodule_c,v 1.2 2013/05/18 04:13:16 fgsch Exp $
-
-See http://bugs.python.org/issue12181 for details.
-
 --- Modules/selectmodule.c.origSat Apr  6 08:41:54 2013
 +++ Modules/selectmodule.c Mon May 13 04:45:07 2013
 @@ -235,11 +235,13 @@ select_select(PyObject *self, PyObject *args)
@@ -19,78 +16,3 @@ See http://bugs.python.org/issue12181 fo
  tv.tv_usec = tv_usec;
  #endif
  if (tv.tv_sec  0) {
-@@ -1571,6 +1573,23 @@ static PyTypeObject kqueue_queue_Type;
- #   error uintptr_t does not match int, long, or long long!
- #endif
- 
-+/*
-+ * kevent is not standard and its members vary across BSDs.
-+ */
-+#if !defined(__OpenBSD__)
-+#   define IDENT_TYPE T_UINTPTRT
-+#   define IDENT_CAST Py_intptr_t
-+#   define DATA_TYPE  T_INTPTRT
-+#   define DATA_FMT_UNIT INTPTRT_FMT_UNIT
-+#   define IDENT_AsType   PyLong_AsUintptr_t
-+#else
-+#   define IDENT_TYPE T_UINT
-+#   define IDENT_CAST int
-+#   define DATA_TYPE  T_INT
-+#   define DATA_FMT_UNIT i
-+#   define IDENT_AsType   PyLong_AsUnsignedLong
-+#endif
-+
- /* Unfortunately, we can't store python objects in udata, because
-  * kevents in the kernel can be removed without warning, which would
-  * forever lose the refcount on the object stored with it.
-@@ -1578,11 +1597,11 @@ static PyTypeObject kqueue_queue_Type;
- 
- #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
- static struct PyMemberDef kqueue_event_members[] = {
--{ident,   T_UINTPTRT, KQ_OFF(e.ident)},
-+{ident,   IDENT_TYPE, KQ_OFF(e.ident)},
- {filter,  T_SHORT,KQ_OFF(e.filter)},
- {flags,   T_USHORT,   KQ_OFF(e.flags)},
- {fflags,  T_UINT, KQ_OFF(e.fflags)},
--{data,T_INTPTRT,  KQ_OFF(e.data)},
-+{data,