diff options
| author | rodent <rodent> | 2014-05-25 16:40:09 +0000 |
|---|---|---|
| committer | rodent <rodent> | 2014-05-25 16:40:09 +0000 |
| commit | d3024c3270a38e15c81c5e3c6785f06d25e7347b (patch) | |
| tree | 39e8ef6e2a2c26c5e8ee74e54d5e1a450363486d /archivers | |
| parent | 6e766f5bcc61dddb207e0a6c79b454fadfac2fe5 (diff) | |
| download | pkgsrc-d3024c3270a38e15c81c5e3c6785f06d25e7347b.tar.gz | |
Move struct declaration to make ISO C90 happier.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/xbin/distinfo | 4 | ||||
| -rw-r--r-- | archivers/xbin/patches/patch-aa | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/archivers/xbin/distinfo b/archivers/xbin/distinfo index fde5d01f891..d5c7a907bec 100644 --- a/archivers/xbin/distinfo +++ b/archivers/xbin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2014/05/25 15:52:31 rodent Exp $ +$NetBSD: distinfo,v 1.7 2014/05/25 16:40:09 rodent Exp $ SHA1 (xbinunix.c) = 20db911814c29c5f236d5dc2a27fe25c7a5f61fb RMD160 (xbinunix.c) = 92a2daccb405c95e7a1b00f4162009f3c4245631 @@ -6,4 +6,4 @@ Size (xbinunix.c) = 18563 bytes SHA1 (xbin.man) = 2e223e6a02a2436f29c586fa711ee5ad3bbf591d RMD160 (xbin.man) = d01696da1c79f1693161417c6a8ced87b5b11c12 Size (xbin.man) = 3277 bytes -SHA1 (patch-aa) = 4f751ea7e77e84c0b9feb114cc00166e544de8b5 +SHA1 (patch-aa) = 22a3f2bcf33fde1a51fdce1a3affb8f7526cea59 diff --git a/archivers/xbin/patches/patch-aa b/archivers/xbin/patches/patch-aa index 1c1e03a3c83..72fe3820f2c 100644 --- a/archivers/xbin/patches/patch-aa +++ b/archivers/xbin/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2014/05/25 15:52:32 rodent Exp $ +$NetBSD: patch-aa,v 1.4 2014/05/25 16:40:09 rodent Exp $ Add missing includes. Fix build for OpenBSD 5.5. ---- xbinunix.c.orig Sun May 25 13:15:05 2014 +--- xbinunix.c.orig 2014-05-25 16:36:21.000000000 +0000 +++ xbinunix.c @@ -2,12 +2,17 @@ static char version[] = "xbin.c Version 2.3 09/30/85";
@@ -24,7 +24,7 @@ Add missing includes. Fix build for OpenBSD 5.5. #define FNAMELEN MAXNAMLEN
#else
#define FNAMELEN DIRSIZ
-@@ -15,7 +20,12 @@ static char version[] = "xbin.c Version 2.3 09/30/85"; +@@ -15,7 +20,12 @@ static char version[] = "xbin.c Version #ifdef BSD
#include <sys/time.h>
@@ -37,7 +37,7 @@ Add missing includes. Fix build for OpenBSD 5.5. #define search_last rindex
extern char *rindex();
#else
-@@ -287,7 +297,7 @@ forge_info()
+@@ -287,10 +297,11 @@ forge_info()
int n;
long tdiff;
struct tm *tp;
@@ -46,7 +46,11 @@ Add missing includes. Fix build for OpenBSD 5.5. struct timeb tbuf;
#else
long bs;
-@@ -310,7 +320,7 @@ forge_info()
++ struct timezone tzone;
+ #endif
+
+ for (np = mh.m_name; *np; np++)
+@@ -310,7 +321,7 @@ forge_info()
put4(buf + H_RLENOFF, mh.m_rsrclen);
/* convert unix file time to mac time format */
@@ -55,12 +59,11 @@ Add missing includes. Fix build for OpenBSD 5.5. ftime(&tbuf);
tp = localtime(&tbuf.time);
tdiff = TIMEDIFF - tbuf.timezone * 60;
-@@ -320,7 +330,8 @@ forge_info()
+@@ -320,7 +331,7 @@ forge_info()
/* I hope this is right! -andy */
time(&bs);
tp = localtime(&bs);
- tdiff = TIMEDIFF - timezone;
-+ struct timezone tzone;
+ tdiff = TIMEDIFF - tzone.tz_minuteswest;
if (tp->tm_isdst)
tdiff += 60 * 60;
|