diff options
author | hira <hira@pkgsrc.org> | 2009-01-20 09:52:12 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2009-01-20 09:52:12 +0000 |
commit | e3f84302c15ccf5003b445c26b98ef269a2c212a (patch) | |
tree | 6a5a5a2e8647af2e65e8980a514fec10e0e28219 /misc | |
parent | acba4755f5c7ddd61af25996f2aa57a6cfaeb514 (diff) | |
download | pkgsrc-e3f84302c15ccf5003b445c26b98ef269a2c212a.tar.gz |
- Fix charmap names for NetBSD (patch-ei).
- Use time_t instead of long on NetBSD (patch-ej).
Bump PKGREVISION.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/openoffice3/Makefile | 4 | ||||
-rw-r--r-- | misc/openoffice3/distinfo | 4 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ei | 48 | ||||
-rw-r--r-- | misc/openoffice3/patches/patch-ej | 16 |
4 files changed, 69 insertions, 3 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 4dabf55bfd6..f6524232f4f 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2008/11/24 11:53:12 hira Exp $ +# $NetBSD: Makefile,v 1.20 2009/01/20 09:52:12 hira Exp $ # OO_VER= 3.0.0 -PKGREVISION= 7 +PKGREVISION= 8 OO_TAG= OOO300_m9 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index cea3242b119..bb5c32f766e 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2008/11/26 15:33:23 hira Exp $ +$NetBSD: distinfo,v 1.17 2009/01/20 09:52:12 hira Exp $ SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d @@ -86,3 +86,5 @@ SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a SHA1 (patch-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70 SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083 +SHA1 (patch-ei) = 66a1280fec23204e3f919ab1d5280f87ff68161d +SHA1 (patch-ej) = 54cf0ae5619aae6655a66cd4c03191109546de12 diff --git a/misc/openoffice3/patches/patch-ei b/misc/openoffice3/patches/patch-ei new file mode 100644 index 00000000000..61e9fd9a0c2 --- /dev/null +++ b/misc/openoffice3/patches/patch-ei @@ -0,0 +1,48 @@ +$NetBSD: patch-ei,v 1.1 2009/01/20 09:52:12 hira 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 */ diff --git a/misc/openoffice3/patches/patch-ej b/misc/openoffice3/patches/patch-ej new file mode 100644 index 00000000000..809056b1a5b --- /dev/null +++ b/misc/openoffice3/patches/patch-ej @@ -0,0 +1,16 @@ +$NetBSD: patch-ej,v 1.1 2009/01/20 09:52:12 hira 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(); |