4 files changed, 68 insertions, 24 deletions

diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 8178db61a5e1..51420c8a8cb2 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	thrift
-PORTVERSION=	20070917
-PORTREVISION=	2
+PORTVERSION=	20090622
 CATEGORIES=	devel
-MASTER_SITES=	http://developers.facebook.com/thrift/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	bms
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Framework for scalable cross-language services development
@@ -17,22 +17,60 @@ COMMENT=	Framework for scalable cross-language services development
 LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost \
 		event-1.4:${PORTSDIR}/devel/libevent
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	autoconf:262:env autoheader:262:env aclocal:19:env \
+		automake:19:env libtool:15:env
+USE_GNOME=	pkgconfig
+USE_BZIP2=	yes
 USE_GCC=	4.2+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
-		--with-event=${LOCALBASE}
+CONFIGURE_ARGS=	--with-boost=${LOCALBASE} --with-libevent=${LOCALBASE} \
+		--enable-shared --enable-static --with-zlib
 CONFIGURE_ENV+=	${MAKE_ENV}
 
-post-patch:
-	${REINPLACE_CMD} -i '' -e 's=lib/py ==' ${WRKSRC}/*.*
+# TODO: Add runtime auto-dependencies on erlang, perl, python, ruby, java.
+# Not familiar with csharp, probably needs Mono.
+CONFIGURE_ARGS+= \
+		--without-csharp \
+		--without-erlang \
+		--without-java \
+		--without-perl \
+		--without-py \
+		--without-ruby
 
-post-install:
-.ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/thrift.pdf ${DOCSDIR}
+.include <bsd.port.pre.mk>
+#
+# 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
+
+pre-configure:
+	@(cd ${WRKSRC} && ./bootstrap.sh)
+
+post-install:
+	@${LN} -sf ${PREFIX}/lib/libthrift.so.0 ${PREFIX}/lib/libthrift.so
+	@${LN} -sf ${PREFIX}/lib/libthriftnb.so.0 ${PREFIX}/lib/libthriftnb.so
+	@${LN} -sf ${PREFIX}/lib/libthriftz.so.0 ${PREFIX}/lib/libthriftz.so
+
+# TODO: Documentation is not currently installed; requires TeX.
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/thrift/distinfo b/devel/thrift/distinfo
index 17f12fd4115a..d8e77a16d2a8 100644
--- a/devel/thrift/distinfo
+++ b/devel/thrift/distinfo
@@ -1,3 +1,3 @@
-MD5 (thrift-20070917.tar.gz) = 2c96285e123113930400879663f354aa
-SHA256 (thrift-20070917.tar.gz) = dc4003144e19a11bcd2a4795c74a28d6596cf9a3cdc2a230ec6b7579e848e1e9
-SIZE (thrift-20070917.tar.gz) = 1228184
+MD5 (thrift-20090622.tar.bz2) = f24951cb4bc19cb8841c84f62badce34
+SHA256 (thrift-20090622.tar.bz2) = 832faf51971cf8857cacade7b00996719be382992d924ca3263ee07af2c6ee36
+SIZE (thrift-20090622.tar.bz2) = 517465
diff --git a/devel/thrift/pkg-descr b/devel/thrift/pkg-descr
index 4ab6c0ca3989..4a7b27aa1108 100644
--- a/devel/thrift/pkg-descr
+++ b/devel/thrift/pkg-descr
@@ -9,4 +9,4 @@ servers.
 Thrift is specifically designed to support non-atomic version changes
 across client and server code.
 
-WWW: http://developers.facebook.com/thrift/
+WWW: http://incubator.apache.org/thrift/
diff --git a/devel/thrift/pkg-plist b/devel/thrift/pkg-plist
index 292fb97dc543..0116a01532f4 100644
--- a/devel/thrift/pkg-plist
+++ b/devel/thrift/pkg-plist
@@ -4,8 +4,8 @@ include/thrift/TProcessor.h
 include/thrift/TReflectionLocal.h
 include/thrift/Thrift.h
 include/thrift/config.h
-include/thrift/reflection_limited_types.h
 include/thrift/concurrency/Exception.h
+include/thrift/concurrency/FunctionRunner.h
 include/thrift/concurrency/Monitor.h
 include/thrift/concurrency/Mutex.h
 include/thrift/concurrency/PosixThreadFactory.h
@@ -15,21 +15,29 @@ include/thrift/concurrency/TimerManager.h
 include/thrift/concurrency/Util.h
 include/thrift/processor/PeekProcessor.h
 include/thrift/processor/StatsProcessor.h
+include/thrift/protocol/TBase64Utils.h
 include/thrift/protocol/TBinaryProtocol.h
+include/thrift/protocol/TCompactProtocol.h
 include/thrift/protocol/TDebugProtocol.h
 include/thrift/protocol/TDenseProtocol.h
+include/thrift/protocol/TJSONProtocol.h
 include/thrift/protocol/TOneWayProtocol.h
 include/thrift/protocol/TProtocol.h
 include/thrift/protocol/TProtocolException.h
+include/thrift/protocol/TProtocolTap.h
 include/thrift/server/TNonblockingServer.h
 include/thrift/server/TServer.h
 include/thrift/server/TSimpleServer.h
 include/thrift/server/TThreadPoolServer.h
 include/thrift/server/TThreadedServer.h
+include/thrift/transport/TBufferTransports.h
+include/thrift/transport/TFDTransport.h
 include/thrift/transport/TFileTransport.h
 include/thrift/transport/THttpClient.h
 include/thrift/transport/TServerSocket.h
 include/thrift/transport/TServerTransport.h
+include/thrift/transport/TShortReadTransport.h
+include/thrift/transport/TSimpleFileTransport.h
 include/thrift/transport/TSocket.h
 include/thrift/transport/TSocketPool.h
 include/thrift/transport/TTransport.h
@@ -48,11 +56,9 @@ lib/libthriftz.a
 lib/libthriftz.la
 lib/libthriftz.so
 lib/libthriftz.so.0
-share/thrift/if/reflection_limited.thrift
-%%PORTDOCS%%%%DOCSDIR%%/thrift.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/thrift/if
-@dirrm share/thrift
+libdata/pkgconfig/thrift-nb.pc
+libdata/pkgconfig/thrift-z.pc
+libdata/pkgconfig/thrift.pc
 @dirrm include/thrift/transport
 @dirrm include/thrift/server
 @dirrm include/thrift/protocol