diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-27 09:31:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-27 09:31:47 +0000 |
| commit | a8961db09e4db072abcbd0aa4474e83d84dd7a84 (patch) | |
| tree | 5d7ecbe51085cf58e514a9c1cf3f770a82b8ba74 /archivers | |
| parent | 3f436444c7273834dbd93818998d77c97f331e0c (diff) | |
| download | pkgsrc-a8961db09e4db072abcbd0aa4474e83d84dd7a84.tar.gz | |
Fix build on Linux. From Matthias Ferdinand on pkgsrc-users.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/zoo/distinfo | 4 | ||||
| -rw-r--r-- | archivers/zoo/patches/patch-ab | 42 |
2 files changed, 34 insertions, 12 deletions
diff --git a/archivers/zoo/distinfo b/archivers/zoo/distinfo index 71a0b6e25ed..73bd95086f5 100644 --- a/archivers/zoo/distinfo +++ b/archivers/zoo/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2015/01/19 00:40:35 wiedi Exp $ +$NetBSD: distinfo,v 1.15 2015/02/27 09:31:47 wiz Exp $ SHA1 (zoo-2.10pl1.tar.gz) = c02d96148ee57df01596d0c8d07a3e327b821600 RMD160 (zoo-2.10pl1.tar.gz) = 971d388b8cb29def1e4e31011463563e91c3d700 Size (zoo-2.10pl1.tar.gz) = 172096 bytes SHA1 (patch-aa) = 22faf3fdc38c7d75867327718d23db50fb6013d3 -SHA1 (patch-ab) = 93bb90bd404f0ecf07bec0d54d3c837b9123eba3 +SHA1 (patch-ab) = bea792c43b50c14d0be25c886c148cd6ce392234 SHA1 (patch-ac) = e5c9e18461b86fbfba4526f685fb65a507bb6f97 SHA1 (patch-ad) = d8992d565f48aab10521ecbd346d233a1e717790 SHA1 (patch-ae) = d1e60cea71bb1c56e76a6ffc9923341664283a0c diff --git a/archivers/zoo/patches/patch-ab b/archivers/zoo/patches/patch-ab index b37641c2891..385e6acfe18 100644 --- a/archivers/zoo/patches/patch-ab +++ b/archivers/zoo/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $ +$NetBSD: patch-ab,v 1.8 2015/02/27 09:31:47 wiz Exp $ - use standard headers - use standard macros for seeking @@ -6,6 +6,7 @@ $NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $ - use off_t - supply missing return value - on sunos ignore unsupported tm_gmtoff +- include nixtime.i early enough, before the first call to time() --- bsd.c.orig 1993-05-01 04:21:53.000000000 +0000 +++ bsd.c @@ -18,7 +19,25 @@ $NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $ #endif long ftell(); -@@ -74,24 +74,15 @@ long gettz() +@@ -50,6 +50,17 @@ Date and time functions are standard UNI + #include <sys/stat.h> + #include <sys/time.h> + ++/* Standard UNIX-compatible time routines */ ++#include "nixtime.i" ++ ++/* Standard UNIX-specific file attribute routines */ ++#include "nixmode.i" ++ ++#include <unistd.h> ++#ifndef SEEK_CUR ++# define SEEK_CUR 1 ++#endif ++ + /* Function isadir() returns 1 if the supplied handle is a directory, + else it returns 0. + */ +@@ -74,46 +85,27 @@ long gettz() #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ @@ -46,15 +65,18 @@ $NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $ retval = -tm->tm_gmtoff; #endif return retval; -@@ -103,6 +94,7 @@ long gettz() - /* Standard UNIX-specific file attribute routines */ - #include "nixmode.i" + } -+#include <unistd.h> - #ifndef SEEK_CUR - # define SEEK_CUR 1 - #endif -@@ -110,10 +102,10 @@ long gettz() +-/* Standard UNIX-compatible time routines */ +-#include "nixtime.i" +- +-/* Standard UNIX-specific file attribute routines */ +-#include "nixmode.i" +- +-#ifndef SEEK_CUR +-# define SEEK_CUR 1 +-#endif +- /* Truncate a file. */ int zootrunc(f) FILE *f; { |