[pkgsrc/trunk]: pkgsrc/misc/openoffice Fix bug that japanese fonts can't be d...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2c9311d3438
branches:  trunk
changeset: 489774:b2c9311d3438
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sat Feb 26 16:07:46 2005 +0000

description:
Fix bug that japanese fonts can't be displayed.
Patch from Nobuyuki SASAKI in
http://mail-index.netbsd.org/tech-pkg/2005/02/22/0005.html.

diffstat:

 misc/openoffice/Makefile         |   3 ++-
 misc/openoffice/distinfo         |   3 ++-
 misc/openoffice/patches/patch-ay |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r acdcc6d1d1e6 -r b2c9311d3438 misc/openoffice/Makefile
--- a/misc/openoffice/Makefile  Sat Feb 26 16:01:32 2005 +0000
+++ b/misc/openoffice/Makefile  Sat Feb 26 16:07:46 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2005/02/26 15:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2005/02/26 16:07:46 mrauch Exp $
 
 DISTNAME=              openoffice-1.1.4
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/}
 DISTFILES=             OOo_1.1.4_source.tar.gz
diff -r acdcc6d1d1e6 -r b2c9311d3438 misc/openoffice/distinfo
--- a/misc/openoffice/distinfo  Sat Feb 26 16:01:32 2005 +0000
+++ b/misc/openoffice/distinfo  Sat Feb 26 16:07:46 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2005/02/24 11:02:56 agc Exp $
+$NetBSD: distinfo,v 1.29 2005/02/26 16:07:46 mrauch Exp $
 
 SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430
 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587
@@ -54,3 +54,4 @@
 SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
 SHA1 (patch-aw) = 15a27595dbf7599943ff9847e4841b1b62e792a6
 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364
+SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849
diff -r acdcc6d1d1e6 -r b2c9311d3438 misc/openoffice/patches/patch-ay
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice/patches/patch-ay  Sat Feb 26 16:07:46 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.3 2005/02/26 16:07:46 mrauch Exp $
+
+--- ../sal/osl/unx/nlsupport.c.orig    28 Jan 2004 10:17:50 -0000
++++ ../sal/osl/unx/nlsupport.c 21 Feb 2005 04:57:37 -0000
+@@ -329,7 +329,7 @@
+    { "sjis",          RTL_TEXTENCODING_SHIFT_JIS      } /* Japan */
+ };
+ 
+-#elif defined(LINUX) || defined(NETBSD)
++#elif defined(LINUX)
+ 
+ const _pair _nl_language_list[] = {
+     { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */