Conditionalise patches to not apply on linux.

3 files changed, 21 insertions, 11 deletions

diff --git a/multimedia/liboggz/distinfo b/multimedia/liboggz/distinfo
index e95ae3fd54f..eb9bae0fed8 100644
--- a/multimedia/liboggz/distinfo
+++ b/multimedia/liboggz/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 23:54:29 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/01/03 20:54:50 markd Exp $
 
 SHA1 (liboggz-1.1.1.tar.gz) = 3540190c8c9a31d834aa7794ef991bbab699f4de
 RMD160 (liboggz-1.1.1.tar.gz) = e85073131bc8ec021b1529487ef21802d01b0260
 SHA512 (liboggz-1.1.1.tar.gz) = 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
 Size (liboggz-1.1.1.tar.gz) = 702261 bytes
-SHA1 (patch-src_tools_oggz-chop_httpdate.c) = fc771da0fb46097c39cb8a5fc8f03a25ea5542b3
-SHA1 (patch-src_tools_oggz-chop_httpdate__test.c) = f7979bcf1991f71a6eec0b53a6ff784f46f863e8
+SHA1 (patch-src_tools_oggz-chop_httpdate.c) = e99506865b72aacc98fdc26f0ab838f95f438066
+SHA1 (patch-src_tools_oggz-chop_httpdate__test.c) = c2d7c3ce0bdb6d3f14b71b9846d6e3f3ebd22f99
diff --git a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c b/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c
index 9591dd45a63..22d7f93797c 100644
--- a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c
+++ b/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c
@@ -1,23 +1,28 @@
-$NetBSD: patch-src_tools_oggz-chop_httpdate.c,v 1.1 2014/05/25 16:35:18 rodent Exp $
+$NetBSD: patch-src_tools_oggz-chop_httpdate.c,v 1.2 2016/01/03 20:54:50 markd Exp $
 
 Fix build for {Free,Open}BSD.
 
 --- src/tools/oggz-chop/httpdate.c.orig	2010-01-30 05:55:59.000000000 +0000
 +++ src/tools/oggz-chop/httpdate.c
-@@ -33,6 +33,7 @@ time_t
+@@ -33,6 +33,9 @@ time_t
  httpdate_parse (char * s, int n)
  {
    struct tm d;
++#ifndef __linux__
 +  struct timezone tzone;
++#endif
    char wday[3], month[3];
    int i;
  
-@@ -60,7 +61,7 @@ httpdate_parse (char * s, int n)
+@@ -60,7 +63,11 @@ httpdate_parse (char * s, int n)
  
    d.tm_year -= 1900;
  
--  d.tm_sec -= timezone;
++#ifdef __linux__
+   d.tm_sec -= timezone;
++#else
 +  d.tm_sec -= (tzone.tz_minuteswest * 60);
++#endif
  
    return mktime (&d);
  }
diff --git a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c b/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c
index 5eeee7a7b75..9ad60ae9140 100644
--- a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c
+++ b/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c
@@ -1,23 +1,28 @@
-$NetBSD: patch-src_tools_oggz-chop_httpdate__test.c,v 1.1 2014/05/25 16:35:18 rodent Exp $
+$NetBSD: patch-src_tools_oggz-chop_httpdate__test.c,v 1.2 2016/01/03 20:54:50 markd Exp $
 
 Fix build for {Free,Open}BSD.
 
 --- src/tools/oggz-chop/httpdate_test.c.orig	2010-01-30 05:55:59.000000000 +0000
 +++ src/tools/oggz-chop/httpdate_test.c
-@@ -13,6 +13,7 @@ main (int argc, char * argv[])
+@@ -13,6 +13,9 @@ main (int argc, char * argv[])
    char * d_in = "Mon, 06 Feb 2006 11:20:01 GMT";
    char d_out[30];
    time_t t;
++#ifndef __linux__
 +  struct timezone tzone;
++#endif
  
    INFO ("Parsing date:");
    INFO (d_in);
-@@ -21,7 +22,7 @@ main (int argc, char * argv[])
+@@ -21,7 +24,11 @@ main (int argc, char * argv[])
    if (t == (time_t)-1) {
      FAIL ("Parse error");
    } else {
--    t -= timezone;
++#ifdef __linux__
+     t -= timezone;
++#else
 +    t -= tzone.tz_minuteswest;
++#endif
      httpdate_snprint (d_out, 30, t);
  
      INFO ("Output date:");