Updated devel/libthrift to 0.6.1. Besides minor changes in 0.6.1 (see below),

major fixes to the pkgsrc package:

* Libraries can now be enable/disabled properly.
* Using a proper Java buildlink.
* Fixed dependencies for the Java and Perl library builds.
* Passing the Python prefix now for proper installation.
* Patched the Ruby library to support DESTDIR and prefer the vendor dir.
* Explicitly install the C# library, as the Makefile won't do it.

Changelog for 0.6.1:

* .keystore and .truststore are missing from the 0.6.0 distribution
* C# JSON Protocol is unable to decode escaped characters in string
* Maven Deploy
* Deploy fb303 along side libthrift to maven repo
* Java and JavaScript tutorial is broken since we have Java maven deployment

6 files changed, 296 insertions, 29 deletions

diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile
index cd38172a505..9c77437e950 100644
--- a/devel/libthrift/Makefile
+++ b/devel/libthrift/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 01:07:12 tonnerre Exp $
+# $NetBSD: Makefile,v 1.7 2011/06/03 13:39:44 fhajny Exp $
 
 DISTNAME=	thrift-${THRIFT_VERSION}
 PKGNAME=	libthrift-${THRIFT_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE:=incubator/thrift/${THRIFT_VERSION}/}
+MASTER_SITES=	${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/}
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	tonnerre@NetBSD.org
 HOMEPAGE=	http://incubator.apache.org/thrift/
 COMMENT=	Cross-language data serialization library
+LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,15 +20,7 @@ USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
 WRKSRC=		${WRKDIR}/thrift-${THRIFT_VERSION}
-THRIFT_VERSION=	0.6.0
-
-# FIXME: These should be options
-CONFIGURE_ARGS+=	--without-csharp
-CONFIGURE_ARGS+=	--without-erlang
-CONFIGURE_ARGS+=	--without-java
-CONFIGURE_ARGS+=	--without-perl
-CONFIGURE_ARGS+=	--without-py
-CONFIGURE_ARGS+=	--without-ruby
+THRIFT_VERSION=	0.6.1
 
 .include "options.mk"
 
diff --git a/devel/libthrift/PLIST b/devel/libthrift/PLIST
index 1841e25c3be..863a6e82c5b 100644
--- a/devel/libthrift/PLIST
+++ b/devel/libthrift/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/05/20 01:07:12 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/06/03 13:39:44 fhajny Exp $
 bin/thrift
 include/thrift/TApplicationException.h
 include/thrift/TLogging.h
@@ -102,7 +102,6 @@ ${PLIST.erlang}lib/erlang/lib/thrift-${PKGVERSION}/src/thrift_transport_state_te
 lib/libthrift.la
 lib/libthriftnb.la
 lib/libthriftz.la
-${PLIST.perl}lib/perl5/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/perllocal.pod
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift.pm
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/BinaryProtocol.pm
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/BufferedTransport.pm
@@ -114,6 +113,234 @@ ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/Server.pm
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/Socket.pm
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/Transport.pm
 ${PLIST.perl}lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Thrift/.packlist
+${PLIST.php}${PHP_EXTENSION_DIR}/thrift_protocol.so
 lib/pkgconfig/thrift-nb.pc
 lib/pkgconfig/thrift-z.pc
 lib/pkgconfig/thrift.pc
