diff options
author | mbr <mbr@FreeBSD.org> | 2002-03-06 01:49:31 +0800 |
---|---|---|
committer | mbr <mbr@FreeBSD.org> | 2002-03-06 01:49:31 +0800 |
commit | e0ed5a5b9c43937f393a3d6acd7c54b614064bd2 (patch) | |
tree | 5392c05569ecd336dc9caf74626dae8a22a2d88f | |
parent | 984bc58022d4e669dfb8e595395f16b9878f6afd (diff) | |
download | freebsd-ports-gnome-e0ed5a5b9c43937f393a3d6acd7c54b614064bd2.tar.gz freebsd-ports-gnome-e0ed5a5b9c43937f393a3d6acd7c54b614064bd2.tar.zst freebsd-ports-gnome-e0ed5a5b9c43937f393a3d6acd7c54b614064bd2.zip |
timeb > time fixes
40 files changed, 1440 insertions, 0 deletions
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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice-3/files/patch-unzip+source+file_io.c b/editors/openoffice-3/files/patch-unzip+source+file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-3/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice-3/files/patch-unzip::source::file_io.c b/editors/openoffice-3/files/patch-unzip::source::file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-3/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-devel/files/patch-unzip+source+file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice-devel/files/patch-unzip::source::file_io.c b/editors/openoffice-devel/files/patch-unzip::source::file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif 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 new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice/files/patch-unzip+source+file_io.c b/editors/openoffice/files/patch-unzip+source+file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice/files/patch-unzip+source+file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif diff --git a/editors/openoffice/files/patch-unzip::source::file_io.c b/editors/openoffice/files/patch-unzip::source::file_io.c new file mode 100644 index 000000000000..0430ff41b6a9 --- /dev/null +++ b/editors/openoffice/files/patch-unzip::source::file_io.c @@ -0,0 +1,36 @@ +--- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 ++++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 +@@ -500,7 +500,7 @@ + #ifdef MPW + pCallBack( 0 ); + #else +- #if defined LINUX || defined MACOSX || defined NETBSD ++ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD + pCallBack( lseek(outfd, 0, SEEK_CUR) ); + #else + pCallBack( tell( outfd ) ); +@@ -860,8 +860,11 @@ + /* extern char *_TZ; no longer used? */ + #else /* !AMIGA */ + # define YRBASE 1970 +-#ifdef BSD +-#ifndef __386BSD__ ++#ifdef FREEBSD ++#include <sys/types.h> ++#endif */ FREEBSD */ ++#if defined BSD || defined FREEBSD ++#if !defined __386BSD__ && !defined FREEBSD + static struct timeb tbp; + #endif /* !__386BSD__ */ + #else /* !BSD */ +@@ -932,8 +935,8 @@ + /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ + m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; + +-#if defined BSD && ! defined MACOSX && ! defined NETBSD +-#ifndef __386BSD__ ++#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD ++#if !defined __386BSD__ && !defined FREEBSD + ftime(&tbp); + m_time += tbp.timezone * 60L; + #endif |