diff options
| -rw-r--r-- | net/freenet-tools/distinfo | 5 | ||||
| -rw-r--r-- | net/freenet-tools/patches/patch-aa | 29 | ||||
| -rw-r--r-- | net/freenet-tools/patches/patch-ab | 31 |
3 files changed, 60 insertions, 5 deletions
diff --git a/net/freenet-tools/distinfo b/net/freenet-tools/distinfo index 1cb2b1b9f5a..bedf80b1df8 100644 --- a/net/freenet-tools/distinfo +++ b/net/freenet-tools/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/07/25 15:36:31 tv Exp $ +$NetBSD: distinfo,v 1.3 2004/10/29 17:06:50 tv Exp $ SHA1 (ft-0.2.23.tgz) = b247b56ff84ec871292c3fc2e55b812f19ab0f23 Size (ft-0.2.23.tgz) = 40547 bytes -SHA1 (patch-aa) = 12fb2c63b24a06f43f03466f16f994e911367189 +SHA1 (patch-aa) = 9e7675096a524eb6cfd064eaa00f36e02d85f62f +SHA1 (patch-ab) = 77110bb0ff189cc46a7bc79253bf17f6fd17dc18 diff --git a/net/freenet-tools/patches/patch-aa b/net/freenet-tools/patches/patch-aa index 8eff4982541..62e86f0d55c 100644 --- a/net/freenet-tools/patches/patch-aa +++ b/net/freenet-tools/patches/patch-aa @@ -1,8 +1,31 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/03/29 18:43:47 tv Exp $ +$NetBSD: patch-aa,v 1.2 2004/10/29 17:06:50 tv Exp $ ---- ftmain.c.orig Wed Sep 24 22:56:49 2003 +--- ftmain.c.orig Thu May 20 06:31:47 2004 +++ ftmain.c -@@ -248,8 +248,7 @@ int main(int argc, char **argv) +@@ -218,9 +218,9 @@ void usage(int cmd) + } + } + +-#ifdef __CYGWIN__ +-/* The CYGWIN libc does not have a timegm() function */ +-time_t cyg_timegm(struct tm *tm) ++#if defined(__CYGWIN__) || defined(__INTERIX) ++/* Replacement timegm() function for libc's missing it */ ++time_t timegm(struct tm *tm) + { + time_t time_temp; + struct tm *tm_temp; +@@ -234,7 +234,9 @@ time_t cyg_timegm(struct tm *tm) + tm_temp = gmtime(&time_temp); + return (time_t)(time_temp + (time_temp - mktime(tm_temp))); + } ++#endif + ++#ifdef __CYGWIN__ + //////////////////////////////////////////////////////// + // private popen2() - in-fact this is exact copy of + // newlib/libc/posix.c/popen.c with fork() instead of vfork() +@@ -420,8 +422,7 @@ int main(int argc, char **argv) } else { progname = strdup(argv[0]); free(progpath); diff --git a/net/freenet-tools/patches/patch-ab b/net/freenet-tools/patches/patch-ab new file mode 100644 index 00000000000..7de9a8f11c9 --- /dev/null +++ b/net/freenet-tools/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 2004/10/29 17:06:50 tv Exp $ + +--- ft.h.orig Thu May 20 06:31:46 2004 ++++ ft.h +@@ -44,7 +44,6 @@ + #include <dirent.h> + + #ifdef __CYGWIN__ +-#define timegm(x) cyg_timegm(x) + #define OPEN_RB "rb" + #define OPEN_WB "wb" + #else +@@ -111,8 +110,16 @@ enum { + #define UNKNOWNERROR "UNKNOWN" + #endif + +-#ifdef __CYGWIN__ +-time_t cyg_timegm(struct tm *tm); ++#if defined(__CYGWIN__) || defined(__INTERIX) ++time_t timegm(struct tm *tm); ++#endif ++ ++#ifdef __INTERIX ++#define socklen_t int ++#define strtoull _strtouq ++ ++/* hidden version of strtoull() in libc */ ++u_quad_t _strtouq(const char *, char **, int); + #endif + + #ifdef __cplusplus |