+${PLIST.python}${PYSITELIB}/thrift/TSCons.py
+${PLIST.python}${PYSITELIB}/thrift/TSCons.pyc
+${PLIST.python}${PYSITELIB}/thrift/TSCons.pyo
+${PLIST.python}${PYSITELIB}/thrift/TSerialization.py
+${PLIST.python}${PYSITELIB}/thrift/TSerialization.pyc
+${PLIST.python}${PYSITELIB}/thrift/TSerialization.pyo
+${PLIST.python}${PYSITELIB}/thrift/Thrift.py
+${PLIST.python}${PYSITELIB}/thrift/Thrift.pyc
+${PLIST.python}${PYSITELIB}/thrift/Thrift.pyo
+${PLIST.python}${PYSITELIB}/thrift/__init__.py
+${PLIST.python}${PYSITELIB}/thrift/__init__.pyc
+${PLIST.python}${PYSITELIB}/thrift/__init__.pyo
+${PLIST.python}${PYSITELIB}/thrift/protocol/TBinaryProtocol.py
+${PLIST.python}${PYSITELIB}/thrift/protocol/TBinaryProtocol.pyc
+${PLIST.python}${PYSITELIB}/thrift/protocol/TBinaryProtocol.pyo
+${PLIST.python}${PYSITELIB}/thrift/protocol/TCompactProtocol.py
+${PLIST.python}${PYSITELIB}/thrift/protocol/TCompactProtocol.pyc
+${PLIST.python}${PYSITELIB}/thrift/protocol/TCompactProtocol.pyo
+${PLIST.python}${PYSITELIB}/thrift/protocol/TProtocol.py
+${PLIST.python}${PYSITELIB}/thrift/protocol/TProtocol.pyc
+${PLIST.python}${PYSITELIB}/thrift/protocol/TProtocol.pyo
+${PLIST.python}${PYSITELIB}/thrift/protocol/__init__.py
+${PLIST.python}${PYSITELIB}/thrift/protocol/__init__.pyc
+${PLIST.python}${PYSITELIB}/thrift/protocol/__init__.pyo
+${PLIST.python}${PYSITELIB}/thrift/protocol/fastbinary.so
+${PLIST.python}${PYSITELIB}/thrift/server/THttpServer.py
+${PLIST.python}${PYSITELIB}/thrift/server/THttpServer.pyc
+${PLIST.python}${PYSITELIB}/thrift/server/THttpServer.pyo
+${PLIST.python}${PYSITELIB}/thrift/server/TNonblockingServer.py
+${PLIST.python}${PYSITELIB}/thrift/server/TNonblockingServer.pyc
+${PLIST.python}${PYSITELIB}/thrift/server/TNonblockingServer.pyo
+${PLIST.python}${PYSITELIB}/thrift/server/TServer.py
+${PLIST.python}${PYSITELIB}/thrift/server/TServer.pyc
+${PLIST.python}${PYSITELIB}/thrift/server/TServer.pyo
+${PLIST.python}${PYSITELIB}/thrift/server/__init__.py
+${PLIST.python}${PYSITELIB}/thrift/server/__init__.pyc
+${PLIST.python}${PYSITELIB}/thrift/server/__init__.pyo
+${PLIST.python}${PYSITELIB}/thrift/transport/THttpClient.py
+${PLIST.python}${PYSITELIB}/thrift/transport/THttpClient.pyc
+${PLIST.python}${PYSITELIB}/thrift/transport/THttpClient.pyo
+${PLIST.python}${PYSITELIB}/thrift/transport/TSocket.py
+${PLIST.python}${PYSITELIB}/thrift/transport/TSocket.pyc
+${PLIST.python}${PYSITELIB}/thrift/transport/TSocket.pyo
+${PLIST.python}${PYSITELIB}/thrift/transport/TTransport.py
+${PLIST.python}${PYSITELIB}/thrift/transport/TTransport.pyc
+${PLIST.python}${PYSITELIB}/thrift/transport/TTransport.pyo
+${PLIST.python}${PYSITELIB}/thrift/transport/TTwisted.py
+${PLIST.python}${PYSITELIB}/thrift/transport/TTwisted.pyc
+${PLIST.python}${PYSITELIB}/thrift/transport/TTwisted.pyo
+${PLIST.python}${PYSITELIB}/thrift/transport/__init__.py
+${PLIST.python}${PYSITELIB}/thrift/transport/__init__.pyc
+${PLIST.python}${PYSITELIB}/thrift/transport/__init__.pyo
+${PLIST.ruby}${RUBY_VENDORARCHLIB}/thrift_native.${RUBY_DLEXT}
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/client.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/core_ext.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/core_ext/fixnum.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/exceptions.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/processor.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/protocol/base_protocol.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/protocol/binary_protocol.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/protocol/binary_protocol_accelerated.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/protocol/compact_protocol.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/serializer/deserializer.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/serializer/serializer.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/base_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/mongrel_http_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/nonblocking_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/simple_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/thread_pool_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/server/threaded_server.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/struct.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/struct_union.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/thrift_native.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/base_server_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/base_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/buffered_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/framed_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/http_client_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/io_stream_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/memory_buffer_transport.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/server_socket.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/socket.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/unix_server_socket.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/transport/unix_socket.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/types.rb
+${PLIST.ruby}${RUBY_VENDORLIB}/thrift/union.rb
+${PLIST.csharp}lib/thrift/Thrift.dll
+${PLIST.java}share/doc/thrift/java/allclasses-frame.html
+${PLIST.java}share/doc/thrift/java/allclasses-noframe.html
+${PLIST.java}share/doc/thrift/java/constant-values.html
+${PLIST.java}share/doc/thrift/java/deprecated-list.html
+${PLIST.java}share/doc/thrift/java/help-doc.html
+${PLIST.java}share/doc/thrift/java/index-all.html
+${PLIST.java}share/doc/thrift/java/index.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/EncodingUtils.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/ShortStack.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TApplicationException.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TBase.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TBaseHelper.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TByteArrayOutputStream.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TDeserializer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TEnum.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TEnumHelper.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TException.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TFieldIdEnum.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TFieldRequirementType.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TProcessor.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TProcessorFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TSerializer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TServiceClient.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TServiceClientFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/TUnion.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/AsyncMethodCallback.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/TAsyncClient.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/TAsyncClientFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/TAsyncClientManager.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/TAsyncMethodCall.State.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/TAsyncMethodCall.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/async/package-tree.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/EnumMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/FieldMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/FieldValueMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/ListMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/MapMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/SetMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/StructMetaData.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/meta_data/package-tree.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/package-tree.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TBinaryProtocol.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TBinaryProtocol.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TCompactProtocol.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TCompactProtocol.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TField.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.JSONBaseContext.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.JSONListContext.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.JSONPairContext.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.LookaheadReader.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TJSONProtocol.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TList.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TMap.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TMessage.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TMessageType.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TProtocol.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TProtocolException.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TProtocolFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TProtocolUtil.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSet.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSimpleJSONProtocol.Context.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSimpleJSONProtocol.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSimpleJSONProtocol.ListContext.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSimpleJSONProtocol.StructContext.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TSimpleJSONProtocol.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TStruct.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/TType.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/protocol/package-tree.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/THsHaServer.Args.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/THsHaServer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TNonblockingServer.AbstractNonblockingServerArgs.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TNonblockingServer.Args.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TNonblockingServer.FrameBuffer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TNonblockingServer.SelectThread.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TNonblockingServer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TServer.AbstractServerArgs.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TServer.Args.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TServer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TServlet.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TSimpleServer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TThreadPoolServer.Args.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/TThreadPoolServer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/server/package-tree.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/AutoExpandingBuffer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/AutoExpandingBufferReadTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFastFramedTransport.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFastFramedTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileProcessor.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileTransport.Event.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileTransport.chunkState.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileTransport.tailPolicy.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFileTransport.truncableBufferedInputStream.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFramedTransport.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TFramedTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/THttpClient.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/THttpClient.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TIOStreamTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TMemoryBuffer.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TMemoryInputTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TNonblockingServerSocket.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TNonblockingServerTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TNonblockingSocket.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TNonblockingTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSSLTransportFactory.TSSLTransportParameters.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSSLTransportFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSaslClientTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSaslServerTransport.Factory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSaslServerTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSeekableFile.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TServerSocket.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TServerTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TSocket.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TStandardFile.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TTransport.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TTransportException.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/TTransportFactory.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/package-frame.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/package-summary.html
+${PLIST.java}share/doc/thrift/java/org/apache/thrift/transport/package-tree.html
+${PLIST.java}share/doc/thrift/java/overview-frame.html
+${PLIST.java}share/doc/thrift/java/overview-summary.html
+${PLIST.java}share/doc/thrift/java/overview-tree.html
+${PLIST.java}share/doc/thrift/java/package-list
+${PLIST.java}share/doc/thrift/java/resources/inherit.gif
+${PLIST.java}share/doc/thrift/java/serialized-form.html
+${PLIST.java}share/doc/thrift/java/stylesheet.css
diff --git a/devel/libthrift/distinfo b/devel/libthrift/distinfo
index e96782c83aa..5e3ccf8fe70 100644
--- a/devel/libthrift/distinfo
+++ b/devel/libthrift/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2011/05/20 01:07:12 tonnerre Exp $
+$NetBSD: distinfo,v 1.4 2011/06/03 13:39:44 fhajny Exp $
 
