diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-01 21:09:48 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-01 21:09:48 +0000 |
| commit | f3bad9da867a05a004c263a1706c3757ced1ddb5 (patch) | |
| tree | 3753e48bd0f94c693d4f241843c79eea4a8159cd /editors | |
| parent | 4bfa0da716c3ef36c73f9f29178b2fc61e393d93 (diff) | |
| download | ports-f3bad9da867a05a004c263a1706c3757ced1ddb5.tar.gz ports-f3bad9da867a05a004c263a1706c3757ced1ddb5.zip | |
Upgrade to 1.0.0
Builds ok, but is still broken
Notes
Notes:
svn path=/head/; revision=58423
Diffstat (limited to 'editors')
156 files changed, 1084 insertions, 767 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 029e0c588092..6f6142fd8527 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -6,14 +6,16 @@ # PORTNAME= openoffice -PORTVERSION= 641d +PORTVERSION= 1.0.0 CATEGORIES= editors MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ + http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ + ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ -DISTFILES= oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz -EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 +DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz +EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport @@ -38,7 +40,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0_src/config_office LD_PATH= ${WRKSRC}/../vos/unxfbsd.pro/lib:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index 3fa7a6f46b86..1a5c7d8d5bf4 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -1,3 +1,3 @@ -MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc +MD5 (OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0 diff --git a/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-1.0/files/patch-cpputools::source::registercomponent::makefile.mk b/editors/openoffice-1.0/files/patch-cpputools::source::registercomponent::makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cpputools::source::registercomponent::makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-1.0/files/patch-gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice-1.0/files/patch-gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice-1.0/files/patch-gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx +++ b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice-1.0/files/patch-i18n::inc::collator.hxx b/editors/openoffice-1.0/files/patch-i18n::inc::collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice-1.0/files/patch-i18n::inc::collator.hxx +++ b/editors/openoffice-1.0/files/patch-i18n::inc::collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice-1.0/files/patch-ppsprint::source::printer::printerinfomanager.cxx b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx index 5ebff3ce7d3e..4947227f8d52 100644 --- a/editors/openoffice-1.0/files/patch-ppsprint::source::printer::printerinfomanager.cxx +++ b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -1,11 +1,11 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Mar 2 22:16:34 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Sat Mar 2 22:16:12 2002 +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 @@ -883,7 +883,7 @@ static const struct SystemCommandParameters aParms[] = { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) || defined(NETBSD) +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.0/files/patch-ppsprint::source::printer::printerinfomanager.cxx b/editors/openoffice-1.0/files/patch-psprint::source::printer::printerinfomanager.cxx index 5ebff3ce7d3e..4947227f8d52 100644 --- a/editors/openoffice.org-1.0/files/patch-ppsprint::source::printer::printerinfomanager.cxx +++ b/editors/openoffice-1.0/files/patch-psprint::source::printer::printerinfomanager.cxx @@ -1,11 +1,11 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Mar 2 22:16:34 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Sat Mar 2 22:16:12 2002 +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 @@ -883,7 +883,7 @@ static const struct SystemCommandParameters aParms[] = { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) || defined(NETBSD) +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-1.0/files/patch-setup2+script+setupserver b/editors/openoffice-1.0/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-1.0/files/patch-setup2+script+setupserver +++ b/editors/openoffice-1.0/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-1.0/files/patch-setup2::script::setupserver b/editors/openoffice-1.0/files/patch-setup2::script::setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-1.0/files/patch-setup2::script::setupserver +++ b/editors/openoffice-1.0/files/patch-setup2::script::setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh +++ b/editors/openoffice-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-1.0/files/patch-unzip+source+misc.c b/editors/openoffice-1.0/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.0/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.0/files/patch-unzip::source::file_io.c b/editors/openoffice-1.0/files/patch-unzip::source::file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-1.0/files/patch-unzip::source::file_io.c +++ b/editors/openoffice-1.0/files/patch-unzip::source::file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-1.0/files/patch-unzip::source::misc.c b/editors/openoffice-1.0/files/patch-unzip::source::misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-1.0/files/patch-unzip::source::misc.c +++ b/editors/openoffice-1.0/files/patch-unzip::source::misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice/files/patch-ppsprint::source::printer::printerinfomanager.cxx b/editors/openoffice-1.1-devel/files/patch-psprint+source+printer+printerinfomanager.cxx index 5ebff3ce7d3e..4947227f8d52 100644 --- a/editors/openoffice/files/patch-ppsprint::source::printer::printerinfomanager.cxx +++ b/editors/openoffice-1.1-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -1,11 +1,11 @@ ---- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Mar 2 22:16:34 2002 -+++ ../psprint/source/printer/printerinfomanager.cxx Sat Mar 2 22:16:12 2002 +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 @@ -883,7 +883,7 @@ static const struct SystemCommandParameters aParms[] = { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) || defined(NETBSD) +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver b/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice-1.1-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.1/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-1.1/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-1.1/files/patch-setup2+script+setupserver b/editors/openoffice-1.1/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-1.1/files/patch-setup2+script+setupserver +++ b/editors/openoffice-1.1/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-1.1/files/patch-unzip+source+file_io.c b/editors/openoffice-1.1/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-1.1/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-1.1/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-1.1/files/patch-unzip+source+misc.c b/editors/openoffice-1.1/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-1.1/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.1/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver b/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice-2.0-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-3-devel/files/patch-setup2+script+setupserver b/editors/openoffice-3-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-3-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice-3-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-3-devel/files/patch-unzip+source+misc.c b/editors/openoffice-3-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-3-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-3-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-3/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-3/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-3/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-3/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-3/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice-3/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-3/files/patch-setup2+script+setupserver b/editors/openoffice-3/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-3/files/patch-setup2+script+setupserver +++ b/editors/openoffice-3/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-3/files/patch-unzip+source+file_io.c b/editors/openoffice-3/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-3/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-3/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-3/files/patch-unzip+source+misc.c b/editors/openoffice-3/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-3/files/patch-unzip+source+misc.c +++ b/editors/openoffice-3/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-devel/files/patch-setup2+script+setupserver b/editors/openoffice-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice-devel/files/patch-unzip+source+misc.c b/editors/openoffice-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 029e0c588092..6f6142fd8527 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -6,14 +6,16 @@ # PORTNAME= openoffice -PORTVERSION= 641d +PORTVERSION= 1.0.0 CATEGORIES= editors MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ + http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ + ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ -DISTFILES= oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz -EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 +DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz +EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport @@ -38,7 +40,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0_src/config_office LD_PATH= ${WRKSRC}/../vos/unxfbsd.pro/lib:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo index 3fa7a6f46b86..1a5c7d8d5bf4 100644 --- a/editors/openoffice.org-1.0/distinfo +++ b/editors/openoffice.org-1.0/distinfo @@ -1,3 +1,3 @@ -MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc +MD5 (OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0 diff --git a/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-1.0/files/patch-cpputools::source::registercomponent::makefile.mk b/editors/openoffice.org-1.0/files/patch-cpputools::source::registercomponent::makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-cpputools::source::registercomponent::makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-1.0/files/patch-gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.0/files/patch-gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice.org-1.0/files/patch-gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice.org-1.0/files/patch-gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx +++ b/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice.org-1.0/files/patch-i18n::inc::collator.hxx b/editors/openoffice.org-1.0/files/patch-i18n::inc::collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice.org-1.0/files/patch-i18n::inc::collator.hxx +++ b/editors/openoffice.org-1.0/files/patch-i18n::inc::collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.0/files/patch-psprint::source::printer::printerinfomanager.cxx b/editors/openoffice.org-1.0/files/patch-psprint::source::printer::printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-psprint::source::printer::printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-1.0/files/patch-setup2::script::setupserver b/editors/openoffice.org-1.0/files/patch-setup2::script::setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-1.0/files/patch-setup2::script::setupserver +++ b/editors/openoffice.org-1.0/files/patch-setup2::script::setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice.org-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh +++ b/editors/openoffice.org-1.0/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice.org-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice.org-1.0/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c b/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c +++ b/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c b/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c +++ b/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-1.1-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-1.1-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-1.1-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-1.1-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.1/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-1.1/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-1.1/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-1.1/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2-RC/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2-RC/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2-RC/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2-RC/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver b/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2-RC/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2.0-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2.0-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2.0/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2.0/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2.0/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver b/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2.0/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-2/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-2/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-2/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-2/files/patch-setup2+script+setupserver b/editors/openoffice.org-2/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-2/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-2/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-2/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-2/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-2/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-2/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-2/files/patch-unzip+source+misc.c b/editors/openoffice.org-2/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-2/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3-RC/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver b/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-3-RC/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-3-RC/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver b/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-3-devel/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-3-devel/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-3/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-3/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-3/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-3/files/patch-setup2+script+setupserver b/editors/openoffice.org-3/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-3/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-3/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-3/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-3/files/patch-unzip+source+file_io.c b/editors/openoffice.org-3/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-3/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-3/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-3/files/patch-unzip+source+misc.c b/editors/openoffice.org-3/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-3/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-vcltesttool/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice.org-vcltesttool/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-vcltesttool/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver b/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver +++ b/editors/openoffice.org-vcltesttool/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice.org-vcltesttool/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c +++ b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 029e0c588092..6f6142fd8527 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -6,14 +6,16 @@ # PORTNAME= openoffice -PORTVERSION= 641d +PORTVERSION= 1.0.0 CATEGORIES= editors MASTER_SITES= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ + http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ + ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ http://people.freebsd.org/~mbr/distfiles/ -DISTFILES= oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz -EXTRACT_ONLY= oo_${PORTVERSION}_src.tar.bz2 +DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z oo_moz095_i386_FreeBSD-4.tar.gz +EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= mbr@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport @@ -38,7 +40,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0_src/config_office LD_PATH= ${WRKSRC}/../vos/unxfbsd.pro/lib:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo index 3fa7a6f46b86..1a5c7d8d5bf4 100644 --- a/editors/openoffice/distinfo +++ b/editors/openoffice/distinfo @@ -1,3 +1,3 @@ -MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc +MD5 (OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (oo_moz095_i386_FreeBSD-4.tar.gz) = e92e25759f0b1bf16a36a091bf17e1b0 diff --git a/editors/openoffice/files/patch-cpputools+source+registercomponent+makefile.mk b/editors/openoffice/files/patch-cpputools+source+registercomponent+makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice/files/patch-cpputools+source+registercomponent+makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice/files/patch-cpputools::source::registercomponent::makefile.mk b/editors/openoffice/files/patch-cpputools::source::registercomponent::makefile.mk new file mode 100644 index 000000000000..8134445349f1 --- /dev/null +++ b/editors/openoffice/files/patch-cpputools::source::registercomponent::makefile.mk @@ -0,0 +1,10 @@ +--- ../cpputools/source/registercomponent/makefile.mk.orig Mon Apr 22 22:46:11 2002 ++++ ../cpputools/source/registercomponent/makefile.mk Mon Apr 22 22:46:44 2002 +@@ -104,6 +104,7 @@ + + APP1STDLIBS=\ + $(SALLIB) \ ++ $(TOOLSLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) + diff --git a/editors/openoffice/files/patch-gnome-vfs-filetype-registration.cxx b/editors/openoffice/files/patch-gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice/files/patch-gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice/files/patch-gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice/files/patch-i18n+inc+collator.hxx b/editors/openoffice/files/patch-i18n+inc+collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice/files/patch-i18n+inc+collator.hxx +++ b/editors/openoffice/files/patch-i18n+inc+collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice/files/patch-i18n::inc::collator.hxx b/editors/openoffice/files/patch-i18n::inc::collator.hxx index 0b3372b5b216..796b7bbf4567 100644 --- a/editors/openoffice/files/patch-i18n::inc::collator.hxx +++ b/editors/openoffice/files/patch-i18n::inc::collator.hxx @@ -1,14 +1,11 @@ ---- ../i18n/inc/collator.hxx.orig Tue Apr 23 23:15:36 2002 -+++ ../i18n/inc/collator.hxx Tue Apr 23 23:15:38 2002 -@@ -79,8 +79,10 @@ +--- ../i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 ++++ ../i18n/inc/collator.hxx Wed May 1 22:31:57 2002 +@@ -78,7 +78,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> #endif - #ifndef WIN32 --#ifndef MACOSX -+#ifndef MACOSX -+#ifndef FREEBSD +-#if !(defined WIN32 || defined MACOSX || defined NETBSD) ++#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif - #endif #endif #include <tools/string.hxx> diff --git a/editors/openoffice/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice/files/patch-psprint+source+printer+printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice/files/patch-psprint+source+printer+printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice/files/patch-psprint::source::printer::printerinfomanager.cxx b/editors/openoffice/files/patch-psprint::source::printer::printerinfomanager.cxx new file mode 100644 index 000000000000..4947227f8d52 --- /dev/null +++ b/editors/openoffice/files/patch-psprint::source::printer::printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#if defined(LINUX) || defined(NETBSD) ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, + { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice/files/patch-setup2+script+setupserver b/editors/openoffice/files/patch-setup2+script+setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice/files/patch-setup2+script+setupserver +++ b/editors/openoffice/files/patch-setup2+script+setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ b/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice/files/patch-setup2::script::setupserver b/editors/openoffice/files/patch-setup2::script::setupserver index 07f3c3f8b23e..7d3b13f659b9 100644 --- a/editors/openoffice/files/patch-setup2::script::setupserver +++ b/editors/openoffice/files/patch-setup2::script::setupserver @@ -1,11 +1,10 @@ ---- ../setup2/script/setupserver.orig Sat Mar 2 17:57:36 2002 -+++ ../setup2/script/setupserver Sat Mar 2 17:58:43 2002 -@@ -234,6 +234,8 @@ +--- ../setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/script/setupserver Wed May 1 22:30:13 2002 +@@ -234,6 +234,7 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; ++ FreeBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac - sd_cwd="`pwd`" diff --git a/editors/openoffice/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh b/editors/openoffice/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh index d98230af5a69..1919789038db 100644 --- a/editors/openoffice/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh +++ b/editors/openoffice/files/patch-setup2::source::custom::jvmsetup::loader::jvmsetup.sh @@ -1,10 +1,9 @@ ---- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:01:19 2002 -+++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Sat Mar 2 18:02:12 2002 -@@ -65,6 +65,8 @@ - sd_platform=`uname -s` +--- ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 ++++ ../setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 +@@ -66,6 +66,7 @@ case $sd_platform in SCO_SV) test=/bin/test ;; -+ NetBSD) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff --git a/editors/openoffice/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx b/editors/openoffice/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx index 66b7dfe1f73d..6a5258b1c9e6 100644 --- a/editors/openoffice/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice/files/patch-sysui::unix::office::gnome::gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2001/11/01 13:26:23 1.2 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx 2002/03/03 19:43:31 -@@ -62,7 +62,9 @@ +--- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed Apr 10 21:54:49 2002 ++++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 22:40:02 2002 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !defined(FREEBSD) +-#if !defined(NETBSD) ++#if !(defined NETBSD || defined FREEBSD) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice/files/patch-unzip+source+file_io.c b/editors/openoffice/files/patch-unzip+source+file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice/files/patch-unzip+source+file_io.c +++ b/editors/openoffice/files/patch-unzip+source+file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice/files/patch-unzip+source+misc.c b/editors/openoffice/files/patch-unzip+source+misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice/files/patch-unzip+source+misc.c +++ b/editors/openoffice/files/patch-unzip+source+misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice/files/patch-unzip::source::file_io.c b/editors/openoffice/files/patch-unzip::source::file_io.c index ec06265f3b01..2a838fe377b1 100644 --- a/editors/openoffice/files/patch-unzip::source::file_io.c +++ b/editors/openoffice/files/patch-unzip::source::file_io.c @@ -1,12 +1,11 @@ ---- ../unzip/source/file_io.c.orig Mon Apr 15 16:59:43 2002 -+++ ../unzip/source/file_io.c Mon Apr 15 17:05:38 2002 -@@ -865,7 +865,9 @@ +--- ../unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/file_io.c Wed May 1 22:34:51 2002 +@@ -864,7 +864,7 @@ + #ifndef __386BSD__ static struct timeb tbp; #endif /* !__386BSD__ */ - #else /* !BSD */ -+#if (!defined(FREEBSD) && !defined(NETSBD)) +-#elif !defined(NETBSD) /* !BSD */ ++#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ extern long timezone; -+#endif #endif /* ?BSD */ #endif /* ?AMIGA */ - diff --git a/editors/openoffice/files/patch-unzip::source::misc.c b/editors/openoffice/files/patch-unzip::source::misc.c index 26400cd2c1c4..8087b0887af4 100644 --- a/editors/openoffice/files/patch-unzip::source::misc.c +++ b/editors/openoffice/files/patch-unzip::source::misc.c @@ -1,13 +1,11 @@ ---- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002 -+++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002 -@@ -301,8 +301,8 @@ +--- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 ++++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 +@@ -300,7 +300,7 @@ + static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; - #if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) --#if (defined(BSD) || defined(MTS)) --#ifndef __386BSD__ -+#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) -+#if !defined __386BSD__ && !defined FREEBSD +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ |