From 30f652aa6319a432dd7c7c05be37bae2fb58602d Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Mon, 15 Apr 2002 15:14:28 +0000
Subject: [PATCH] Ifdef another windows timezone definition

---
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip::source::file_io.c             | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../openoffice-3/files/patch-unzip+source+file_io.c  | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip::source::file_io.c             | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../files/patch-unzip+source+file_io.c               | 12 ++++++++++++
 .../openoffice/files/patch-unzip+source+file_io.c    | 12 ++++++++++++
 .../openoffice/files/patch-unzip::source::file_io.c  | 12 ++++++++++++
 23 files changed, 276 insertions(+)
 create mode 100644 editors/openoffice-1.0/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-1.0/files/patch-unzip::source::file_io.c
 create mode 100644 editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-1.1/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-3-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-3/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-2/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-3/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice/files/patch-unzip+source+file_io.c
 create mode 100644 editors/openoffice/files/patch-unzip::source::file_io.c

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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-unzip::source::file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-3/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-unzip::source::file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice/files/patch-unzip+source+file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+ 
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..ec06265f3b01
--- /dev/null
+++ b/editors/openoffice/files/patch-unzip::source::file_io.c
@@ -0,0 +1,12 @@
+--- ../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 @@
+ 	static struct timeb tbp;
+ #endif /* !__386BSD__ */
+ #else /* !BSD */
++#if (!defined(FREEBSD) && !defined(NETSBD))
+ 	extern long timezone;
++#endif
+ #endif /* ?BSD */
+ #endif /* ?AMIGA */
+