-SHA1 (thrift-0.6.0.tar.gz) = 5027cba1e901134a3b767ffd5af1d8a1b3cb40f5
-RMD160 (thrift-0.6.0.tar.gz) = 634a8ff7b6a41029358d671ec9e936ca905ef373
-Size (thrift-0.6.0.tar.gz) = 6291833 bytes
+SHA1 (thrift-0.6.1.tar.gz) = 0a764a5ffbf92291538c0c78457786c02f78f0fa
+RMD160 (thrift-0.6.1.tar.gz) = fc038573f6968f98e39e2d0fbe5399630f819f91
+Size (thrift-0.6.1.tar.gz) = 2034583 bytes
 SHA1 (patch-aa) = 3075afcacfc51f74e00c01109782ea85e4c57b32
 SHA1 (patch-ab) = b41c1c5b3a1e44dea10328b7e2ccddaecd8d03ce
+SHA1 (patch-lib__rb__Makefile.in) = b3dfc24c1e7b7a77f3ea8fc0e8ffa8a603de7cd8
+SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73
diff --git a/devel/libthrift/options.mk b/devel/libthrift/options.mk
index d7d942c9b4b..67d46cf26f4 100644
--- a/devel/libthrift/options.mk
+++ b/devel/libthrift/options.mk
@@ -1,30 +1,37 @@
-# $NetBSD: options.mk,v 1.3 2010/11/14 12:09:22 tonnerre Exp $
+# $NetBSD: options.mk,v 1.4 2011/06/03 13:39:44 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libthrift
 PKG_SUPPORTED_OPTIONS=	csharp java erlang python perl php ruby
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		perl erlang
+PLIST_VARS+=		csharp erlang java perl php python ruby
 
 .if !empty(PKG_OPTIONS:Mcsharp)
 CONFIGURE_ARGS+=	--with-csharp
 CONFIGURE_ARGS+=	--enable-gen-csharp
