update to 0.13

too many changes to list here - see the ReleaseNotes

5 files changed, 123 insertions, 85 deletions

diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile
index 2132ca2e12b..ab49ef74dd8 100644
--- a/devel/py-cython/Makefile
+++ b/devel/py-cython/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/07/15 17:41:57 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/24 17:58:22 drochner Exp $
 #
 
-DISTNAME=	Cython-0.12.1
-PKGNAME=	${PYPKGPREFIX}-cython-0.12.1
+DISTNAME=	Cython-0.13
+PKGNAME=	${PYPKGPREFIX}-cython-0.13
 CATEGORIES=	lang python
 MASTER_SITES=	http://cython.org/release/
 
diff --git a/devel/py-cython/PLIST b/devel/py-cython/PLIST
index 8de2806a538..1256ef17bea 100644
--- a/devel/py-cython/PLIST
+++ b/devel/py-cython/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/15 17:41:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/11/24 17:58:22 drochner Exp $
 bin/cython${PYVERSSUFFIX}
 ${PYSITELIB}/Cython/CodeWriter.py
 ${PYSITELIB}/Cython/CodeWriter.pyc
@@ -147,43 +147,101 @@ ${PYSITELIB}/Cython/Distutils/build_ext.pyo
 ${PYSITELIB}/Cython/Distutils/extension.py
 ${PYSITELIB}/Cython/Distutils/extension.pyc
 ${PYSITELIB}/Cython/Distutils/extension.pyo
+${PYSITELIB}/Cython/Includes/Deprecated/python.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python2.5.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_bool.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_buffer.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_bytes.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_cobject.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_complex.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_dict.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_exc.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_float.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_function.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_getargs.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_instance.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_int.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_iterator.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_list.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_long.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_mapping.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_mem.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_method.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_module.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_number.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_object.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_oldbuffer.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_pycapsule.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_ref.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_sequence.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_set.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_string.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_tuple.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_type.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_unicode.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_version.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/python_weakref.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/stdio.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/stdlib.pxd
+${PYSITELIB}/Cython/Includes/Deprecated/stl.pxd
+${PYSITELIB}/Cython/Includes/cpython/__init__.pxd
+${PYSITELIB}/Cython/Includes/cpython/bool.pxd
+${PYSITELIB}/Cython/Includes/cpython/buffer.pxd
+${PYSITELIB}/Cython/Includes/cpython/bytes.pxd
+${PYSITELIB}/Cython/Includes/cpython/cobject.pxd
+${PYSITELIB}/Cython/Includes/cpython/complex.pxd
+${PYSITELIB}/Cython/Includes/cpython/dict.pxd
+${PYSITELIB}/Cython/Includes/cpython/exc.pxd
+${PYSITELIB}/Cython/Includes/cpython/float.pxd
+${PYSITELIB}/Cython/Includes/cpython/function.pxd
+${PYSITELIB}/Cython/Includes/cpython/getargs.pxd
+${PYSITELIB}/Cython/Includes/cpython/instance.pxd
+${PYSITELIB}/Cython/Includes/cpython/int.pxd
+${PYSITELIB}/Cython/Includes/cpython/iterator.pxd
+${PYSITELIB}/Cython/Includes/cpython/list.pxd
+${PYSITELIB}/Cython/Includes/cpython/long.pxd
+${PYSITELIB}/Cython/Includes/cpython/mapping.pxd
+${PYSITELIB}/Cython/Includes/cpython/mem.pxd
+${PYSITELIB}/Cython/Includes/cpython/method.pxd
+${PYSITELIB}/Cython/Includes/cpython/module.pxd
+${PYSITELIB}/Cython/Includes/cpython/number.pxd
+${PYSITELIB}/Cython/Includes/cpython/object.pxd
+${PYSITELIB}/Cython/Includes/cpython/oldbuffer.pxd
+${PYSITELIB}/Cython/Includes/cpython/pycapsule.pxd
+${PYSITELIB}/Cython/Includes/cpython/pythread.pxd
+${PYSITELIB}/Cython/Includes/cpython/ref.pxd
+${PYSITELIB}/Cython/Includes/cpython/sequence.pxd
+${PYSITELIB}/Cython/Includes/cpython/set.pxd
+${PYSITELIB}/Cython/Includes/cpython/string.pxd
+${PYSITELIB}/Cython/Includes/cpython/tuple.pxd
+${PYSITELIB}/Cython/Includes/cpython/type.pxd
+${PYSITELIB}/Cython/Includes/cpython/unicode.pxd
+${PYSITELIB}/Cython/Includes/cpython/version.pxd
+${PYSITELIB}/Cython/Includes/cpython/weakref.pxd
+${PYSITELIB}/Cython/Includes/libc/__init__.pxd
+${PYSITELIB}/Cython/Includes/libc/errno.pxd
+${PYSITELIB}/Cython/Includes/libc/float.pxd
+${PYSITELIB}/Cython/Includes/libc/limits.pxd
+${PYSITELIB}/Cython/Includes/libc/locale.pxd
+${PYSITELIB}/Cython/Includes/libc/signal.pxd
+${PYSITELIB}/Cython/Includes/libc/stddef.pxd
+${PYSITELIB}/Cython/Includes/libc/stdint.pxd
+${PYSITELIB}/Cython/Includes/libc/stdio.pxd
+${PYSITELIB}/Cython/Includes/libc/stdlib.pxd
+${PYSITELIB}/Cython/Includes/libc/string.pxd
+${PYSITELIB}/Cython/Includes/libcpp/__init__.pxd
+${PYSITELIB}/Cython/Includes/libcpp/deque.pxd
+${PYSITELIB}/Cython/Includes/libcpp/list.pxd
+${PYSITELIB}/Cython/Includes/libcpp/map.pxd
+${PYSITELIB}/Cython/Includes/libcpp/pair.pxd
+${PYSITELIB}/Cython/Includes/libcpp/queue.pxd
+${PYSITELIB}/Cython/Includes/libcpp/set.pxd
+${PYSITELIB}/Cython/Includes/libcpp/stack.pxd
+${PYSITELIB}/Cython/Includes/libcpp/vector.pxd
 ${PYSITELIB}/Cython/Includes/numpy.pxd
