aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice-3
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2006-09-10 06:17:58 +0800
committermaho <maho@FreeBSD.org>2006-09-10 06:17:58 +0800
commitd5948c3e4a05f2422fe31ca20dcf341f503aaf59 (patch)
treead60cdcf5915c4c30f6ac14b32c9208d88412236 /editors/openoffice-3
parent83db46e7f3bc08cdcfc00d73e8f8616a531e84c5 (diff)
downloadfreebsd-ports-gnome-d5948c3e4a05f2422fe31ca20dcf341f503aaf59.tar.gz
freebsd-ports-gnome-d5948c3e4a05f2422fe31ca20dcf341f503aaf59.tar.zst
freebsd-ports-gnome-d5948c3e4a05f2422fe31ca20dcf341f503aaf59.zip
Fix a build breaker of __FreeBSD_version >= 601103.
Submitted by: many
Diffstat (limited to 'editors/openoffice-3')
-rw-r--r--editors/openoffice-3/files/patch-i6790423
-rw-r--r--editors/openoffice-3/files/patch-i6941838
2 files changed, 57 insertions, 4 deletions
diff --git a/editors/openoffice-3/files/patch-i67904 b/editors/openoffice-3/files/patch-i67904
index 66d7d360a2ad..d2fb32236151 100644
--- a/editors/openoffice-3/files/patch-i67904
+++ b/editors/openoffice-3/files/patch-i67904
@@ -20,7 +20,7 @@ RCS file: /cvs/porting/sal/osl/unx/system.c,v
retrieving revision 1.13
diff -u -r1.13 system.c
--- sal/osl/unx/system.c 19 Jul 2006 09:39:37 -0000 1.13
-+++ sal/osl/unx/system.c 29 Jul 2006 09:53:04 -0000
++++ sal/osl/unx/system.c 9 Sep 2006 09:57:26 -0000
@@ -343,7 +343,7 @@
}
#endif /* defined SCO */
@@ -30,14 +30,24 @@ diff -u -r1.13 system.c
extern int h_errno;
+@@ -435,7 +435,7 @@
+
+ return res;
+ }
+-#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
+
+ #if defined(MACOSX)
+ /*
+
Index: sal/osl/unx/system.h
===================================================================
RCS file: /cvs/porting/sal/osl/unx/system.h,v
retrieving revision 1.33
diff -u -r1.33 system.h
--- sal/osl/unx/system.h 19 Jul 2006 09:39:50 -0000 1.33
-+++ sal/osl/unx/system.h 29 Jul 2006 09:53:04 -0000
-@@ -537,7 +537,7 @@
++++ sal/osl/unx/system.h 9 Sep 2006 09:55:55 -0000
+@@ -537,10 +537,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) */
@@ -45,7 +55,12 @@ diff -u -r1.33 system.h
+#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 < 700015) */
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
+ #endif
+
+ #endif /* __OSL_SYSTEM_H__ */
+
Index: moz/mozilla-source-1.7.5.patch
===================================================================
RCS file: /cvs/external/moz/mozilla-source-1.7.5.patch,v
diff --git a/editors/openoffice-3/files/patch-i69418 b/editors/openoffice-3/files/patch-i69418
new file mode 100644
index 000000000000..dd23c55e4c9b
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i69418
@@ -0,0 +1,38 @@
+--- moz/mozilla-source-1.7.5.patch.org Sat Sep 9 18:43:45 2006
++++ moz/mozilla-source-1.7.5.patch Sat Sep 9 18:42:00 2006
+@@ -151,6 +151,17 @@
+ AR_EXTRACT="$AR x"
+ AR_DELETE="$AR d"
+ ***************
++*** 7504,7509 ****
++--- 7504,7511 ----
++ case $target in
++ *-hpux11.*)
++ ;;
+++ *-freebsd*)
+++ ;;
++ *)
++ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
++ echo "configure:7510: checking for gethostbyname_r in -lc_r" >&5
++***************
+ *** 16606,16613 ****
+
+ case "$host_os" in
+@@ -191,6 +202,17 @@
+ AR_EXTRACT="$AR x"
+ AR_DELETE="$AR d"
+ ***************
++*** 1981,1986 ****
++--- 1981,1988 ----
++ case $target in
++ *-hpux11.*)
++ ;;
+++ *-freebsd*)
+++ ;;
++ *)
++ AC_CHECK_LIB(c_r, gethostbyname_r)
++ ;;
++***************
+ *** 5692,5699 ****
+ dnl ========================================================
+ case "$host_os" in