+PLIST.csharp=		yes
+INSTALLATION_DIRS+=	lib/thrift
+
+post-install:
+	${INSTALL_LIB} ${WRKSRC}/lib/csharp/Thrift.dll \
+	  ${DESTDIR}${PREFIX}/lib/thrift/Thrift.dll
 
 .include "../../lang/mono/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-csharp
-CONFIGURE_ARGS+=	--disable-gen-csharp
 .endif
 
 .if !empty(PKG_OPTIONS:Mjava)
 CONFIGURE_ARGS+=	--with-java
 CONFIGURE_ARGS+=	--enable-gen-java
-
-.include "../../lang/openjdk7/buildlink3.mk"
+USE_JAVA=		yes
+USE_JAVA2=		6
+.include "../../mk/java-vm.mk"
+BUILD_DEPENDS+=		apache-ant-[0-9]*:../../devel/apache-ant
+PLIST.java=		yes
 .else
 CONFIGURE_ARGS+=	--without-java
-CONFIGURE_ARGS+=	--disable-gen-java
 .endif
 
 .if !empty(PKG_OPTIONS:Merlang)
@@ -35,17 +42,18 @@ PLIST.erlang=		yes
 .include "../../lang/erlang/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-erlang
-CONFIGURE_ARGS+=	--disable-gen-erl
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
 CONFIGURE_ARGS+=	--with-py
 CONFIGURE_ARGS+=	--enable-gen-py