-${PYSITELIB}/Cython/Includes/python.pxd
-${PYSITELIB}/Cython/Includes/python2.5.pxd
-${PYSITELIB}/Cython/Includes/python_bool.pxd
-${PYSITELIB}/Cython/Includes/python_buffer.pxd
-${PYSITELIB}/Cython/Includes/python_bytes.pxd
-${PYSITELIB}/Cython/Includes/python_cobject.pxd
-${PYSITELIB}/Cython/Includes/python_complex.pxd
-${PYSITELIB}/Cython/Includes/python_dict.pxd
-${PYSITELIB}/Cython/Includes/python_exc.pxd
-${PYSITELIB}/Cython/Includes/python_float.pxd
-${PYSITELIB}/Cython/Includes/python_function.pxd
-${PYSITELIB}/Cython/Includes/python_getargs.pxd
-${PYSITELIB}/Cython/Includes/python_instance.pxd
-${PYSITELIB}/Cython/Includes/python_int.pxd
-${PYSITELIB}/Cython/Includes/python_iterator.pxd
-${PYSITELIB}/Cython/Includes/python_list.pxd
-${PYSITELIB}/Cython/Includes/python_long.pxd
-${PYSITELIB}/Cython/Includes/python_mapping.pxd
-${PYSITELIB}/Cython/Includes/python_mem.pxd
-${PYSITELIB}/Cython/Includes/python_method.pxd
-${PYSITELIB}/Cython/Includes/python_module.pxd
-${PYSITELIB}/Cython/Includes/python_number.pxd
-${PYSITELIB}/Cython/Includes/python_object.pxd
-${PYSITELIB}/Cython/Includes/python_oldbuffer.pxd
-${PYSITELIB}/Cython/Includes/python_pycapsule.pxd
-${PYSITELIB}/Cython/Includes/python_ref.pxd
-${PYSITELIB}/Cython/Includes/python_sequence.pxd
-${PYSITELIB}/Cython/Includes/python_set.pxd
-${PYSITELIB}/Cython/Includes/python_string.pxd
-${PYSITELIB}/Cython/Includes/python_tuple.pxd
-${PYSITELIB}/Cython/Includes/python_type.pxd
-${PYSITELIB}/Cython/Includes/python_unicode.pxd
-${PYSITELIB}/Cython/Includes/python_version.pxd
-${PYSITELIB}/Cython/Includes/python_weakref.pxd
-${PYSITELIB}/Cython/Includes/stdio.pxd
-${PYSITELIB}/Cython/Includes/stdlib.pxd
+${PYSITELIB}/Cython/Includes/posix/__init__.pxd
+${PYSITELIB}/Cython/Includes/posix/fcntl.pxd
+${PYSITELIB}/Cython/Includes/posix/unistd.pxd
 ${PYSITELIB}/Cython/Plex/Actions.py
 ${PYSITELIB}/Cython/Plex/Actions.pyc
 ${PYSITELIB}/Cython/Plex/Actions.pyo
