Upgrade to Twisted 1.0.3

Approved by:	wjv

1 files changed, 7 insertions, 22 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 4e77fa6dc364..43d8a2b2a206 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,42 +6,27 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.3
 CATEGORIES=	devel net python
-MASTER_SITES=	http://twistedmatrix.com/downloads/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://twisted.sourceforge.net/ \
+		http://twistedmatrix.com/downloads/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Twisted-${PORTVERSION}
 
 MAINTAINER=	wjv@FreeBSD.org
 
-# - Defining the variable WITHOUT_TESTS at build time will remove the
-#   dependency on PyUnit (which has a few large dependencies).  This will
-#   allow this port to build with no runtime dependencies except Python
-#   itself - often ideal for server machines running production code based
-#   on Twisted.
-#
 # - Note that Twisted ships with some graphical examples and clients that
 #   require PyGNOME to run.  These are not central to the funcitoning of
 #   Twisted, but the user should feel free to install x11-toolits/py-gnome
 #   separately if desired.
 
-.if !defined(WITHOUT_TESTS)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/unittest.py:${PORTSDIR}/devel/py-unit \
-		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-.endif
-
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_REINPLACE=	yes
 MAN1=		coil.1 im.1 manhole.1 mktap.1 t-im.1 tapconvert.1 twistd.1
 
-post-patch:
-	@ ${REINPLACE_CMD} -e 's/from pyunit import/import/g' \
-	  ${WRKSRC}/admin/runtests ${WRKSRC}/twisted/test/*.py
-
 pre-install:
 	@ ${SH} ${PKGREQ} INSTALL
 
@@ -54,18 +39,18 @@ post-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}/man
-.for docfile in CREDITS ChangeLog README TODO
+.for docfile in CREDITS ChangeLog README
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
-.for htmlman in ${MAN1:S/1/html/}
+.for htmlman in ${MAN1:S/.1/-man.xhtml/}
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/man/${htmlman} ${DOCSDIR}/man
 .endfor
 	@ cd ${WRKSRC}/doc && \
 	  ${FIND} * -type d -maxdepth 0 \! -name examples \! -name man | \
 	  ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
 	@ ${MKDIR} ${EXAMPLESDIR}/scripts ${EXAMPLESDIR}/static
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/examples/* ${EXAMPLESDIR}/scripts
-	@ ${INSTALL_DATA} ${WRKSRC}/static/* ${EXAMPLESDIR}/static
+	@ ${CP} -R ${WRKSRC}/doc/examples/* ${EXAMPLESDIR}/scripts
+	@ ${CP} -R ${WRKSRC}/static/* ${EXAMPLESDIR}/static
 .endif
 
 .include <bsd.port.mk>