- Update to version 0.17.4

svn path=/head/; revision=58053

devel/py-twisted/Makefile

@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	0.15.0
+PORTVERSION=	0.17.4
 CATEGORIES=	devel net python
-MASTER_SITES=	http://twistedmatrix.com/downloads/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Twisted-${PORTVERSION}
 
@@ -18,13 +19,15 @@ BUILD_DEPENDS=	${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/unittest.py:${PORTSDIR}/devel/py-unit \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 
+USE_BZIP2=	yes
 USE_PYTHON=	yes
 PYTHON_SETUP=	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
-MAN1=		faucet.1 gnusto.1 im.1 manhole.1 mktap.1 twistd.1
+CPIO=		cpio --quiet -pdum -R
+MAN1=		coil.1 im.1 manhole.1 mktap.1 t-im.1 twistd.1
 
 post-patch:
 	@ ${PERL} -pi -e 's/from pyunit import/import/g' \
-	  ${WRKSRC}/bin/runtests ${WRKSRC}/twisted/test/*.py
+	  ${WRKSRC}/admin/runtests ${WRKSRC}/twisted/test/*.py
 
 do-build:
 	@ cd ${WRKSRC} && ${PYTHON_SETUP} build
@@ -32,20 +35,28 @@ do-build:
 do-install:
 	@ cd ${WRKSRC} && ${PYTHON_SETUP} install -c -O1 \
 	  --prefix=${PREFIX}
+	@ ${MKDIR} ${DATADIR}/admin
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/admin/accepttests \
+	  ${WRKSRC}/admin/runtests ${DATADIR}/admin
 .for manpage in ${MAN1}
 	@ ${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage} ${MANPREFIX}/man/man1
 .endfor
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}/img
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/img/*.bmp ${DOCSDIR}/img
+	@ ${MKDIR} ${DOCSDIR}/api
+	@ cd ${WRKSRC}/doc/api && find * \
+	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/api
+.for docsubdir in howto img
+	@ ${MKDIR} ${DOCSDIR}/${docsubdir}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/${docsubdir}/* ${DOCSDIR}/${docsubdir}
+.endfor
 .for docfile in CREDITS ERRATA README TODO
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
-	@ ${MKDIR} ${EXAMPLESDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/examples/* ${EXAMPLESDIR}
+	@ ${MKDIR} ${EXAMPLESDIR}/scripts ${EXAMPLESDIR}/static
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/examples/* ${EXAMPLESDIR}/scripts
+	@ ${INSTALL_DATA} ${WRKSRC}/static/* ${EXAMPLESDIR}/static
 .endif
 
 .include <bsd.port.mk>

devel/py-twisted/distinfo

@@ -1 +1 @@
-MD5 (Twisted-0.15.0.tar.gz) = 3c6f785aaa4f3b46904988d72e23c7d9
+MD5 (Twisted-0.17.4.tar.bz2) = a8d6b3515251714867e31e54eec6efb1

devel/py-twisted/files/patch-setup.py

@@ -1,16 +1,11 @@
---- setup.py.orig	Mon Jan 28 11:41:12 2002
-+++ setup.py	Wed Feb 13 15:20:01 2002
-@@ -82,8 +82,11 @@
-     setup_args['platforms'] = "win32 posix"
- 
+--- setup.py.orig	Thu Apr 18 21:49:03 2002
++++ setup.py	Wed Apr 24 11:15:18 2002
+@@ -216,7 +216,7 @@
  if os.name == 'posix':
--    import glob
--    setup_args['scripts'] = filter(os.path.isfile, glob.glob('bin/*'))
-+    setup_args['scripts'] = ['bin/accepttests', 'bin/cpyrght', 'bin/faucet',
-+                             'bin/gnusto', 'bin/im', 'bin/malyon',
-+                             'bin/manhole', 'bin/mapeditor', 'bin/mktap',
-+                             'bin/runtests', 'bin/t-im', 'bin/twistd',
-+                             'bin/twistd-debug']
- 
- #'"
- # for building C banana...
+     setup_args['scripts'] = [
+         'bin/manhole', 'bin/mktap', 'bin/twistd',
+-        'bin/im', 'bin/t-im', 'bin/tap2deb',
++        'bin/im', 'bin/t-im',
+         'bin/coil',
+     ]
+ else: