diff options
Diffstat (limited to 'editors/openoffice.org-3/files/patch-i80129')
| -rw-r--r-- | editors/openoffice.org-3/files/patch-i80129 | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/editors/openoffice.org-3/files/patch-i80129 b/editors/openoffice.org-3/files/patch-i80129 index 24cc48f48ccd..d6d5861503e0 100644 --- a/editors/openoffice.org-3/files/patch-i80129 +++ b/editors/openoffice.org-3/files/patch-i80129 @@ -1,18 +1,35 @@ Merely a workaround +Index: libxml2/libxml2-2.6.31.patch +=================================================================== +RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v +retrieving revision 1.2 +diff -u -r1.2 libxml2-2.6.31.patch +--- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2 ++++ libxml2/libxml2-2.6.31.patch 10 Jun 2008 09:34:51 -0000 +@@ -87,7 +87,7 @@ + ;; + + freebsd-elf) +-! major=.`expr $current - $age` ++! major=`expr $current - $age` + ! versuffix=".$major.$age.$revision"; + ;; + + Index: scp2/source/ooo/ure.scp =================================================================== RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v -retrieving revision 1.2 -diff -u -r1.2 ure.scp ---- scp2/source/ooo/ure.scp 18 Mar 2008 13:35:26 -0000 1.2 -+++ scp2/source/ooo/ure.scp 21 Mar 2008 07:30:43 -0000 -@@ -684,6 +684,8 @@ +retrieving revision 1.7 +diff -u -r1.7 ure.scp +--- scp2/source/ooo/ure.scp 6 Jun 2008 17:05:51 -0000 1.7 ++++ scp2/source/ooo/ure.scp 10 Jun 2008 09:45:54 -0000 +@@ -679,6 +679,8 @@ #endif #elif defined MACOSX Name = SCP2_URE_DL_NORMAL("xml2.2"); +#elif defined FREEBSD -+ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17)); ++ Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31)); #else Name = SCP2_URE_DL_VER("xml2", "2"); #endif |