From f82f292252622d832e97c8d3924bfb618cf44690 Mon Sep 17 00:00:00 2001
From: wiedi <wiedi@pkgsrc.org>
Date: Mon, 19 Jan 2015 00:40:35 +0000
Subject: fix build on sunos (ignore unsupported tm_gmtoff)

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

diff --git a/archivers/zoo/distinfo b/archivers/zoo/distinfo
index 88008e34013..71a0b6e25ed 100644
--- a/archivers/zoo/distinfo
+++ b/archivers/zoo/distinfo
@@ -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 --git a/archivers/zoo/patches/patch-ab b/archivers/zoo/patches/patch-ab
index 57886f809bc..b37641c2891 100644
--- a/archivers/zoo/patches/patch-ab
+++ b/archivers/zoo/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.6 2014/06/29 03:24:33 dholland Exp $
  #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 @@ $NetBSD: patch-ab,v 1.6 2014/06/29 03:24:33 dholland Exp $
 -#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 @@ $NetBSD: patch-ab,v 1.6 2014/06/29 03:24:33 dholland Exp $
  #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;
  {
-- 
cgit v1.2.3