- Move _epoll.so to PLIST.Linux (fixes PR pkg/39553).

- Adjust py-OpenSSL dependency down to 0.6.
- Use egg.mk instead of extension.mk, drop PYDISTUTILSPKG, and add egg foo
  to PLIST.

5 files changed, 68 insertions, 8 deletions

diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 1be850373b5..bae89c409b9 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2008/08/22 21:49:08 epg Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/16 01:59:07 epg Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
 COMMENT=		Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
-DEPENDS+=		${PYPKGPREFIX}-OpenSSL>=0.7:../../security/py-OpenSSL
+DEPENDS+=		${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=		${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
-PYDISTUTILSPKG=		yes
-
 do-test:
 	cd ${WRKSRC} && ./build/scripts-${PYVERSSUFFIX}/trial twisted
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index e184d6bb787..66150f9544b 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/08/22 21:49:08 epg Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/09/16 01:59:07 epg Exp $
 bin/bookify
 bin/cftp
 bin/ckeygen
@@ -16,6 +16,12 @@ bin/tapconvert
 bin/tkconch
 bin/trial
 bin/twistd
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/twisted/__init__.py
 ${PYSITELIB}/twisted/__init__.pyc
 ${PYSITELIB}/twisted/__init__.pyo
@@ -1118,7 +1124,6 @@ ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
 ${PYSITELIB}/twisted/python/_epoll.c
 ${PYSITELIB}/twisted/python/_epoll.pyx
-${PYSITELIB}/twisted/python/_epoll.so
 ${PYSITELIB}/twisted/python/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
@@ -1425,6 +1430,7 @@ ${PYSITELIB}/twisted/test/crash_test_dummy.py
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyc
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyo
 ${PYSITELIB}/twisted/test/generator_failure_tests.py
+${PYSITELIB}/twisted/test/generator_failure_tests.py.orig
 ${PYSITELIB}/twisted/test/generator_failure_tests.pyc
 ${PYSITELIB}/twisted/test/generator_failure_tests.pyo
 ${PYSITELIB}/twisted/test/iosim.py
@@ -2351,3 +2357,4 @@ ${PYSITELIB}/twisted/words/xish/xpathparser.pyo
 @dirrm ${PYSITELIB}/twisted/conch
 @dirrm ${PYSITELIB}/twisted/application
 @dirrm ${PYSITELIB}/twisted
+@dirrm ${PYSITELIB}/${EGG_INFODIR}
diff --git a/net/py-twisted/PLIST.Linux b/net/py-twisted/PLIST.Linux
new file mode 100644
index 00000000000..a56cd05b8db
--- /dev/null
+++ b/net/py-twisted/PLIST.Linux
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2008/09/16 01:59:07 epg Exp $
+${PYSITELIB}/twisted/python/_epoll.so
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index 0ab7da663bd..f53dbafa1b8 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/08/22 21:49:08 epg Exp $
+$NetBSD: distinfo,v 1.6 2008/09/16 01:59:07 epg Exp $
 
 SHA1 (Twisted-8.1.0.tar.bz2) = b10e523ab96032f5055ee02687b22bcd7cb02951
 RMD160 (Twisted-8.1.0.tar.bz2) = 1348f5e384a7d9d8591bd67e6b1f0d54aa18700e
 Size (Twisted-8.1.0.tar.bz2) = 2371422 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629
+SHA1 (patch-ac) = 3881dec501db0913a600bde78e6d96a106c33156
diff --git a/net/py-twisted/patches/patch-ac b/net/py-twisted/patches/patch-ac
new file mode 100644
index 00000000000..25a886e85b4
--- /dev/null
+++ b/net/py-twisted/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1 2008/09/16 01:59:07 epg Exp $
+
+Even though this file isn't run for 2.4, it's still compiled and installed,
+where it fails due to new generator syntax.
+
+--- twisted/test/generator_failure_tests.py.orig	2007-11-23 10:27:03.000000000 -0800
++++ twisted/test/generator_failure_tests.py
+@@ -63,7 +63,7 @@ class TwoPointFiveFailureTests(TestCase)
+         stuff = []
+         def generator():
+             try:
+-                yield
++                yield 1
+             except:
+                 stuff.append(sys.exc_info())
+             else:
+@@ -91,7 +91,7 @@ class TwoPointFiveFailureTests(TestCase)
+         foundFailures = []
+         def generator():
+             try:
+-                yield
++                yield 1
+             except:
+                 foundFailures.append(Failure._findFailure())
+             else:
+@@ -118,7 +118,7 @@ class TwoPointFiveFailureTests(TestCase)
+ 
+         def generator():
+             try:
+-                yield
++                yield 1
+             except:
+                 newFailures.append(Failure())
+             else:
+@@ -139,7 +139,7 @@ class TwoPointFiveFailureTests(TestCase)
+         def generator():
+             try:
+                 try:
+-                    yield
++                    yield 1
+                 except:
+                     [][1]
+             except:
+@@ -157,7 +157,7 @@ class TwoPointFiveFailureTests(TestCase)
+         """
+         def generator():
+             try:
+-                yield
++                yield 1
+             except:
+                 [][1]
+         g = generator()