diff options
author | Maho Nakata <maho@FreeBSD.org> | 2008-10-13 10:10:20 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2008-10-13 10:10:20 +0000 |
commit | 02d25600f8d66ea9b2c247eab1393dd247e7b984 (patch) | |
tree | ca7ba4b394d11bb4d24a9ccda1b9d6ce5a63a623 /editors/openoffice-3/files | |
parent | Remove "_gdbm" module from packaging which should be excluded in (diff) |
Update to 3.0.0.
Notes
Notes:
svn path=/head/; revision=221523
Diffstat (limited to 'editors/openoffice-3/files')
-rw-r--r-- | editors/openoffice-3/files/Makefile.others | 2 | ||||
-rw-r--r-- | editors/openoffice-3/files/amd64-gcc42-workaround | 13 | ||||
-rw-r--r-- | editors/openoffice-3/files/patch-i84549 | 27 | ||||
-rw-r--r-- | editors/openoffice-3/files/patch-i91318 | 13 | ||||
-rw-r--r-- | editors/openoffice-3/files/patch-i91861 | 19 |
5 files changed, 43 insertions, 31 deletions
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others index f5848df41e31..a94d866b232b 100644 --- a/editors/openoffice-3/files/Makefile.others +++ b/editors/openoffice-3/files/Makefile.others @@ -24,7 +24,7 @@ sdk: @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/ooobasis*.t?z @cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ diff --git a/editors/openoffice-3/files/amd64-gcc42-workaround b/editors/openoffice-3/files/amd64-gcc42-workaround new file mode 100644 index 000000000000..01ace4ad728c --- /dev/null +++ b/editors/openoffice-3/files/amd64-gcc42-workaround @@ -0,0 +1,13 @@ +--- writerfilter/source/resourcemodel/makefile.mk.orig 2008-07-22 08:53:57.000000000 -0400 ++++ writerfilter/source/resourcemodel/makefile.mk 2008-09-03 12:26:09.000000000 -0400 +@@ -56,8 +56,8 @@ + $(SLO)$/TagLogger.obj \ + $(SLO)$/WW8Analyzer.obj + +-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory' +-.IF "$(OUTPATH)"=="unxlngx6" ++# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory' ++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6" + NOOPTFILES= \ + $(SLO)$/qnametostr.obj + .ENDIF diff --git a/editors/openoffice-3/files/patch-i84549 b/editors/openoffice-3/files/patch-i84549 index 3f1808c45b5a..1d7f6517953b 100644 --- a/editors/openoffice-3/files/patch-i84549 +++ b/editors/openoffice-3/files/patch-i84549 @@ -1,17 +1,16 @@ -? neon/unxfbsdi.pro Index: neon/neon.patch =================================================================== RCS file: /cvs/external/neon/neon.patch,v -retrieving revision 1.20 -diff -u -r1.20 neon.patch ---- neon/neon.patch 14 Nov 2007 09:49:43 -0000 1.20 -+++ neon/neon.patch 13 Dec 2007 17:16:29 -0000 -@@ -268,7 +268,7 @@ - ! #define HAVE_SYS_TYPES_H 1 - ! - ! /* Define if the timezone global is available */ --! #ifndef MACOSX -+! #if !defined (MACOSX) && !defined (FREEBSD) - ! #define HAVE_TIMEZONE 1 - ! #endif - ! +retrieving revision 1.25 +diff -u -r1.25 neon.patch +--- neon/neon.patch 22 Jul 2008 17:17:06 -0000 1.25 ++++ neon/neon.patch 10 Aug 2008 04:20:27 -0000 +@@ -266,7 +266,7 @@ + +#define HAVE_SYS_TYPES_H 1 + + + +/* Define if the timezone global is available */ +-+#ifndef MACOSX +++#if !defined(MACOSX) && !defined(FREEBSD) + +#define HAVE_TIMEZONE 1 + +#endif + + diff --git a/editors/openoffice-3/files/patch-i91318 b/editors/openoffice-3/files/patch-i91318 index 172af1ddae5a..a038fc180ff5 100644 --- a/editors/openoffice-3/files/patch-i91318 +++ b/editors/openoffice-3/files/patch-i91318 @@ -1,18 +1,19 @@ Index: hunspell/hunspell-1.1.12.patch =================================================================== RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v -retrieving revision 1.11 -diff -u -r1.11 hunspell-1.1.12.patch ---- hunspell/hunspell-1.1.12.patch 18 Jun 2008 10:07:23 -0000 1.11 -+++ hunspell/hunspell-1.1.12.patch 2 Jul 2008 20:13:47 -0000 -@@ -450,3 +450,10 @@ +retrieving revision 1.12 +diff -u -r1.12 hunspell-1.1.12.patch +--- hunspell/hunspell-1.1.12.patch 2 Jul 2008 09:46:59 -0000 1.12 ++++ hunspell/hunspell-1.1.12.patch 10 Aug 2008 01:02:29 -0000 +@@ -487,3 +487,11 @@ i68568utf.test \ 1706659.test \ digits_in_words.test \ +--- misc/hunspell-1.1.12/tests/test.sh 2007-07-15 22:33:13.000000000 +0900 -++++ misc/build/hunspell-1.1.12/tests/test.sh 2008-07-01 06:18:31.000000000 +0900 +++++ misc/build/hunspell-1.1.12/tests/test.sh 2008-08-10 10:00:33.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/local/bin/bash + export LC_ALL="C" + ++ function check_valgrind_log () { diff --git a/editors/openoffice-3/files/patch-i91861 b/editors/openoffice-3/files/patch-i91861 index 06602529f013..93c8021d3385 100644 --- a/editors/openoffice-3/files/patch-i91861 +++ b/editors/openoffice-3/files/patch-i91861 @@ -1,19 +1,18 @@ -? vcl/unxfbsdi.pro Index: vcl/source/glyphs/makefile.mk =================================================================== RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v -retrieving revision 1.13 -diff -u -r1.13 makefile.mk ---- vcl/source/glyphs/makefile.mk 11 Apr 2008 08:59:18 -0000 1.13 -+++ vcl/source/glyphs/makefile.mk 20 Jul 2008 03:14:41 -0000 -@@ -42,9 +42,17 @@ +retrieving revision 1.13.106.1 +diff -u -r1.13.106.1 makefile.mk +--- vcl/source/glyphs/makefile.mk 31 Jul 2008 20:14:59 -0000 1.13.106.1 ++++ vcl/source/glyphs/makefile.mk 10 Aug 2008 01:06:59 -0000 +@@ -41,9 +41,17 @@ + .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile2.pmk - .IF "$(SYSTEM_FREETYPE)" == "YES" +.IF "$(OS)" != "FREEBSD" - CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) + CFLAGS+= $(FREETYPE_CFLAGS) +.ELSE -+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) ++ADDCDEFS+= $(FREETYPE_CFLAGS) +.ENDIF .IF "$(USE_FT_EMBOLDEN)" == "YES" +.IF "$(OS)" != "FREEBSD" @@ -22,5 +21,5 @@ diff -u -r1.13 makefile.mk +ADDCDEFS+=-DUSE_FT_EMBOLDEN +.ENDIF .ENDIF - .ENDIF + # --- Files -------------------------------------------------------- |