diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-31 12:47:00 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-31 12:47:00 +0000 |
| commit | 9a6254b013480b8182904dee32cb409d75f1991a (patch) | |
| tree | 2797d010fc6d487f1d88aa29c2c582af5f0ec85e /editors/openoffice.org-3-RC | |
| parent | Update to 0.9.20. (diff) | |
SOLARINI pointed to the wrong file. ssrx644.ini itself has still
Linux dependent stuff in the FreeBSD section. Clean this up.
Register the stlport lib.
Notes
Notes:
svn path=/head/; revision=77838
Diffstat (limited to 'editors/openoffice.org-3-RC')
3 files changed, 53 insertions, 30 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in index f0f9c986eca0..02a736b222f1 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ --- set_soenv.in.orig Thu Feb 27 14:12:36 2003 -+++ set_soenv.in Fri Mar 28 12:54:52 2003 ++++ set_soenv.in Sat Mar 29 23:11:54 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,6 +28,15 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # +@@ -863,7 +864,7 @@ + # Location of + $STAR_SSCOMMON = '$SOLARENV'.$CONFIG.$ds."ssolar.cmn"; + # Location of +-$STAR_SSOLARINI = '$SOLARENV'.$CONFIG.$ds."ssolar.ini"; ++$STAR_SSOLARINI = '$SOLARENV'.$CONFIG.$ds."ssrx644.ini"; + # Path to the OpenOffice.org recourses. + $STAR_RESOURCEPATH = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN; + # Location of the registry file. @@ -1184,7 +1185,7 @@ $L_STLPORT_LIB. $L.$XLIB; diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c index 396c586ee3a3..27f732ac7297 100644 --- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c +++ b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+loader.c @@ -1,30 +1,11 @@ ---- ../setup2/mow/source/loader/loader.c.orig Thu Oct 31 21:46:52 2002 -+++ ../setup2/mow/source/loader/loader.c Wed Jan 22 14:56:44 2003 -@@ -85,6 +85,12 @@ - # include <sys/statvfs.h> +--- ../setup2/mow/source/loader/loader.c.orig Sun Mar 30 23:14:14 2003 ++++ ../setup2/mow/source/loader/loader.c Sun Mar 30 23:14:50 2003 +@@ -580,6 +580,8 @@ + #define GCC_FILE_PATTERN "libgcc_s.so.1" + #define CPLUS_FILE_PATTERN "libstdc++.so.3.0.1" + #define STL_FILE_PATTERN "libstlport_gcc.so" ++#elif defined (FREEBSD) ++#define STL_FILE_PATTERN "libstlport_gcc.so" + #else + #define STL_FILE_PATTERN "libstlport_sunpro.so" #endif - -+#ifdef FREEBSD -+#if (OSVERSION < 500000) -+#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n') -+#endif -+#endif -+ - #include "bitmap" - #include "logo.xpm" - -@@ -650,6 +656,14 @@ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ - " Linux)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" FreeBSD)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" NetBSD)\n" \ - " LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+config+ssrx644.ini b/editors/openoffice.org-3-RC/files/patch-solenv+config+ssrx644.ini new file mode 100644 index 000000000000..08ed8861d271 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-solenv+config+ssrx644.ini @@ -0,0 +1,33 @@ +--- ../solenv/config/ssrx644.ini.orig Sat Mar 29 22:19:08 2003 ++++ ../solenv/config/ssrx644.ini Sat Mar 29 22:27:31 2003 +@@ -3704,9 +3704,9 @@ + SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv + SOLARROOT %SOLAR_ENV_ROOT% + DEVROOT %SOLAR_ENV_ROOT% +- SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1 +- SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.0 +- COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux ++ SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/jdk1.3.1 ++ SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/jdk1.4.1 ++ COMPATH %SOLAR_ENV_ROOT% + } + compath + { +@@ -3810,7 +3810,7 @@ + } + debug + { +- LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% ++ LD_LIBRARY_PATH %SOLARROOT%/solenv/unxfbsdi/lib/debug:%LD_LIBRARY_PATH% + } + pre + { +@@ -3824,7 +3824,7 @@ + } + reset + { +- RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxlngi4%PROEXT%/bin:%SOLARVERSION%/unxlngi4%PROEXT%/bin%UPDMINOREXT%:/usr/bin ++ RESETPATH /usr/bin/X11:/bin:/usr/openwin/bin:/usr/dt/bin:%HOME%/%WORK_STAMP%/unxfbsdi%PROEXT%/bin:%SOLARVERSION%/unxfbsdi%PROEXT%/bin%UPDMINOREXT%:/usr/bin + *make + } + ca |