@@ -219,9 +277,6 @@ ${PYSITELIB}/Cython/Plex/Transitions.pyo
 ${PYSITELIB}/Cython/Plex/__init__.py
 ${PYSITELIB}/Cython/Plex/__init__.pyc
 ${PYSITELIB}/Cython/Plex/__init__.pyo
-${PYSITELIB}/Cython/Plex/test_tm.py
-${PYSITELIB}/Cython/Plex/test_tm.pyc
-${PYSITELIB}/Cython/Plex/test_tm.pyo
 ${PYSITELIB}/Cython/Runtime/__init__.py
 ${PYSITELIB}/Cython/Runtime/__init__.pyc
 ${PYSITELIB}/Cython/Runtime/__init__.pyo
@@ -242,6 +297,9 @@ ${PYSITELIB}/Cython/Tests/TestCodeWriter.pyo
 ${PYSITELIB}/Cython/Tests/__init__.py
 ${PYSITELIB}/Cython/Tests/__init__.pyc
 ${PYSITELIB}/Cython/Tests/__init__.pyo
+${PYSITELIB}/Cython/Tests/xmlrunner.py
+${PYSITELIB}/Cython/Tests/xmlrunner.pyc
+${PYSITELIB}/Cython/Tests/xmlrunner.pyo
 ${PYSITELIB}/Cython/Utils.py
 ${PYSITELIB}/Cython/Utils.pyc
 ${PYSITELIB}/Cython/Utils.pyo
diff --git a/devel/py-cython/distinfo b/devel/py-cython/distinfo
index e19db69db9f..5c4acc9d5b5 100644
--- a/devel/py-cython/distinfo
+++ b/devel/py-cython/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/07/15 17:41:57 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/11/24 17:58:22 drochner Exp $
 
-SHA1 (Cython-0.12.1.tar.gz) = a56859f0b17e9db15da6f292f6a79ac47195e5f7
-RMD160 (Cython-0.12.1.tar.gz) = d1690e1f308bda8dd332cbded831bae59ba03207
-Size (Cython-0.12.1.tar.gz) = 535239 bytes
+SHA1 (Cython-0.13.tar.gz) = 8f17947fa75c03cabe11a8a5a19dc74e27f0d1e2
+RMD160 (Cython-0.13.tar.gz) = 4771e9b82371a5923a76badb4123f416b65e773a
+Size (Cython-0.13.tar.gz) = 644797 bytes
 SHA1 (patch-aa) = d51b7d17a69857ce8a682cc2ae762a30610c4d40
-SHA1 (patch-ab) = 92c8395af17b62ab9f9ecaad932c453d06e49e21
-SHA1 (patch-ac) = 5c5c6f349bda6fb29d816ef6a7784175adb95974
+SHA1 (patch-ab) = e61bbbadafbe3f10dbc7dfd70494fb377bb35db3
+SHA1 (patch-ac) = 3e966b08564bdb701557a0c47072f87b9ae7bb25
diff --git a/devel/py-cython/patches/patch-ab b/devel/py-cython/patches/patch-ab
index 217d3b01d03..f73610ac2e0 100644
--- a/devel/py-cython/patches/patch-ab
+++ b/devel/py-cython/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/07/15 17:41:57 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2010/11/24 17:58:22 drochner Exp $
 
