Pullup ticket #2676 - requested by hira
openoffice3: bug fixes

Revisions pulled up:
- misc/openoffice3/Makefile			1.20-1.21
- misc/openoffice3/PLIST			1.7
- misc/openoffice3/distinfo			1.17
- misc/openoffice3/patches/patch-ei		1.1
- misc/openoffice3/patches/patch-ej		1.1
---
Module Name:	pkgsrc
Committed By:	hira
Date:		Tue Jan 20 09:52:12 UTC 2009

Modified Files:
	pkgsrc/misc/openoffice3: Makefile distinfo
Added Files:
	pkgsrc/misc/openoffice3/patches: patch-ei patch-ej

Log Message:
 - Fix charmap names for NetBSD (patch-ei).
 - Use time_t instead of long on NetBSD (patch-ej).

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	hira
Date:		Tue Jan 20 10:19:30 UTC 2009

Modified Files:
	pkgsrc/misc/openoffice3: Makefile PLIST

Log Message:
 - Add missing entries to INSTALLATION_DIRS.
 - Remove entries which are generated from openoffice.org.xml from PLIST.

This should fix installation with USE_DESTDIR=Full.
Reported by abs@ in private e-mail.


(tron)

$NetBSD: patch-ei,v 1.1.2.2 2009/02/02 07:26:00 tron Exp $

--- sal/osl/unx/nlsupport.c.orig	2008-04-10 20:09:41.000000000 +0900
+++ sal/osl/unx/nlsupport.c	2009-01-12 11:08:25.000000000 +0900
@@ -318,7 +318,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 */
@@ -529,16 +529,22 @@
 const _pair _nl_language_list[] = {
     { "ASCII",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
     { "BIG5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
+    { "Big5",          RTL_TEXTENCODING_BIG5           }, /* China - Traditional Chinese */
+    { "Big5-HKSCS",    RTL_TEXTENCODING_BIG5_HKSCS     }, /* locale: zh_CN.BIG5HK */
+    { "Big5HKSCS",     RTL_TEXTENCODING_BIG5_HKSCS     }, /* depricated */
     { "CP1251",        RTL_TEXTENCODING_MS_1251        }, /* MS-CYRL */
     { "CP866",         RTL_TEXTENCODING_IBM_866        }, /* CP866 866 */
     { "CTEXT",         RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
-    { "EUCCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
-    { "EUCJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
-    { "EUCKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
-    { "EUCTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
+    { "eucCN",         RTL_TEXTENCODING_EUC_CN         }, /* China - Simplified Chinese */
+    { "eucJP",         RTL_TEXTENCODING_EUC_JP         }, /* Japan */
+    { "eucKR",         RTL_TEXTENCODING_EUC_KR         }, /* Korea */
+    { "eucTW",         RTL_TEXTENCODING_EUC_TW         }, /* China - Traditional Chinese */
+    { "GB18030",       RTL_TEXTENCODING_GB_18030       }, /* locale: zh_CN.gb18030 */
+    { "GB2312",        RTL_TEXTENCODING_GB_2312        }, /* locale: zh_CN */
     { "ISO-2022-JP",   RTL_TEXTENCODING_DONTKNOW       }, /* */
     { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW       }, /* */
     { "ISO8859-1",     RTL_TEXTENCODING_ISO_8859_1     }, /* Western */
+    { "ISO8859-13",    RTL_TEXTENCODING_ISO_8859_13    }, /* ISO-IR-179 LATIN7 */
     { "ISO8859-15",    RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
     { "ISO8859-2",     RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
     { "ISO8859-4",     RTL_TEXTENCODING_ISO_8859_4     }, /* LATIN4 L4 */
@@ -547,6 +553,7 @@
     { "ISO8859-9",     RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
     { "KOI8-R",        RTL_TEXTENCODING_KOI8_R         }, /* KOI8-R */
     { "KOI8-U",        RTL_TEXTENCODING_KOI8_U         }, /* KOI8-U */
+    { "PT154",         RTL_TEXTENCODING_PT154          }, /* */
     { "SJIS",          RTL_TEXTENCODING_SHIFT_JIS      }, /* Japan */
     { "US-ASCII",      RTL_TEXTENCODING_ASCII_US       }, /* US-ASCII */
     { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */

$NetBSD: patch-ej,v 1.1.2.2 2009/02/02 07:26:00 tron Exp $

--- rsc/source/rscpp/cpp3.c.orig	2008-04-11 16:35:31.000000000 +0900
+++ rsc/source/rscpp/cpp3.c	2009-01-20 17:53:33.000000000 +0900
@@ -469,7 +469,11 @@
         register char           *tp;
         register DEFBUF         *dp;
         int                     i;
+#ifdef NETBSD
+        time_t                  tvec;
+#else
         long                    tvec;
+#endif
 
 #if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3)
         extern char             *ctime();