Sun Jan 3 20:54:50 2016 UTC ()
Conditionalise patches to not apply on linux.


(markd)
diff -r1.3 -r1.4 pkgsrc/multimedia/liboggz/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c
diff -r1.1 -r1.2 pkgsrc/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/liboggz/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/liboggz/distinfo 2015/11/03 23:54:29 1.3
+++ pkgsrc/multimedia/liboggz/distinfo 2016/01/03 20:54:50 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2015/11/03 23:54:29 agc Exp $ 1$NetBSD: distinfo,v 1.4 2016/01/03 20:54:50 markd Exp $
2 2
3SHA1 (liboggz-1.1.1.tar.gz) = 3540190c8c9a31d834aa7794ef991bbab699f4de 3SHA1 (liboggz-1.1.1.tar.gz) = 3540190c8c9a31d834aa7794ef991bbab699f4de
4RMD160 (liboggz-1.1.1.tar.gz) = e85073131bc8ec021b1529487ef21802d01b0260 4RMD160 (liboggz-1.1.1.tar.gz) = e85073131bc8ec021b1529487ef21802d01b0260
5SHA512 (liboggz-1.1.1.tar.gz) = 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba 5SHA512 (liboggz-1.1.1.tar.gz) = 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
6Size (liboggz-1.1.1.tar.gz) = 702261 bytes 6Size (liboggz-1.1.1.tar.gz) = 702261 bytes
7SHA1 (patch-src_tools_oggz-chop_httpdate.c) = fc771da0fb46097c39cb8a5fc8f03a25ea5542b3 7SHA1 (patch-src_tools_oggz-chop_httpdate.c) = e99506865b72aacc98fdc26f0ab838f95f438066
8SHA1 (patch-src_tools_oggz-chop_httpdate__test.c) = f7979bcf1991f71a6eec0b53a6ff784f46f863e8 8SHA1 (patch-src_tools_oggz-chop_httpdate__test.c) = c2d7c3ce0bdb6d3f14b71b9846d6e3f3ebd22f99
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate.c (expand / switch to unified diff)

--- pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate.c 2014/05/25 16:35:18 1.1
+++ pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate.c 2016/01/03 20:54:50 1.2
@@ -1,23 +1,28 @@ @@ -1,23 +1,28 @@
1$NetBSD: patch-src_tools_oggz-chop_httpdate.c,v 1.1 2014/05/25 16:35:18 rodent Exp $ 1$NetBSD: patch-src_tools_oggz-chop_httpdate.c,v 1.2 2016/01/03 20:54:50 markd Exp $
2 2
3Fix build for {Free,Open}BSD. 3Fix build for {Free,Open}BSD.
4 4
5--- src/tools/oggz-chop/httpdate.c.orig 2010-01-30 05:55:59.000000000 +0000 5--- src/tools/oggz-chop/httpdate.c.orig 2010-01-30 05:55:59.000000000 +0000
6+++ src/tools/oggz-chop/httpdate.c 6+++ src/tools/oggz-chop/httpdate.c
7@@ -33,6 +33,7 @@ time_t 7@@ -33,6 +33,9 @@ time_t
8 httpdate_parse (char * s, int n) 8 httpdate_parse (char * s, int n)
9 { 9 {
10 struct tm d; 10 struct tm d;
 11+#ifndef __linux__
11+ struct timezone tzone; 12+ struct timezone tzone;
 13+#endif
12 char wday[3], month[3]; 14 char wday[3], month[3];
13 int i; 15 int i;
14  16
15@@ -60,7 +61,7 @@ httpdate_parse (char * s, int n) 17@@ -60,7 +63,11 @@ httpdate_parse (char * s, int n)
16  18
17 d.tm_year -= 1900; 19 d.tm_year -= 1900;
18  20
19- d.tm_sec -= timezone; 21+#ifdef __linux__
 22 d.tm_sec -= timezone;
 23+#else
20+ d.tm_sec -= (tzone.tz_minuteswest * 60); 24+ d.tm_sec -= (tzone.tz_minuteswest * 60);
 25+#endif
21  26
22 return mktime (&d); 27 return mktime (&d);
23 } 28 }
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate__test.c (expand / switch to unified diff)

--- pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate__test.c 2014/05/25 16:35:18 1.1
+++ pkgsrc/multimedia/liboggz/patches/Attic/patch-src_tools_oggz-chop_httpdate__test.c 2016/01/03 20:54:50 1.2
@@ -1,23 +1,28 @@ @@ -1,23 +1,28 @@
1$NetBSD: patch-src_tools_oggz-chop_httpdate__test.c,v 1.1 2014/05/25 16:35:18 rodent Exp $ 1$NetBSD: patch-src_tools_oggz-chop_httpdate__test.c,v 1.2 2016/01/03 20:54:50 markd Exp $
2 2
3Fix build for {Free,Open}BSD. 3Fix build for {Free,Open}BSD.
4 4
5--- src/tools/oggz-chop/httpdate_test.c.orig 2010-01-30 05:55:59.000000000 +0000 5--- src/tools/oggz-chop/httpdate_test.c.orig 2010-01-30 05:55:59.000000000 +0000
6+++ src/tools/oggz-chop/httpdate_test.c 6+++ src/tools/oggz-chop/httpdate_test.c
7@@ -13,6 +13,7 @@ main (int argc, char * argv[]) 7@@ -13,6 +13,9 @@ main (int argc, char * argv[])
8 char * d_in = "Mon, 06 Feb 2006 11:20:01 GMT"; 8 char * d_in = "Mon, 06 Feb 2006 11:20:01 GMT";
9 char d_out[30]; 9 char d_out[30];
10 time_t t; 10 time_t t;
 11+#ifndef __linux__
11+ struct timezone tzone; 12+ struct timezone tzone;
 13+#endif
12  14
13 INFO ("Parsing date:"); 15 INFO ("Parsing date:");
14 INFO (d_in); 16 INFO (d_in);
15@@ -21,7 +22,7 @@ main (int argc, char * argv[]) 17@@ -21,7 +24,11 @@ main (int argc, char * argv[])
16 if (t == (time_t)-1) { 18 if (t == (time_t)-1) {
17 FAIL ("Parse error"); 19 FAIL ("Parse error");
18 } else { 20 } else {
19- t -= timezone; 21+#ifdef __linux__
 22 t -= timezone;
 23+#else
20+ t -= tzone.tz_minuteswest; 24+ t -= tzone.tz_minuteswest;
 25+#endif
21 httpdate_snprint (d_out, 30, t); 26 httpdate_snprint (d_out, 30, t);
22  27
23 INFO ("Output date:"); 28 INFO ("Output date:");