8 files changed, 22 insertions, 34 deletions

diff --git a/devel/erlang-thrift/Makefile b/devel/erlang-thrift/Makefile
index 9098494a3da9..771cba2dc64a 100644
--- a/devel/erlang-thrift/Makefile
+++ b/devel/erlang-thrift/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20090622
-PORTREVISION=	1
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 DISTFILES=
diff --git a/devel/p5-Thrift/Makefile b/devel/p5-Thrift/Makefile
index 81f7c00f9d7a..904a8def18bd 100644
--- a/devel/p5-Thrift/Makefile
+++ b/devel/p5-Thrift/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	Thrift
-PORTVERSION=	20090622
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel perl5
 PKGNAMEPREFIX=	p5-
 DISTFILES=
@@ -18,8 +19,6 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Bit/Vector.pm:${PORTSDIR}/math/p5-Bit-Vec
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/thrift:extract \
 		${SITE_PERL}/${PERL_ARCH}/Bit/Vector.pm:${PORTSDIR}/math/p5-Bit-Vector
 
-PERL_CONFIGURE=	5.6.0+
-
 post-extract:
 	@${LN} -sfh \
 	`cd ${PORTSDIR}/devel/thrift && ${MAKE} -V WRKSRC`/lib/perl ${WRKSRC}
diff --git a/devel/p5-Thrift/pkg-plist b/devel/p5-Thrift/pkg-plist
index 6e4c6da7f61f..87797b9cdedc 100644
--- a/devel/p5-Thrift/pkg-plist
+++ b/devel/p5-Thrift/pkg-plist
@@ -6,6 +6,7 @@
 %%SITE_PERL%%/Thrift/HttpClient.pm
 %%SITE_PERL%%/Thrift/MemoryBuffer.pm
 %%SITE_PERL%%/Thrift/Protocol.pm
+%%SITE_PERL%%/Thrift/Server.pm
 %%SITE_PERL%%/Thrift/Socket.pm
 %%SITE_PERL%%/Thrift/Transport.pm
 @dirrm %%SITE_PERL%%/Thrift
diff --git a/devel/py-thrift/Makefile b/devel/py-thrift/Makefile
index 3d60f8173cf6..64299dae8adc 100644
--- a/devel/py-thrift/Makefile
+++ b/devel/py-thrift/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20090622
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=
diff --git a/devel/ruby-thrift/Makefile b/devel/ruby-thrift/Makefile
index cd1463e64420..a63f9e509e9a 100644
--- a/devel/ruby-thrift/Makefile
+++ b/devel/ruby-thrift/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20090622
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ruby-
 DISTFILES=
diff --git a/devel/rubygem-thrift/Makefile b/devel/rubygem-thrift/Makefile
index cd1463e64420..a63f9e509e9a 100644
--- a/devel/rubygem-thrift/Makefile
+++ b/devel/rubygem-thrift/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20090622
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ruby-
 DISTFILES=
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index f06feb490c56..d9375e52eb9d 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20090622
+PORTVERSION=	0.2.0
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	bms
+MASTER_SITES=	APACHE
+MASTER_SITE_SUBDIR=	incubator/thrift/${PORTVERSION}-incubating
+DISTNAME=	thrift-${PORTVERSION}-incubating
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Framework for scalable cross-language services development
@@ -20,17 +22,19 @@ LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs \
 USE_AUTOTOOLS=	autoconf:262:env autoheader:262:env aclocal:19:env \
 		automake:19:env libtool:22:env
 USE_GNOME=	pkgconfig
-USE_BZIP2=	yes
 USE_GCC=	4.2+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE} --with-libevent=${LOCALBASE} \
 		--enable-shared --enable-static --with-zlib
 CONFIGURE_ENV+=	${MAKE_ENV}
 
+# For Erlang support, use devel/erlang-thrift.
+# For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
 # For Ruby support, use devel/ruby-thrift.
 # Other languages are not yet supported, please feel free to contribute
@@ -49,25 +53,6 @@ CONFIGURE_ARGS+= \
 BROKEN=		Does not compile on sparc64
 .endif
 
-#
-# To roll snapshot: as bms: env BOOTSTRAP=defined make fetch
-#
-.if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-SVN_REV=	787160		# svn tip at epoch 20090622
-SVNROOT_URI=	http://svn.apache.org/repos/asf/incubator/thrift
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	svn export -r ${SVN_REV} ${SVNROOT_URI}/trunk ${WRKSRC}
-	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.if ${USER} == bms
-	${CHMOD} ugo+r ${DISTDIR}/${DISTNAME}.tar.bz2
-	scp -p ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    freefall.freebsd.org:public_distfiles/
-.endif
-.endif # defined(BOOTSTRAP)
-
 do-patch:
 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
 
diff --git a/devel/thrift/distinfo b/devel/thrift/distinfo
index d8e77a16d2a8..1821d5f1dbb4 100644
--- a/devel/thrift/distinfo
+++ b/devel/thrift/distinfo
@@ -1,3 +1,3 @@
-MD5 (thrift-20090622.tar.bz2) = f24951cb4bc19cb8841c84f62badce34
-SHA256 (thrift-20090622.tar.bz2) = 832faf51971cf8857cacade7b00996719be382992d924ca3263ee07af2c6ee36
-SIZE (thrift-20090622.tar.bz2) = 517465
+MD5 (thrift-0.2.0-incubating.tar.gz) = 9958c57c402c02171ba0bcc96183505c
+SHA256 (thrift-0.2.0-incubating.tar.gz) = b56f4dcc2b7f4d1ee1c2577eec45f530cdaca0c97b28ae52affa618d7305f711
+SIZE (thrift-0.2.0-incubating.tar.gz) = 1514845