---- runtests.py.orig	2010-02-02 10:11:17.000000000 +0000
+--- runtests.py.orig	2010-08-25 06:38:31.000000000 +0000
 +++ runtests.py
-@@ -604,7 +604,7 @@ class EmbedTest(unittest.TestCase):
-         os.chdir(self.old_dir)
+@@ -646,7 +646,7 @@ class EmbedTest(unittest.TestCase):
          
      def test_embed(self):
--        self.assert_(os.system("make test > make.output") == 0)
-+        self.assert_(os.system("gmake test PYTHON=%s > make.output" % sys.executable) == 0)
- 
- class MissingDependencyExcluder:
-     def __init__(self, deps):
+         self.assert_(os.system(
+-            "make PYTHON='%s' test > make.output" % sys.executable) == 0)
++            "gmake PYTHON='%s' test > make.output" % sys.executable) == 0)
+         try:
+             os.remove('make.output')
+         except OSError:
diff --git a/devel/py-cython/patches/patch-ac b/devel/py-cython/patches/patch-ac
index 341b6c5b796..924da03d29c 100644
--- a/devel/py-cython/patches/patch-ac
+++ b/devel/py-cython/patches/patch-ac
@@ -1,33 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/07/15 17:41:57 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/11/24 17:58:22 drochner Exp $
 
---- Demos/embed/Makefile.orig	2010-02-02 10:11:16.000000000 +0000
+--- Demos/embed/Makefile.orig	2010-08-25 06:38:31.000000000 +0000
 +++ Demos/embed/Makefile
-@@ -1,17 +1,17 @@
- # Makefile for creating our standalone Cython program
--PYVERSION=$(shell python -c "import sys; print(sys.version[:3])")
--PYPREFIX=$(shell python -c "import sys; print(sys.prefix)")
--LINKFORSHARED=$(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LINKFORSHARED'))")
-+PYVERSION=$(shell ${PYTHON} -c "import sys; print(sys.version[:3])")
-+PYPREFIX=$(shell ${PYTHON} -c "import sys; print(sys.prefix)")
-+LINKFORSHARED=$(shell ${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LINKFORSHARED'))")
- INCLUDES=-I$(PYPREFIX)/include/python$(PYVERSION)
+@@ -13,7 +13,7 @@ LIBS=$(shell $(PYTHON) -c "import distut
+ SYSLIBS= $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SYSLIBS'))")
  
  embedded: embedded.o
--	gcc -o $@ $^ $(LINKFORSHARED) -lpython$(PYVERSION) -lm -lpthread -ldl -lutil -L$(PYPREFIX)/lib
-+	gcc -o $@ $^ $(LINKFORSHARED) -lpython$(PYVERSION) -lm -lpthread -lutil -L$(PYPREFIX)/lib -Wl,-R$(PYPREFIX)/lib
+-	$(LINKCC) -o $@ $^ $(LINKFORSHARED) -L$(LIBDIR1) -L$(LIBDIR2) -lpython$(PYVERSION) $(LIBS) $(SYSLIBS)
++	$(LINKCC) -o $@ $^ $(LINKFORSHARED) -L$(LIBDIR1) -L$(LIBDIR2) -lpython$(PYVERSION) $(LIBS) $(SYSLIBS) -Wl,-R$(LIBDIR1)
  
  embedded.o: embedded.c
- 	gcc -c $^ $(INCLUDES)
- 
- embedded.c: embedded.pyx
--	@python ../../cython.py --embed embedded.pyx
-+	@${PYTHON} ../../cython.py --embed embedded.pyx
- 
- all: embedded
- 
-@@ -21,4 +21,4 @@ clean:
- 
- test: clean all
- 	./embedded > test.output
--	python assert_equal.py embedded.output test.output
-+	${PYTHON} assert_equal.py embedded.output test.output
+ 	$(CC) -c $^ -I$(INCDIR)