pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2008Q4]: pkgsrc/misc/openoffice3 Pullup ticket #2676 - request...
details: https://anonhg.NetBSD.org/pkgsrc/rev/616c1f7f566c
branches: pkgsrc-2008Q4
changeset: 552295:616c1f7f566c
user: tron <tron%pkgsrc.org@localhost>
date: Mon Feb 02 07:26:00 2009 +0000
description:
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.
diffstat:
misc/openoffice3/Makefile | 8 ++++--
misc/openoffice3/PLIST | 38 +------------------------------
misc/openoffice3/distinfo | 4 ++-
misc/openoffice3/patches/patch-ei | 48 +++++++++++++++++++++++++++++++++++++++
misc/openoffice3/patches/patch-ej | 16 +++++++++++++
5 files changed, 73 insertions(+), 41 deletions(-)
diffs (164 lines):
diff -r c91e3b61b485 -r 616c1f7f566c misc/openoffice3/Makefile
--- a/misc/openoffice3/Makefile Sun Feb 01 22:53:09 2009 +0000
+++ b/misc/openoffice3/Makefile Mon Feb 02 07:26:00 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/11/24 11:53:12 hira Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2009/02/02 07:26:00 tron Exp $
#
OO_VER= 3.0.0
-PKGREVISION= 7
+PKGREVISION= 8
OO_TAG= OOO300_m9
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice3-${OO_VER}
@@ -140,7 +140,9 @@
PLIST_SUBST+= OO_ICON_PREFIX=openofficeorg3
MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX}
INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \
- lib/${OO_RELEASE}/extensions
+ lib/${OO_RELEASE}/extensions \
+ share/application-registry share/mime-info \
+ share/mime/packages
OO_UNXNAME= openoffice.org3
OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
diff -r c91e3b61b485 -r 616c1f7f566c misc/openoffice3/PLIST
--- a/misc/openoffice3/PLIST Sun Feb 01 22:53:09 2009 +0000
+++ b/misc/openoffice3/PLIST Mon Feb 02 07:26:00 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/11/26 15:33:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2009/02/02 07:26:00 tron Exp $
bin/scalc
bin/sdraw
bin/simpress
@@ -303,42 +303,6 @@
${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet.desktop
${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text-template.desktop
${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text.desktop
-share/mime/application/vnd.ms-excel.sheet.binary.macroenabled.12.xml
-share/mime/application/vnd.ms-excel.sheet.macroenabled.12.xml
-share/mime/application/vnd.ms-excel.template.macroenabled.12.xml
-share/mime/application/vnd.ms-powerpoint.presentation.macroenabled.12.xml
-share/mime/application/vnd.ms-powerpoint.template.macroenabled.12.xml
-share/mime/application/vnd.ms-word.document.macroenabled.12.xml
-share/mime/application/vnd.ms-word.template.macroenabled.12.xml
-share/mime/application/vnd.oasis.opendocument.formula.xml
-share/mime/application/vnd.oasis.opendocument.graphics-template.xml
-share/mime/application/vnd.oasis.opendocument.graphics.xml
-share/mime/application/vnd.oasis.opendocument.presentation-template.xml
-share/mime/application/vnd.oasis.opendocument.presentation.xml
-share/mime/application/vnd.oasis.opendocument.spreadsheet-template.xml
-share/mime/application/vnd.oasis.opendocument.spreadsheet.xml
-share/mime/application/vnd.oasis.opendocument.text-master.xml
-share/mime/application/vnd.oasis.opendocument.text-template.xml
-share/mime/application/vnd.oasis.opendocument.text-web.xml
-share/mime/application/vnd.oasis.opendocument.text.xml
-share/mime/application/vnd.openofficeorg.extension.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.presentation.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.template.xml
-share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.xml
-share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.template.xml
-share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.document.xml
-share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.template.xml
-share/mime/application/vnd.sun.xml.base.xml
-share/mime/application/vnd.sun.xml.calc.template.xml
-share/mime/application/vnd.sun.xml.calc.xml
-share/mime/application/vnd.sun.xml.draw.template.xml
-share/mime/application/vnd.sun.xml.draw.xml
-share/mime/application/vnd.sun.xml.impress.template.xml
-share/mime/application/vnd.sun.xml.impress.xml
-share/mime/application/vnd.sun.xml.math.xml
-share/mime/application/vnd.sun.xml.writer.global.xml
-share/mime/application/vnd.sun.xml.writer.template.xml
-share/mime/application/vnd.sun.xml.writer.xml
share/mime/packages/openoffice.org.xml
share/mime-info/${OO_UNXNAME}.mime
share/mime-info/${OO_UNXNAME}.keys
diff -r c91e3b61b485 -r 616c1f7f566c misc/openoffice3/distinfo
--- a/misc/openoffice3/distinfo Sun Feb 01 22:53:09 2009 +0000
+++ b/misc/openoffice3/distinfo Mon Feb 02 07:26:00 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2008/11/26 15:33:23 hira Exp $
+$NetBSD: distinfo,v 1.16.2.1 2009/02/02 07:26:00 tron 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-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d
SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70
SHA1 (patch-eh) = 4f4b2cebe22e83ca6acd2b226281bf756fbc9083
+SHA1 (patch-ei) = 66a1280fec23204e3f919ab1d5280f87ff68161d
+SHA1 (patch-ej) = 54cf0ae5619aae6655a66cd4c03191109546de12
diff -r c91e3b61b485 -r 616c1f7f566c misc/openoffice3/patches/patch-ei
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice3/patches/patch-ei Mon Feb 02 07:26:00 2009 +0000
@@ -0,0 +1,48 @@
+$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 */
diff -r c91e3b61b485 -r 616c1f7f566c misc/openoffice3/patches/patch-ej
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice3/patches/patch-ej Mon Feb 02 07:26:00 2009 +0000
@@ -0,0 +1,16 @@
+$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();
Home |
Main Index |
Thread Index |
Old Index