kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

o Update to SRC680_m180

Browse source 
o discard __FreeBSD_version < 700015 since get*_r is MFC'ed to 601103[1]

Discussed with: ume[1]
This commit is contained in:
Maho Nakata 2006-08-07 10:06:41 +00:00
parent 2d7ab000e6
commit 9e89958c70
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=169947
15 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/openoffice-3-devel/Makefile
View file

@ -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

6
editors/openoffice-3-devel/distinfo
View file

@ -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

9
editors/openoffice-3-devel/files/patch-i67904
View file

@ -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

4
editors/openoffice.org-2-devel/Makefile
View file

@ -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

6
editors/openoffice.org-2-devel/distinfo
View file

@ -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

9
editors/openoffice.org-2-devel/files/patch-i67904
View file

@ -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

4
editors/openoffice.org-2.0-devel/Makefile
View file

@ -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

6
editors/openoffice.org-2.0-devel/distinfo
View file

@ -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

9
editors/openoffice.org-2.0-devel/files/patch-i67904
View file

@ -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

4
editors/openoffice.org-3-devel/Makefile
View file

@ -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

6
editors/openoffice.org-3-devel/distinfo
View file

@ -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

9
editors/openoffice.org-3-devel/files/patch-i67904
View file

@ -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

4
editors/openoffice.org-vcltesttool/Makefile
View file

@ -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

6
editors/openoffice.org-vcltesttool/distinfo
View file

@ -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

9
editors/openoffice.org-vcltesttool/files/patch-i67904
View file

@ -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