Update thrift to version 0.6.0 and fix the Perl support.

Changes since version 0.5.0:
 - THRIFT-1002: CodeStyle: t_c_glib_generator.cc (Anatol Pomozov)
 - THRIFT-975: lib/c_glib/README is missing => breaks make dist (Michael Lum)
 - THRIFT-1003: Polishing c_glib code (Anatol Pomozov)
 - THRIFT-582: C implementation of Thrift (Anatol Pomozov)
 - THRIFT-992: Naming convention in C# constructor is not consistent with
   other fields causes compile errors (Roger Meier)
 - THRIFT-904: Disable nagle and linger
 - THRIFT-977: Hex Conversion Bug in C++ TJSONProtocol (Aravind Narayanan)
 - THRIFT-922: Templatized [de]serialization code for C++ (David Reiss)
 - THRIFT-923: Event-driven client and server support for C++ (David Reiss)
 - THRIFT-925: Provide name<->value map for enums in C++ (David Reiss)
 - THRIFT-926: Miscellaneous C++ improvements (David Reiss)
 - THRIFT-928: Make more statistics available in C++ servers (David Reiss)
 - THRIFT-929: Improvements to the C++ test suite (David Reiss)
 - THRIFT-868: Referencing constant values doesn't work with with typedef
   types (David Reiss)
 - THRIFT-1006: Impossible to correctly qualify an enum constant in an
   external thrift file (Bryan Duxbury)
 - THRIFT-932: Haskell Haskell tests need to be run through 'make check' (and probably 'cabal check') too (Christian Lavoie)
 - THRIFT-933: Haskell Haskell's Thrift.cabal has warnings (Christian Lavoie)
 - THRIFT-943: Haskell Silly readme typo fix. (Christian Lavoie)
 - THRIFT-944: Haskell Support all version-4s of base (Christian Lavoie)
 - THRIFT-950: Haskell Haskell bindings treat 'byte' as unsigned 8-bit int (Data.Word.Word8), java/cpp as signed (byte/int8_t). (Christian Lavoie)
 - THRIFT-1009: Java TUnion does not correctly deep copy a ByteBuffer (Takashi Yonebayashi)
 - THRIFT-1013: Java generated java code may have name clashes with thrift library (Peter Schuller)
 - THRIFT-1015: Java TUnion does not handle ByteBuffer in toString (Takashi Yonebayashi)
 - THRIFT-1038: Java Generated Java code for structures containing binary fields (or collections thereof) are not serializable (in the Java sense) even though they implement java.io.Serializable (Mathias Herberts)
 - THRIFT-106: Java TSSLServerSocket (Nirmal Ranganathan)
 - THRIFT-377: Java TFileTransport port in Java (Joydeep Sen Sarma)
 - THRIFT-745: Java Make it easier to instantiate servers (Bryan Duxbury)
 - THRIFT-862: Java Async client issues / improvements (Ning Liang)
 - THRIFT-903: Java custom ThreadFactory in THsHaServer (Bryan Duxbury)
 - THRIFT-939: Java optional binary fields throw NPE on default byte[] getters (Bryan Duxbury)
 - THRIFT-947: Java Provide a helper method to determine the TProtocol used to serialize some data. (Mathias Herberts)
 - THRIFT-951: Java Add a new isServing() method to TServer (Bryan Duxbury)
 - THRIFT-957: Java THsHaServer: Change access modifier of the invoker field. (Benjamin Coverston)
 - THRIFT-958: Java Change accessmodifer on trans_ field in the FrameBuffer class to public. (Benjamin Coverston)
 - THRIFT-959: Java TSocket seems to do its own buffering inefficiently (Bryan Duxbury)
 - THRIFT-970: Java Under heavy load, THttpClient may fail with "too many open files" (Mathias Herberts)
 - THRIFT-971: Java java module can't be compiled without ivy and network connection (Roger Meier)
 - JavaScript: TestSuite using ant/ivy and Java's ServerTestBase Handler (Roger Meier)
 - THRIFT-1005: Java Give unions byte[] signature methods to go along with their ByteBuffer counterparts (Bryan Duxbury)
 - THRIFT-1008: Java byte[] accessors throw NPE on unset field (Bryan Duxbury)
 - THRIFT-517: Java TExceptions thrown by server result in cryptic error message on client - Tried to read 4 bytes, but only got 0 bytes (Bryan Duxbury)
 - THRIFT-946: Java Augment FieldValueMetaData so it differentiates 'string' and 'binary' fields. (Mathias Herberts)
 - THRIFT-949: Java Modify the TEnum interface so it defines a method similar to findByValue (Mathias Herberts)
 - THRIFT-960: Java add TestServer, TestNonblockingServer and TestClient again (Roger Meier)
 - THRIFT-969: Java Java Tutorial broken, move CalculatorHandler to a separate file (Roger Meier)
 - THRIFT-1051: Java Fix compiler issue for java 1.5
 - THRIFT-807: JavaScript JavaScript: Initialization of Base Types with 0 instead of null (Roger Meier)
 - THRIFT-913: JavaScript Test Case for Url encoded strings + simple enhancement to lib/js/test/RunTestServer.sh (Roger Meier)
 - THRIFT-961: JavaScript
 - THRIFT-1033: JavaScript Node.js support (Wade Simmons)
 - THRIFT-1042: JavaScript Node.js Fix TApplicationException.read Patch (Wade Simmons)
 - THRIFT-1043: JavaScript Node.js Fix how the length of a map is calculated
 - THRIFT-1044: JavaScript Fix JavaScript inheritance Patch (Wade Simmons)
 - THRIFT-71: Misc Debian packaging for thrift (Roger Meier)
 - THRIFT-1020: OCaml OCaml compiler generates invalid OCaml (Richard Low)
 - THRIFT-347: PHP PHP TSocket Timeout Issues (Tyler Hobbs)
 - THRIFT-924: PHP Fix generated php structure constants (David Reiss)
 - THRIFT-927: PHP Add option to modify the PHP include path (David Reiss)
 - THRIFT-935: PHP PHP Extension aborts the build if php-config is not installed (David Reiss)
 - THRIFT-941: PHP Make PHP C Extension use the defined Protocol writeMessageBegin function (Chris Goffinet)
 - THRIFT-955: PHP Thrift compiler for Windows uses lowercase names and directories which is inconsistent with compiling on other platforms (Roger Meier)
 - THRIFT-979: Ruby ruby bindings used to work on jruby (Jeff Hodges)
 - THRIFT-581: Test Suite Add a testsuite for txThrift (Twisted) (Esteve Fernandez)
 - THRIFT-1024: Tutorial Add Python Twisted example to the Tutorial (Roger Meier)
 - THRIFT-893: Tutorial add JavaScript to the tutorial examples (Roger Meier)

