pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/zoo fix build on sunos (ignore unsupported t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4e3ceb6cf70
branches:  trunk
changeset: 644892:f4e3ceb6cf70
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Mon Jan 19 00:40:35 2015 +0000

description:
fix build on sunos (ignore unsupported tm_gmtoff)

diffstat:

 archivers/zoo/distinfo         |   4 ++--
 archivers/zoo/patches/patch-ab |  16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 0380bb2e05d4 -r f4e3ceb6cf70 archivers/zoo/distinfo
--- a/archivers/zoo/distinfo    Mon Jan 19 00:12:43 2015 +0000
+++ b/archivers/zoo/distinfo    Mon Jan 19 00:40:35 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2014/06/29 03:24:33 dholland Exp $
+$NetBSD: distinfo,v 1.14 2015/01/19 00:40:35 wiedi 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) = 205936660e84f17c9ec49830acd3b46e343268bd
+SHA1 (patch-ab) = 93bb90bd404f0ecf07bec0d54d3c837b9123eba3
 SHA1 (patch-ac) = e5c9e18461b86fbfba4526f685fb65a507bb6f97
 SHA1 (patch-ad) = d8992d565f48aab10521ecbd346d233a1e717790
 SHA1 (patch-ae) = d1e60cea71bb1c56e76a6ffc9923341664283a0c
diff -r 0380bb2e05d4 -r f4e3ceb6cf70 archivers/zoo/patches/patch-ab
--- a/archivers/zoo/patches/patch-ab    Mon Jan 19 00:12:43 2015 +0000
+++ b/archivers/zoo/patches/patch-ab    Mon Jan 19 00:40:35 2015 +0000
@@ -1,10 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2014/06/29 03:24:33 dholland Exp $
+$NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $
 
 - use standard headers
 - use standard macros for seeking
 - don't declare own lseek
 - use off_t
 - supply missing return value
+- on sunos ignore unsupported tm_gmtoff
 
 --- bsd.c.orig 1993-05-01 04:21:53.000000000 +0000
 +++ bsd.c
@@ -17,7 +18,7 @@
  #endif
  
  long ftell();
-@@ -74,26 +74,13 @@ long gettz()
+@@ -74,24 +74,15 @@ 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 */
@@ -39,12 +40,13 @@
 -#else
        time(&lt);
        tm = localtime(&lt);
++#if defined(__sun)
++      retval = 0;
++#else
        retval = -tm->tm_gmtoff;
--#endif
+ #endif
        return retval;
- }
- 
-@@ -103,6 +90,7 @@ long gettz()
+@@ -103,6 +94,7 @@ long gettz()
  /* Standard UNIX-specific file attribute routines */
  #include "nixmode.i"
  
@@ -52,7 +54,7 @@
  #ifndef SEEK_CUR
  # define  SEEK_CUR    1
  #endif
-@@ -110,10 +98,10 @@ long gettz()
+@@ -110,10 +102,10 @@ long gettz()
  /* Truncate a file. */
  int zootrunc(f) FILE *f;
  {



Home | Main Index | Thread Index | Old Index