Fix PLIST mismatch for the java option, fix build on SunOS for ruby.

4 files changed, 20 insertions, 8 deletions

diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile
index 4ede10dd5cc..5c80f290fcb 100644
--- a/devel/libthrift/Makefile
+++ b/devel/libthrift/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/02/29 16:32:21 hans Exp $
+# $NetBSD: Makefile,v 1.15 2012/03/09 14:31:07 fhajny Exp $
 
 DISTNAME=	thrift-${THRIFT_VERSION}
 PKGNAME=	libthrift-${THRIFT_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/}
 EXTRACT_SUFX=	.tar.gz
diff --git a/devel/libthrift/PLIST b/devel/libthrift/PLIST
index 8e66c24aaa9..a8429ed396a 100644
--- a/devel/libthrift/PLIST
+++ b/devel/libthrift/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/09/12 15:51:02 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/03/09 14:31:07 fhajny Exp $
 bin/thrift
 include/thrift/TApplicationException.h
 include/thrift/TLogging.h
@@ -355,9 +355,6 @@ ${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/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/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 40f813792f0..7e082d4ac3e 100644
--- a/devel/libthrift/distinfo
+++ b/devel/libthrift/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/11/05 22:54:43 marino Exp $
+$NetBSD: distinfo,v 1.7 2012/03/09 14:31:07 fhajny Exp $
 
 SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
 RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
 Size (thrift-0.7.0.tar.gz) = 2248326 bytes
 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
diff --git a/devel/libthrift/patches/patch-lib__rb__ext__extconf.rb b/devel/libthrift/patches/patch-lib__rb__ext__extconf.rb
new file mode 100644
index 00000000000..10e1c8e1099
--- /dev/null
+++ b/devel/libthrift/patches/patch-lib__rb__ext__extconf.rb
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib__rb__ext__extconf.rb,v 1.1 2012/03/09 14:31:08 fhajny Exp $
+
+Disable -Werror so that strlcpy can be detected on SunOS.
+--- lib/rb/ext/extconf.rb.orig	2011-08-11 13:19:13.000000000 +0000
++++ lib/rb/ext/extconf.rb
+@@ -22,7 +22,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE 
+ else
+   require 'mkmf'
+ 
+-  $CFLAGS = "-g -O2 -Wall -Werror"
++  $CFLAGS = "-g -O2 -Wall"
+ 
+   have_func("strlcpy", "string.h")
+