4 files changed, 45 insertions, 10 deletions

diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile
index 76c73eb1438..cd38172a505 100644
--- a/devel/libthrift/Makefile
+++ b/devel/libthrift/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/04/22 14:40:42 obache Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/20 01:07:12 tonnerre Exp $
 
 DISTNAME=	thrift-${THRIFT_VERSION}
 PKGNAME=	libthrift-${THRIFT_VERSION}
-PKGREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE:=incubator/thrift/${THRIFT_VERSION}-incubating/}
+MASTER_SITES=	${MASTER_SITE_APACHE:=incubator/thrift/${THRIFT_VERSION}/}
 
 MAINTAINER=	tonnerre@NetBSD.org
 HOMEPAGE=	http://incubator.apache.org/thrift/
@@ -19,7 +18,7 @@ USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
 WRKSRC=		${WRKDIR}/thrift-${THRIFT_VERSION}
-THRIFT_VERSION=	0.5.0
+THRIFT_VERSION=	0.6.0
 
 # FIXME: These should be options
 CONFIGURE_ARGS+=	--without-csharp
diff --git a/devel/libthrift/PLIST b/devel/libthrift/PLIST
index 250af5f2a8e..1841e25c3be 100644
--- a/devel/libthrift/PLIST
+++ b/devel/libthrift/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2010/10/16 11:38:05 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/05/20 01:07:12 tonnerre Exp $
 bin/thrift
 include/thrift/TApplicationException.h
 include/thrift/TLogging.h
 include/thrift/TProcessor.h
 include/thrift/TReflectionLocal.h
 include/thrift/Thrift.h
