summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2006-08-07 10:06:41 +0000
committerMaho Nakata <maho@FreeBSD.org>2006-08-07 10:06:41 +0000
commit9e89958c70f60831ac6002ca3da5dbc4dcf4363c (patch)
tree776cfa4077dd9e9e23b6c47313fa3effc178eaa2
parent- Update MASTER_SITES (diff)
o Update to SRC680_m180
o discard __FreeBSD_version < 700015 since get*_r is MFC'ed to 601103[1] Discussed with: ume[1]
Notes
Notes: svn path=/head/; revision=169947
Diffstat
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3-devel/distinfo6
-rw-r--r--editors/openoffice-3-devel/files/patch-i679049
-rw-r--r--editors/openoffice.org-2-devel/Makefile4
-rw-r--r--editors/openoffice.org-2-devel/distinfo6
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i679049
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile4
-rw-r--r--editors/openoffice.org-2.0-devel/distinfo6
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-i679049
-rw-r--r--editors/openoffice.org-3-devel/Makefile4
-rw-r--r--editors/openoffice.org-3-devel/distinfo6
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i679049
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile4
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo6
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i679049
15 files changed, 50 insertions, 45 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 254781847003..2ec4d5ad895d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
-MILESTONE?= 179
+MILESTONE?= 180
OOOTAG?= SRC680_m${MILESTONE}
-SNAPDATE= 20060729
+SNAPDATE= 20060804
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index a795d476da4c..629e627d0801 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = b494fe73fe68f2517628cd836814642f
-SHA256 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = f2cec584528921827ff604fe0c27362e8adb0f3194ff632ee21fe90ceca4eb2e
-SIZE (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = 247593908
+MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
+SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
+SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/patch-i67904 b/editors/openoffice-3-devel/files/patch-i67904
index 51968a8b16fe..66d7d360a2ad 100644
--- a/editors/openoffice-3-devel/files/patch-i67904
+++ b/editors/openoffice-3-devel/files/patch-i67904
@@ -10,7 +10,7 @@ diff -u -r1.26 socket.c
char *buffer, int buflen, int *h_errnop)
{
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#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,
@@ -26,7 +26,7 @@ diff -u -r1.13 system.c
#endif /* defined SCO */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
@@ -42,7 +42,7 @@ diff -u -r1.33 system.h
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#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) */
@@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++ (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-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 254781847003..2ec4d5ad895d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
-MILESTONE?= 179
+MILESTONE?= 180
OOOTAG?= SRC680_m${MILESTONE}
-SNAPDATE= 20060729
+SNAPDATE= 20060804
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index a795d476da4c..629e627d0801 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = b494fe73fe68f2517628cd836814642f
-SHA256 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = f2cec584528921827ff604fe0c27362e8adb0f3194ff632ee21fe90ceca4eb2e
-SIZE (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = 247593908
+MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
+SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
+SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/files/patch-i67904 b/editors/openoffice.org-2-devel/files/patch-i67904
index 51968a8b16fe..66d7d360a2ad 100644
--- a/editors/openoffice.org-2-devel/files/patch-i67904
+++ b/editors/openoffice.org-2-devel/files/patch-i67904
@@ -10,7 +10,7 @@ diff -u -r1.26 socket.c
char *buffer, int buflen, int *h_errnop)
{
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#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,
@@ -26,7 +26,7 @@ diff -u -r1.13 system.c
#endif /* defined SCO */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
@@ -42,7 +42,7 @@ diff -u -r1.33 system.h
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#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) */
@@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++ (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-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 254781847003..2ec4d5ad895d 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
-MILESTONE?= 179
+MILESTONE?= 180
OOOTAG?= SRC680_m${MILESTONE}
-SNAPDATE= 20060729
+SNAPDATE= 20060804
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index a795d476da4c..629e627d0801 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = b494fe73fe68f2517628cd836814642f
-SHA256 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = f2cec584528921827ff604fe0c27362e8adb0f3194ff632ee21fe90ceca4eb2e
-SIZE (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = 247593908
+MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
+SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
+SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i67904 b/editors/openoffice.org-2.0-devel/files/patch-i67904
index 51968a8b16fe..66d7d360a2ad 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-i67904
+++ b/editors/openoffice.org-2.0-devel/files/patch-i67904
@@ -10,7 +10,7 @@ diff -u -r1.26 socket.c
char *buffer, int buflen, int *h_errnop)
{
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#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,
@@ -26,7 +26,7 @@ diff -u -r1.13 system.c
#endif /* defined SCO */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
@@ -42,7 +42,7 @@ diff -u -r1.33 system.h
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#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) */
@@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++ (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-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 254781847003..2ec4d5ad895d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
-MILESTONE?= 179
+MILESTONE?= 180
OOOTAG?= SRC680_m${MILESTONE}
-SNAPDATE= 20060729
+SNAPDATE= 20060804
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index a795d476da4c..629e627d0801 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = b494fe73fe68f2517628cd836814642f
-SHA256 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = f2cec584528921827ff604fe0c27362e8adb0f3194ff632ee21fe90ceca4eb2e
-SIZE (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = 247593908
+MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
+SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
+SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/files/patch-i67904 b/editors/openoffice.org-3-devel/files/patch-i67904
index 51968a8b16fe..66d7d360a2ad 100644
--- a/editors/openoffice.org-3-devel/files/patch-i67904
+++ b/editors/openoffice.org-3-devel/files/patch-i67904
@@ -10,7 +10,7 @@ diff -u -r1.26 socket.c
char *buffer, int buflen, int *h_errnop)
{
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#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,
@@ -26,7 +26,7 @@ diff -u -r1.13 system.c
#endif /* defined SCO */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
@@ -42,7 +42,7 @@ diff -u -r1.33 system.h
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#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) */
@@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++ (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-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 254781847003..2ec4d5ad895d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
-MILESTONE?= 179
+MILESTONE?= 180
OOOTAG?= SRC680_m${MILESTONE}
-SNAPDATE= 20060729
+SNAPDATE= 20060804
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index a795d476da4c..629e627d0801 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = b494fe73fe68f2517628cd836814642f
-SHA256 (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = f2cec584528921827ff604fe0c27362e8adb0f3194ff632ee21fe90ceca4eb2e
-SIZE (openoffice.org2.0/OOo_SRC680_m179_source.tar.bz2) = 247593908
+MD5 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e8de7c5d223e3f555092fe20bcdd963e
+SHA256 (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = e6b1d974866934eb69f94424fe023b7c4f226f9c1dfb74a288db6c9c11c51ff6
+SIZE (openoffice.org2.0/OOo_SRC680_m180_source.tar.bz2) = 247695329
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i67904 b/editors/openoffice.org-vcltesttool/files/patch-i67904
index 51968a8b16fe..66d7d360a2ad 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i67904
+++ b/editors/openoffice.org-vcltesttool/files/patch-i67904
@@ -10,7 +10,7 @@ diff -u -r1.26 socket.c
char *buffer, int buflen, int *h_errnop)
{
-#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
-+#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,
@@ -26,7 +26,7 @@ diff -u -r1.13 system.c
#endif /* defined SCO */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103)
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
@@ -42,7 +42,7 @@ diff -u -r1.33 system.h
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
-+#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) */
@@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch
-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
-+ (defined(__FreeBSD__) && __FreeBSD_version > 700016)
-++ (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
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 18:12:22 +0000