4 files changed, 17 insertions, 39 deletions

diff --git a/devel/py-thrift/Makefile b/devel/py-thrift/Makefile
index 5ad81a0699b3..c2e68e4981e6 100644
--- a/devel/py-thrift/Makefile
+++ b/devel/py-thrift/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20070917
+PORTVERSION=	20090622
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	py-
 DISTFILES=
@@ -14,8 +14,6 @@ DISTFILES=
 MAINTAINER=	jdugan@x1024.net
 COMMENT=	Python interface to Thrift
 
-BROKEN=		needs updating for Apache Incubator version
-
 EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/thrift:extract
 
 USE_PYTHON=	yes
@@ -25,4 +23,10 @@ post-extract:
 	@${LN} -sfh \
 	`cd ${PORTSDIR}/devel/thrift && ${MAKE} -V WRKSRC`/lib/py ${WRKSRC}
 
+do-patch:
+	${REINPLACE_CMD} "/name = '/s/Thrift/thrift/" \
+	    ${WRKSRC}/setup.py
+	${REINPLACE_CMD} "/version = '/s/0\.1/${PORTVERSION}/" \
+	    ${WRKSRC}/setup.py
+
 .include <bsd.port.mk>
diff --git a/devel/py-thrift/files/patch-lib-py-setup.py b/devel/py-thrift/files/patch-lib-py-setup.py
deleted file mode 100644
index 3d130b1e987c..000000000000
--- a/devel/py-thrift/files/patch-lib-py-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
-*** setup.py.orig	Wed Dec 12 16:38:52 2007
---- setup.py	Wed Dec 12 16:39:23 2007
-***************
-*** 12,19 ****
-                            sources = ['src/protocol/fastbinary.c'],
-                            )
-  
-! setup(name = 'Thrift',
-!       version = '1.0',
-        description = 'Thrift Python Libraries',
-        author = ['Mark Slee'],
-        author_email = ['mcslee@facebook.com'],
---- 12,19 ----
-                            sources = ['src/protocol/fastbinary.c'],
-                            )
-  
-! setup(name = 'thrift',
-!       version = '20070917',
-        description = 'Thrift Python Libraries',
-        author = ['Mark Slee'],
-        author_email = ['mcslee@facebook.com'],
diff --git a/devel/py-thrift/pkg-descr b/devel/py-thrift/pkg-descr
index 6fac38f12742..7f93ecdb520d 100644
--- a/devel/py-thrift/pkg-descr
+++ b/devel/py-thrift/pkg-descr
@@ -1,3 +1,3 @@
 Python interface to Thrift.
 
-WWW: http://developers.facebook.com/thrift/
+WWW: http://incubator.apache.org/thrift/
diff --git a/devel/py-thrift/pkg-plist b/devel/py-thrift/pkg-plist
index ceea85c53832..10726e388415 100644
--- a/devel/py-thrift/pkg-plist
+++ b/devel/py-thrift/pkg-plist
@@ -17,18 +17,12 @@
 %%PYTHON_SITELIBDIR%%/thrift/protocol/__init__.pyc
 %%PYTHON_SITELIBDIR%%/thrift/protocol/__init__.pyo
 %%PYTHON_SITELIBDIR%%/thrift/protocol/fastbinary.so
-%%PYTHON_SITELIBDIR%%/thrift/reflection/__init__.py
-%%PYTHON_SITELIBDIR%%/thrift/reflection/__init__.pyc
-%%PYTHON_SITELIBDIR%%/thrift/reflection/__init__.pyo
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/__init__.py
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/__init__.pyc
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/__init__.pyo
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/constants.py
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/constants.pyc
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/constants.pyo
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/ttypes.py
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/ttypes.pyc
-%%PYTHON_SITELIBDIR%%/thrift/reflection/limited/ttypes.pyo
+%%PYTHON_SITELIBDIR%%/thrift/server/THttpServer.py
+%%PYTHON_SITELIBDIR%%/thrift/server/THttpServer.pyc
+%%PYTHON_SITELIBDIR%%/thrift/server/THttpServer.pyo
+%%PYTHON_SITELIBDIR%%/thrift/server/TNonblockingServer.py
+%%PYTHON_SITELIBDIR%%/thrift/server/TNonblockingServer.pyc
+%%PYTHON_SITELIBDIR%%/thrift/server/TNonblockingServer.pyo
 %%PYTHON_SITELIBDIR%%/thrift/server/TServer.py
 %%PYTHON_SITELIBDIR%%/thrift/server/TServer.pyc
 %%PYTHON_SITELIBDIR%%/thrift/server/TServer.pyo
@@ -44,12 +38,13 @@
 %%PYTHON_SITELIBDIR%%/thrift/transport/TTransport.py
 %%PYTHON_SITELIBDIR%%/thrift/transport/TTransport.pyc
 %%PYTHON_SITELIBDIR%%/thrift/transport/TTransport.pyo
+%%PYTHON_SITELIBDIR%%/thrift/transport/TTwisted.py
+%%PYTHON_SITELIBDIR%%/thrift/transport/TTwisted.pyc
+%%PYTHON_SITELIBDIR%%/thrift/transport/TTwisted.pyo
 %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.py
 %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/thrift/transport
 @dirrm %%PYTHON_SITELIBDIR%%/thrift/server
-@dirrm %%PYTHON_SITELIBDIR%%/thrift/reflection/limited
-@dirrm %%PYTHON_SITELIBDIR%%/thrift/reflection
 @dirrm %%PYTHON_SITELIBDIR%%/thrift/protocol
 @dirrm %%PYTHON_SITELIBDIR%%/thrift