pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/openoffice2 - Fix DESTDIR installation.
details: https://anonhg.NetBSD.org/pkgsrc/rev/62842e103e45
branches: trunk
changeset: 553613:62842e103e45
user: hira <hira%pkgsrc.org@localhost>
date: Mon Jan 26 15:39:05 2009 +0000
description:
- Fix DESTDIR installation.
- Fix charmap names for NetBSD.
- Use time_t instead of long on NetBSD.
Bump PKGREVISION.
diffstat:
misc/openoffice2/Makefile | 7 +++--
misc/openoffice2/PLIST | 25 +-------------------
misc/openoffice2/distinfo | 4 ++-
misc/openoffice2/patches/patch-ei | 48 +++++++++++++++++++++++++++++++++++++++
misc/openoffice2/patches/patch-ej | 16 +++++++++++++
5 files changed, 72 insertions(+), 28 deletions(-)
diffs (152 lines):
diff -r fea225979079 -r 62842e103e45 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Mon Jan 26 15:22:03 2009 +0000
+++ b/misc/openoffice2/Makefile Mon Jan 26 15:39:05 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.60 2008/11/24 11:58:44 hira Exp $
+# $NetBSD: Makefile,v 1.61 2009/01/26 15:39:05 hira Exp $
#
OO_VER= 2.4.2
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}
@@ -133,7 +133,8 @@
PLIST_SUBST+= OO_UNXNAME=${OO_UNXNAME}
PLIST_SUBST+= OO_ICON_PREFIX=openofficeorg24
MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX}
-INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications
+INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \
+ share/mime-info share/packages
OO_UNXNAME= openoffice.org2.4
OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
diff -r fea225979079 -r 62842e103e45 misc/openoffice2/PLIST
--- a/misc/openoffice2/PLIST Mon Jan 26 15:22:03 2009 +0000
+++ b/misc/openoffice2/PLIST Mon Jan 26 15:39:05 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/11/26 21:55:55 hira Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/01/26 15:39:05 hira Exp $
bin/scalc
bin/sdraw
bin/simpress
@@ -295,29 +295,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.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.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 fea225979079 -r 62842e103e45 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Mon Jan 26 15:22:03 2009 +0000
+++ b/misc/openoffice2/distinfo Mon Jan 26 15:39:05 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2008/11/26 15:48:16 hira Exp $
+$NetBSD: distinfo,v 1.51 2009/01/26 15:39:05 hira Exp $
SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
@@ -73,3 +73,5 @@
SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
SHA1 (patch-eg) = 2b3d35e13e059e37996efc651dcca0a4a44a30e8
SHA1 (patch-eh) = 9635ab017d28c6606126ccd1c5194685ef1828aa
+SHA1 (patch-ei) = b8b0ca35c15cff58cc53a937f8f3a127e4cd0d03
+SHA1 (patch-ej) = 1300efe96fb675b89df2c345cc68f1fc79a8bd69
diff -r fea225979079 -r 62842e103e45 misc/openoffice2/patches/patch-ei
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-ei Mon Jan 26 15:39:05 2009 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-ei,v 1.1 2009/01/26 15:39:05 hira Exp $
+
+--- sal/osl/unx/nlsupport.c.orig 2007-07-03 21:48:57.000000000 +0900
++++ sal/osl/unx/nlsupport.c 2009-01-20 19:46:23.000000000 +0900
+@@ -323,7 +323,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 */
+@@ -534,16 +534,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 */
+@@ -552,6 +558,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 fea225979079 -r 62842e103e45 misc/openoffice2/patches/patch-ej
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/patches/patch-ej Mon Jan 26 15:39:05 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ej,v 1.1 2009/01/26 15:39:05 hira Exp $
+
+--- rsc/source/rscpp/cpp3.c.orig 2007-09-21 01:34:31.000000000 +0900
++++ rsc/source/rscpp/cpp3.c 2009-01-20 18:47:08.000000000 +0900
+@@ -474,7 +474,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