+include/thrift/async/SimpleCallback.h
+include/thrift/async/TAsyncBufferProcessor.h
+include/thrift/async/TAsyncChannel.h
+include/thrift/async/TAsyncProcessor.h
+include/thrift/async/TAsyncProtocolProcessor.h
+include/thrift/async/TEvhttpClientChannel.h
+include/thrift/async/TEvhttpServer.h
 include/thrift/concurrency/Exception.h
 include/thrift/concurrency/FunctionRunner.h
 include/thrift/concurrency/Monitor.h
@@ -19,14 +26,16 @@ include/thrift/processor/PeekProcessor.h
 include/thrift/processor/StatsProcessor.h
 include/thrift/protocol/TBase64Utils.h
 include/thrift/protocol/TBinaryProtocol.h
+include/thrift/protocol/TBinaryProtocol.tcc
 include/thrift/protocol/TCompactProtocol.h
+include/thrift/protocol/TCompactProtocol.tcc
 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/protocol/TVirtualProtocol.h
 include/thrift/server/TNonblockingServer.h
 include/thrift/server/TServer.h
 include/thrift/server/TSimpleServer.h
@@ -47,6 +56,7 @@ include/thrift/transport/TSocketPool.h
 include/thrift/transport/TTransport.h
 include/thrift/transport/TTransportException.h
 include/thrift/transport/TTransportUtils.h
+include/thrift/transport/TVirtualTransport.h
 include/thrift/transport/TZlibTransport.h
 ${PLIST.erlang}lib/erlang/lib/thrift-${PKGVERSION}/ebin/thrift.app
 ${PLIST.erlang}lib/erlang/lib/thrift-${PKGVERSION}/ebin/thrift_base64_transport.beam
@@ -92,6 +102,18 @@ ${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
+${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/FramedTransport.pm
+${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/HttpClient.pm
+${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/MemoryBuffer.pm
+${PLIST.perl}lib/perl5/vendor_perl/5.12.0/Thrift/Protocol.pm
+${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
 lib/pkgconfig/thrift-nb.pc
 lib/pkgconfig/thrift-z.pc
 lib/pkgconfig/thrift.pc
diff --git a/devel/libthrift/distinfo b/devel/libthrift/distinfo
index 82e4eac6354..e96782c83aa 100644
--- a/devel/libthrift/distinfo
+++ b/devel/libthrift/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/10/16 11:38:05 tonnerre Exp $
+$NetBSD: distinfo,v 1.3 2011/05/20 01:07:12 tonnerre Exp $
 
-SHA1 (thrift-0.5.0.tar.gz) = f6bef78306fd7b407646d3a03ce4cd3bd05424a0
-RMD160 (thrift-0.5.0.tar.gz) = a89dca0263ccdc6cc08faa7ba1409099922fb6e5
-Size (thrift-0.5.0.tar.gz) = 1822087 bytes
+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 (patch-aa) = 3075afcacfc51f74e00c01109782ea85e4c57b32
+SHA1 (patch-ab) = b41c1c5b3a1e44dea10328b7e2ccddaecd8d03ce
diff --git a/devel/libthrift/patches/patch-ab b/devel/libthrift/patches/patch-ab
new file mode 100644
index 00000000000..0c75b9866b2
--- /dev/null
+++ b/devel/libthrift/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2011/05/20 01:07:12 tonnerre Exp $
+
+--- test/hs/run-test.sh.orig	2011-01-31 01:13:11.000000000 +0000
++++ test/hs/run-test.sh
+@@ -19,7 +19,7 @@
+ # under the License.
+ #
+ 
+-if [ "x" == "x$1" ]; then
++if [ "x" = "x$1" ]; then
+   printf "run-test.sh needs an argument, the name of the test to run. Try 'ThriftTest' or 'ProtoDebugTest'\n"
+   exit 2
+ fi