+PLIST.python=		yes
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
 
 .include "../../lang/python/extension.mk"
+CONFIGURE_ENV+=		PY_PREFIX=${BUILDLINK_PREFIX.${PYPACKAGE}}
 .else
 CONFIGURE_ARGS+=	--without-py
-CONFIGURE_ARGS+=	--disable-gen-py
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
@@ -59,30 +67,34 @@ PLIST.perl=		yes
 
 #PERL5_PACKLIST=		auto/Thrift/.packlist
 
+DEPENDS+=		p5-Bit-Vector-[0-9]*:../../devel/p5-Bit-Vector
+DEPENDS+=		p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
 .include "../../lang/perl5/module.mk"
 .else
 CONFIGURE_ARGS+=	--without-perl
-CONFIGURE_ARGS+=	--disable-gen-perl
 .endif
 
 .if !empty(PKG_OPTIONS:Mphp)
 CONFIGURE_ARGS+=	--with-php
 CONFIGURE_ARGS+=	--with-php_extension
 CONFIGURE_ARGS+=	--enable-gen-php
+PLIST.php=		yes
+DIST_SUBDIR=		#
 
-.include "../../lang/php/ext.mk"
+.include "../../lang/php/phpversion.mk"
+.include "${PHPPKGSRCDIR}/Makefile.common"
+.include "${PHPPKGSRCDIR}/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-php
 CONFIGURE_ARGS+=	--without-php_extension
-CONFIGURE_ARGS+=	--disable-gen-php
 .endif
 
 .if !empty(PKG_OPTIONS:Mruby)
 CONFIGURE_ARGS+=	--with-ruby
 CONFIGURE_ARGS+=	--enable-gen-rb
+PLIST.ruby=		yes
 
 .include "../../lang/ruby/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-ruby
-CONFIGURE_ARGS+=	--disable-gen-rb
 .endif
diff --git a/devel/libthrift/patches/patch-lib__rb__Makefile.in b/devel/libthrift/patches/patch-lib__rb__Makefile.in
new file mode 100644
index 00000000000..f48812cbdf1
--- /dev/null
+++ b/devel/libthrift/patches/patch-lib__rb__Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib__rb__Makefile.in,v 1.1 2011/06/03 13:39:44 fhajny Exp $
+
+Add DESTDIR support to Ruby installation.
+--- lib/rb/Makefile.in.orig	2011-06-03 07:19:09.444665000 +0000
++++ lib/rb/Makefile.in
+@@ -426,7 +426,7 @@ all-local:
+ 	$(RUBY) setup.rb setup
+ 
+ install-exec-hook:
+-	$(RUBY) setup.rb install
++	$(RUBY) setup.rb install --prefix=$(DESTDIR)
+ 
+ # Make sure this doesn't fail if Ruby is not configured.
+ clean-local:
diff --git a/devel/libthrift/patches/patch-lib__rb__setup.rb b/devel/libthrift/patches/patch-lib__rb__setup.rb
new file mode 100644
index 00000000000..6e869818f97
--- /dev/null
+++ b/devel/libthrift/patches/patch-lib__rb__setup.rb
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib__rb__setup.rb,v 1.1 2011/06/03 13:39:45 fhajny Exp $
+
+pkgsrc prefers vendor Ruby dirs.
+--- lib/rb/setup.rb.orig	2011-01-31 01:13:14.000000000 +0000
++++ lib/rb/setup.rb
+@@ -165,9 +165,9 @@ class ConfigTable
+       libruby         = "#{c['prefix']}/lib/ruby"
+       librubyver      = c['rubylibdir']
+       librubyverarch  = c['archdir']
+-      siteruby        = c['sitedir']
+-      siterubyver     = c['sitelibdir']
+-      siterubyverarch = c['sitearchdir']
++      siteruby        = c['vendordir']
++      siterubyver     = c['vendorlibdir']
++      siterubyverarch = c['vendorarchdir']
+     elsif newpath_p
+       # 1.4.4 <= V <= 1.6.3
+       libruby         = "#{c['prefix']}/lib/ruby"