diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-09-10 02:33:28 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-09-10 02:33:28 +0000 |
| commit | 8b8350be18d32c4dc956ef33ad320cc00afe3344 (patch) | |
| tree | e13ed3a812683473551a5285ee4882c33de3b325 /editors | |
| parent | - Update to 1.22 (diff) | |
Update to SRC680_m183.
Fix build breakage of __FreeBSD_version >= 601103
Reported by: many
Notes
Notes:
svn path=/head/; revision=172663
Diffstat (limited to 'editors')
20 files changed, 315 insertions, 55 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index c6e52fc50347..b586e979c76a 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -75,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 182 +MILESTONE?= 183 OOOTAG?= SRC680_m${MILESTONE} -SNAPDATE= 20060818 +SNAPDATE= 20060908 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -150,8 +150,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -#WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} -WRKSRC?= ${WRKDIR} +WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 34310d90c2d3..63465f9d59f9 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950 -SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d -SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795 +MD5 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = bf79f0559a395427696611c33eff647b +SHA256 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = ef355ba5f17e39b1fd66dc6b149a32f4618b647096870109a71e87dddf11e0fb +SIZE (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = 263899916 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-i67904 b/editors/openoffice-3-devel/files/patch-i67904 index 66d7d360a2ad..d2fb32236151 100644 --- a/editors/openoffice-3-devel/files/patch-i67904 +++ b/editors/openoffice-3-devel/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-devel/files/patch-i69418 b/editors/openoffice-3-devel/files/patch-i69418 new file mode 100644 index 000000000000..dd23c55e4c9b --- /dev/null +++ b/editors/openoffice-3-devel/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 diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index c6e52fc50347..b586e979c76a 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -75,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 182 +MILESTONE?= 183 OOOTAG?= SRC680_m${MILESTONE} -SNAPDATE= 20060818 +SNAPDATE= 20060908 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -150,8 +150,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -#WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} -WRKSRC?= ${WRKDIR} +WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 34310d90c2d3..63465f9d59f9 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_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950 -SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d -SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795 +MD5 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = bf79f0559a395427696611c33eff647b +SHA256 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = ef355ba5f17e39b1fd66dc6b149a32f4618b647096870109a71e87dddf11e0fb +SIZE (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = 263899916 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2-devel/files/patch-i67904 b/editors/openoffice.org-2-devel/files/patch-i67904 index 66d7d360a2ad..d2fb32236151 100644 --- a/editors/openoffice.org-2-devel/files/patch-i67904 +++ b/editors/openoffice.org-2-devel/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.org-2-devel/files/patch-i69418 b/editors/openoffice.org-2-devel/files/patch-i69418 new file mode 100644 index 000000000000..dd23c55e4c9b --- /dev/null +++ b/editors/openoffice.org-2-devel/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 diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index c6e52fc50347..b586e979c76a 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -75,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 182 +MILESTONE?= 183 OOOTAG?= SRC680_m${MILESTONE} -SNAPDATE= 20060818 +SNAPDATE= 20060908 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -150,8 +150,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -#WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} -WRKSRC?= ${WRKDIR} +WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 34310d90c2d3..63465f9d59f9 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_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950 -SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d -SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795 +MD5 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = bf79f0559a395427696611c33eff647b +SHA256 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = ef355ba5f17e39b1fd66dc6b149a32f4618b647096870109a71e87dddf11e0fb +SIZE (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = 263899916 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2.0-devel/files/patch-i67904 b/editors/openoffice.org-2.0-devel/files/patch-i67904 index 66d7d360a2ad..d2fb32236151 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-i67904 +++ b/editors/openoffice.org-2.0-devel/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.org-2.0-devel/files/patch-i69418 b/editors/openoffice.org-2.0-devel/files/patch-i69418 new file mode 100644 index 000000000000..dd23c55e4c9b --- /dev/null +++ b/editors/openoffice.org-2.0-devel/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 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index c6e52fc50347..b586e979c76a 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -75,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 182 +MILESTONE?= 183 OOOTAG?= SRC680_m${MILESTONE} -SNAPDATE= 20060818 +SNAPDATE= 20060908 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -150,8 +150,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -#WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} -WRKSRC?= ${WRKDIR} +WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 34310d90c2d3..63465f9d59f9 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_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950 -SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d -SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795 +MD5 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = bf79f0559a395427696611c33eff647b +SHA256 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = ef355ba5f17e39b1fd66dc6b149a32f4618b647096870109a71e87dddf11e0fb +SIZE (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = 263899916 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/patch-i67904 b/editors/openoffice.org-3-devel/files/patch-i67904 index 66d7d360a2ad..d2fb32236151 100644 --- a/editors/openoffice.org-3-devel/files/patch-i67904 +++ b/editors/openoffice.org-3-devel/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.org-3-devel/files/patch-i69418 b/editors/openoffice.org-3-devel/files/patch-i69418 new file mode 100644 index 000000000000..dd23c55e4c9b --- /dev/null +++ b/editors/openoffice.org-3-devel/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 diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index c6e52fc50347..b586e979c76a 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -75,9 +75,9 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 182 +MILESTONE?= 183 OOOTAG?= SRC680_m${MILESTONE} -SNAPDATE= 20060818 +SNAPDATE= 20060908 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -150,8 +150,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -#WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} -WRKSRC?= ${WRKDIR} +WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 34310d90c2d3..63465f9d59f9 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 6d8f385bfd1a724ee6e72e2f46f74950 -SHA256 (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 1fc1dbabbbef770a19213f6122b04db54134bf5cf4990224aa3146673636262d -SIZE (openoffice.org2.0/OOo_SRC680_m182_source.tar.bz2) = 248035795 +MD5 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = bf79f0559a395427696611c33eff647b +SHA256 (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = ef355ba5f17e39b1fd66dc6b149a32f4618b647096870109a71e87dddf11e0fb +SIZE (openoffice.org2.0/OOo_SRC680_m183_source.tar.bz2) = 263899916 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-vcltesttool/files/patch-i67904 b/editors/openoffice.org-vcltesttool/files/patch-i67904 index 66d7d360a2ad..d2fb32236151 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i67904 +++ b/editors/openoffice.org-vcltesttool/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.org-vcltesttool/files/patch-i69418 b/editors/openoffice.org-vcltesttool/files/patch-i69418 new file mode 100644 index 000000000000..dd23c55e4c9b --- /dev/null +++ b/editors/openoffice.org-vcltesttool/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 |