Fix build with python-2.5, which does not install the debugger.

While here, add some REPLACE_PYTHON and bump PKGREVISION for it.

2 files changed, 45 insertions, 32 deletions

diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile
index b360440c54c..84768dc826c 100644
--- a/devel/py-cython/Makefile
+++ b/devel/py-cython/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2012/08/12 21:08:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/13 14:38:37 wiz Exp $
 #
 
 DISTNAME=	Cython-0.16
 PKGNAME=	${PYPKGPREFIX}-cython-0.16
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	http://cython.org/release/
 
@@ -17,6 +18,17 @@ USE_LANGUAGES=	c
 PYDISTUTILSPKG= yes
 
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_VARS=	cygdb
+
+REPLACE_PYTHON+=	Cython/Debugger/Cygdb.py
+REPLACE_PYTHON+=	Cython/Debugger/libpython.py
+REPLACE_PYTHON+=	cython.py
+
+.include "../../lang/python/pyversion.mk"
+
+.if ${PYVERSSUFFIX} != "2.5"
+PLIST.cygdb=	yes
+.endif
 
 post-extract:
 	cd ${WRKSRC}/bin && ${MV} cython cython${PYVERSSUFFIX}
@@ -27,6 +39,7 @@ post-extract:
 do-test:
 	(cd ${WRKSRC} && ${PYTHONBIN} runtests.py)
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 # for test only
 #.include "../../math/py-numpy/buildlink3.mk"
diff --git a/devel/py-cython/PLIST b/devel/py-cython/PLIST
index bcf8fc3d817..9249e37c1dd 100644
--- a/devel/py-cython/PLIST
+++ b/devel/py-cython/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/12 21:08:46 wiz Exp $
-bin/cygdb${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.4 2012/08/13 14:38:37 wiz Exp $
+${PLIST.cygdb}bin/cygdb${PYVERSSUFFIX}
 bin/cython${PYVERSSUFFIX}
 ${PYSITELIB}/Cython/Build/BuildExecutable.py
 ${PYSITELIB}/Cython/Build/BuildExecutable.pyc
@@ -175,35 +175,35 @@ ${PYSITELIB}/Cython/Compiler/Visitor.so
 ${PYSITELIB}/Cython/Compiler/__init__.py
 ${PYSITELIB}/Cython/Compiler/__init__.pyc
 ${PYSITELIB}/Cython/Compiler/__init__.pyo
-${PYSITELIB}/Cython/Debugger/Cygdb.py
-${PYSITELIB}/Cython/Debugger/Cygdb.pyc
-${PYSITELIB}/Cython/Debugger/Cygdb.pyo
-${PYSITELIB}/Cython/Debugger/DebugWriter.py
-${PYSITELIB}/Cython/Debugger/DebugWriter.pyc
-${PYSITELIB}/Cython/Debugger/DebugWriter.pyo
-${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.py
-${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.pyc
-${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.pyo
-${PYSITELIB}/Cython/Debugger/Tests/__init__.py
-${PYSITELIB}/Cython/Debugger/Tests/__init__.pyc
-${PYSITELIB}/Cython/Debugger/Tests/__init__.pyo
-${PYSITELIB}/Cython/Debugger/Tests/cfuncs.c
-${PYSITELIB}/Cython/Debugger/Tests/codefile
-${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.py
-${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.pyc
-${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.pyo
-${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.py
-${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.pyc
-${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.pyo
-${PYSITELIB}/Cython/Debugger/__init__.py
-${PYSITELIB}/Cython/Debugger/__init__.pyc
-${PYSITELIB}/Cython/Debugger/__init__.pyo
-${PYSITELIB}/Cython/Debugger/libcython.py
-${PYSITELIB}/Cython/Debugger/libcython.pyc
-${PYSITELIB}/Cython/Debugger/libcython.pyo
-${PYSITELIB}/Cython/Debugger/libpython.py
-${PYSITELIB}/Cython/Debugger/libpython.pyc
-${PYSITELIB}/Cython/Debugger/libpython.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Cygdb.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Cygdb.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Cygdb.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/DebugWriter.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/DebugWriter.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/DebugWriter.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/TestLibCython.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/__init__.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/__init__.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/__init__.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/cfuncs.c
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/codefile
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libcython_in_gdb.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/Tests/test_libpython_in_gdb.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/__init__.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/__init__.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/__init__.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libcython.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libcython.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libcython.pyo
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libpython.py
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libpython.pyc
+${PLIST.cygdb}${PYSITELIB}/Cython/Debugger/libpython.pyo
 ${PYSITELIB}/Cython/Debugging.py
 ${PYSITELIB}/Cython/Debugging.pyc
 ${PYSITELIB}/Cython/Debugging.pyo