From 8ce91e59d049c1468b2fc550cca9545ba9e8396f Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Mon, 7 Aug 2006 00:06:40 +0000
Subject: Fix build for __FreeBSD_version >= 601103 and discard support for
 __FreeBSD_version < 700015

Discussed with: ume
---
 editors/openoffice-3/files/patch-i65512        | 12 ++++++------
 editors/openoffice.org-2-RC/files/patch-i65512 | 12 ++++++------
 editors/openoffice.org-2.0/files/patch-i65512  | 12 ++++++------
 editors/openoffice.org-2/files/patch-i65512    | 12 ++++++------
 editors/openoffice.org-3-RC/files/patch-i65512 | 12 ++++++------
 editors/openoffice.org-3/files/patch-i65512    | 12 ++++++------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/editors/openoffice-3/files/patch-i65512 b/editors/openoffice-3/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice-3/files/patch-i65512
+++ b/editors/openoffice-3/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
diff --git a/editors/openoffice.org-2-RC/files/patch-i65512 b/editors/openoffice.org-2-RC/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice.org-2-RC/files/patch-i65512
+++ b/editors/openoffice.org-2-RC/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
diff --git a/editors/openoffice.org-2.0/files/patch-i65512 b/editors/openoffice.org-2.0/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice.org-2.0/files/patch-i65512
+++ b/editors/openoffice.org-2.0/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
diff --git a/editors/openoffice.org-2/files/patch-i65512 b/editors/openoffice.org-2/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice.org-2/files/patch-i65512
+++ b/editors/openoffice.org-2/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
diff --git a/editors/openoffice.org-3-RC/files/patch-i65512 b/editors/openoffice.org-3-RC/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice.org-3-RC/files/patch-i65512
+++ b/editors/openoffice.org-3-RC/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
diff --git a/editors/openoffice.org-3/files/patch-i65512 b/editors/openoffice.org-3/files/patch-i65512
index 31a5566f164a..ab5cd23d6c03 100644
--- a/editors/openoffice.org-3/files/patch-i65512
+++ b/editors/openoffice.org-3/files/patch-i65512
@@ -5,7 +5,7 @@
  	char *buffer, int buflen, int *h_errnop)
  {
 -#ifdef LINUX
-+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103)))
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
  	struct hostent *__result; /* will be the same as result */
  	int __error;
  	__error = gethostbyname_r (name, result, buffer, buflen,
@@ -15,7 +15,7 @@
  }
  #endif /* defined SCO */
  
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
 +
  extern int h_errno;
  
@@ -24,7 +24,7 @@
  
    	return res;
  }
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  
  #if defined(MACOSX)
  /*
@@ -34,10 +34,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
-+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
  #endif
  
  #endif /* __OSL_SYSTEM_H__ */
@@ -55,7 +55,7 @@
 + 
 +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-++	(defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103))
+++	(defined(__FreeBSD__) && __FreeBSD_version > 601103)
 + #define _PR_HAVE_GETPROTO_R
 + #define _PR_HAVE_5_ARG_GETPROTO_R
 + #endif
-- 
cgit v1.2.3