Fix packaging when py-setuptools is installed by just switching to it

completely and adapting the package.
Replace patch-aa with post-install target.
Fix interpreter path in installed file.
Bump PKGREVISION.

Addresses PR pkg/48602 by Hauke Fath.

4 files changed, 17 insertions, 34 deletions

diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile
index 7e90b806d1a..3d8e8208f4b 100644
--- a/devel/py-cython/Makefile
+++ b/devel/py-cython/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2014/01/27 19:44:24 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/02/18 16:13:31 wiz Exp $
 
 DISTNAME=	Cython-0.20
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Cy/cy/}
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	http://cython.org/release/
 
@@ -11,26 +12,27 @@ COMMENT=	C-Extensions for Python
 LICENSE=	apache-1.1
 
 USE_LANGUAGES=	c
-PYDISTUTILSPKG= yes
 
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_VARS=	cygdb
 
+REPLACE_PYTHON+=	Cython/Build/Cythonize.py
 REPLACE_PYTHON+=	Cython/Debugger/Cygdb.py
 REPLACE_PYTHON+=	Cython/Debugger/libpython.py
 REPLACE_PYTHON+=	cython.py
 
-post-extract:
-	cd ${WRKSRC}/bin && ${MV} cython cython${PYVERSSUFFIX}
-	cd ${WRKSRC}/bin && ${MV} cygdb cygdb${PYVERSSUFFIX}
-
 # for test only
 #USE_LANGUAGES+= c++
 do-test:
 	(cd ${WRKSRC} && ${PYTHONBIN} runtests.py)
 
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+		${MV} cython cython${PYVERSSUFFIX} && \
+		${MV} cygdb cygdb${PYVERSSUFFIX}
+
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 # for test only
 #.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cython/PLIST b/devel/py-cython/PLIST
index 25d6c2f9918..eb81e83fe41 100644
--- a/devel/py-cython/PLIST
+++ b/devel/py-cython/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.11 2014/01/27 19:44:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/02/18 16:13:31 wiz Exp $
 bin/cygdb${PYVERSSUFFIX}
 bin/cython${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/Cython/Build/BuildExecutable.py
 ${PYSITELIB}/Cython/Build/BuildExecutable.pyc
 ${PYSITELIB}/Cython/Build/BuildExecutable.pyo
diff --git a/devel/py-cython/distinfo b/devel/py-cython/distinfo
index 0c35cf4aff1..ea91708a08e 100644
--- a/devel/py-cython/distinfo
+++ b/devel/py-cython/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2014/01/27 19:44:24 wiz Exp $
+$NetBSD: distinfo,v 1.12 2014/02/18 16:13:31 wiz Exp $
 
 SHA1 (Cython-0.20.tar.gz) = fb22442bd23acb26b6a803bad0dd6746cbb602f3
 RMD160 (Cython-0.20.tar.gz) = bc67c79c9eb817db2a1213bda4ab7fa7e3c5a4b5
 Size (Cython-0.20.tar.gz) = 1420856 bytes
-SHA1 (patch-aa) = 78bed9e17be5bc5e97695fe6c7fd6bc09d8e2b6a
 SHA1 (patch-ab) = de923488eb3f08f7e048c35c57bd60cbfb2b4c53
 SHA1 (patch-ac) = 79b421be9b4b72c57df9907533c4732fec9458f9
diff --git a/devel/py-cython/patches/patch-aa b/devel/py-cython/patches/patch-aa
deleted file mode 100644
index 46d4e32ffa1..00000000000
--- a/devel/py-cython/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2013/10/20 22:04:31 wiz Exp $
-
-Avoid conflicts between different python package versions.
-
---- setup.py.orig	2013-10-13 08:38:32.000000000 +0000
-+++ setup.py
-@@ -76,7 +76,7 @@ if 'setuptools' in sys.modules:
-     scripts = []
- else:
-     if os.name == "posix":
--        scripts = ["bin/cython"]
-+        scripts = ["bin/cython" + sys.version[0:3]]
-     else:
-         scripts = ["cython.py"]
- 
-@@ -86,7 +86,7 @@ if include_debugger:
-             'cygdb = Cython.Debugger.Cygdb:main')
-     else:
-         if os.name == "posix":
--            scripts.append('bin/cygdb')
-+            scripts.append('bin/cygdb' + sys.version[0:3])
-         else:
-             scripts.append('cygdb.py')
-