Fix creation of a filter description file even if the system does not

have Java.  This makes the package savable with some formats.
Bump PKGREVISION.

4 files changed, 40 insertions, 3 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 4cf3441dcba..c8bdeff0cb4 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2007/03/12 10:21:18 hira Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/19 16:51:14 hira Exp $
 #
 
 OO_VER=			2.1.0
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index acc980bb155..4b20fd34d5c 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/03/17 02:24:36 hira Exp $
+$NetBSD: distinfo,v 1.8 2007/03/19 16:51:14 hira Exp $
 
 SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
 RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
@@ -55,3 +55,5 @@ SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bu) = 246771afac29432adbe479e5be3b3c032ad49413
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = aa286260f21820a8c39812fe82ef62e56921a950
+SHA1 (patch-bx) = 9d01592c69f0ba734ff488980c475a1b768bc229
+SHA1 (patch-by) = 01ee243687c11a63a53f33d6230ad9cc5a5912ba
diff --git a/misc/openoffice2/patches/patch-bx b/misc/openoffice2/patches/patch-bx
new file mode 100644
index 00000000000..6f8f80efb93
--- /dev/null
+++ b/misc/openoffice2/patches/patch-bx
@@ -0,0 +1,12 @@
+$NetBSD: patch-bx,v 1.1 2007/03/19 16:51:15 hira Exp $
+
+--- filter/source/config/fragments/makefile.mk.orig	2007-03-19 22:39:17.000000000 +0900
++++ filter/source/config/fragments/makefile.mk	2007-03-19 22:40:40.000000000 +0900
+@@ -154,6 +154,7 @@
+ .IF "$(SOLAR_JAVA)"==""
+ #cmc, hack to workaround the java build requirement
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
++PACKLANG:=$(PERL) langfilter.pl
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+ XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
diff --git a/misc/openoffice2/patches/patch-by b/misc/openoffice2/patches/patch-by
new file mode 100644
index 00000000000..19a0443d57c
--- /dev/null
+++ b/misc/openoffice2/patches/patch-by
@@ -0,0 +1,23 @@
+$NetBSD: patch-by,v 1.1 2007/03/19 16:51:15 hira Exp $
+
+--- filter/source/config/fragments/langfilter.pl.orig	2007-03-19 22:40:51.000000000 +0900
++++ filter/source/config/fragments/langfilter.pl	2007-03-19 22:41:34.000000000 +0900
+@@ -0,0 +1,18 @@
++#!/usr/pkg/bin/perl
++
++use strict;
++
++# XXX
++my $infile = $ARGV[1];
++my $lang=$ARGV[4];
++
++open(IN, $infile) || die "cannot open: $!";
++
++while (<IN>) {
++	if (/^\s*<value xml:lang="\s*(.*)\s*".*$/) {
++		next if ($1 ne $lang);
++	}
++	print $_;
++}
++
++close(IN);