* Fix PLIST problem; caused by new javadoc?

* Use newer data type name of PHP.

3 files changed, 22 insertions, 3 deletions

diff --git a/devel/libthrift/PLIST b/devel/libthrift/PLIST
index a8429ed396a..1dc3896032a 100644
--- a/devel/libthrift/PLIST
+++ b/devel/libthrift/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/03/09 14:31:07 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/06/16 01:42:57 taca Exp $
 bin/thrift
 include/thrift/TApplicationException.h
 include/thrift/TLogging.h
@@ -355,6 +355,9 @@ ${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/resources/background.gif
+${PLIST.java}share/doc/thrift/java/resources/tab.gif
+${PLIST.java}share/doc/thrift/java/resources/titlebar.gif
+${PLIST.java}share/doc/thrift/java/resources/titlebar_end.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 7e082d4ac3e..8ec40362e93 100644
--- a/devel/libthrift/distinfo
+++ b/devel/libthrift/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2012/03/09 14:31:07 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2012/06/16 01:42:58 taca Exp $
 
 SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
 RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
@@ -7,3 +7,4 @@ SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116
 SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec
 SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73
 SHA1 (patch-lib_erl_Makefile.in) = 74bfbc9f191f685cb175801a495ae4af0eaa6e69
+SHA1 (patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp) = 6c1f1add0bfc652662efa59fc47d15e91a4d6a2b
diff --git a/devel/libthrift/patches/patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp b/devel/libthrift/patches/patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp
new file mode 100644
index 00000000000..007d0d7fc27
--- /dev/null
+++ b/devel/libthrift/patches/patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_php_src_ext_thrift__protocol_php__thrift__protocol.cpp,v 1.1 2012/06/16 01:42:58 taca Exp $
+
+Use modern data structure name.
+
+--- lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp.orig	2011-08-11 13:19:15.000000000 +0000
++++ lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
+@@ -92,7 +92,7 @@ const int BAD_VERSION = 4;
+ #include "zend_exceptions.h"
+ #include "php_thrift_protocol.h"
+ 
+-static function_entry thrift_protocol_functions[] = {
++static zend_function_entry thrift_protocol_functions[] = {
+   PHP_FE(thrift_protocol_write_binary, NULL)
+   PHP_FE(thrift_protocol_read_binary, NULL)
+   {NULL, NULL, NULL}