summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2015-08-11 18:07:55 +0000
committerwiz <wiz@pkgsrc.org>2015-08-11 18:07:55 +0000
commit72eb59ff2b1e8cfe672412c5acec2eda1024a368 (patch)
treeafcb95b758f30b54b0bdf7024bafac21b54c6fe2 /archivers
parent1f93e8dc5066f23d6400cc44f595aac3ed17c96e (diff)
downloadpkgsrc-72eb59ff2b1e8cfe672412c5acec2eda1024a368.tar.gz
Improve local patch so this builds with PKGSRC_USE_FORT.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/unarj/distinfo4
-rw-r--r--archivers/unarj/patches/patch-ac28
2 files changed, 15 insertions, 17 deletions
diff --git a/archivers/unarj/distinfo b/archivers/unarj/distinfo
index 12ed9661f27..b32e6881f0a 100644
--- a/archivers/unarj/distinfo
+++ b/archivers/unarj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2014/06/26 20:12:43 asau Exp $
+$NetBSD: distinfo,v 1.7 2015/08/11 18:07:55 wiz Exp $
SHA1 (unarj-2.65.tar.gz) = 56843e95e6b6ac7577dfdfbfee5af166b5e2c74f
RMD160 (unarj-2.65.tar.gz) = 59984fc428d1fc99aa3e18485f82e9ee45a801ba
Size (unarj-2.65.tar.gz) = 74911 bytes
SHA1 (patch-aa) = e64a69fc4f91ba69fc642e6d742a0cc36cfddbb0
SHA1 (patch-ab) = 15216bc07298ce0956bfbadfaae763622ee88a0c
-SHA1 (patch-ac) = 59245f61d731e2fd6dc101fefe0f62db0c55b55e
+SHA1 (patch-ac) = d3fb016de598f21aefb795259f2a65a9bc65811c
SHA1 (patch-ad) = 46c469ade1a20da7e3ac633652e4ec926ba2b08f
diff --git a/archivers/unarj/patches/patch-ac b/archivers/unarj/patches/patch-ac
index ceaaff1a302..17df9ef878c 100644
--- a/archivers/unarj/patches/patch-ac
+++ b/archivers/unarj/patches/patch-ac
@@ -1,30 +1,28 @@
-$NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
+$NetBSD: patch-ac,v 1.4 2015/08/11 18:07:55 wiz Exp $
---- environ.c.orig Mon Sep 29 06:00:24 1997
-+++ environ.c Sat May 22 18:03:52 1999
-@@ -430,16 +430,17 @@
+--- environ.c.orig 2002-06-05 10:28:06.000000000 +0000
++++ environ.c
+@@ -430,16 +430,10 @@ uint host;
#define SUBS_DEFINED
+#include <stdlib.h>
+#include <string.h>
#include <time.h>
-+#include <sys/types.h>
-
+-
-#ifndef time_t
-#define time_t long
-#endif
-
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- extern struct tm *localtime();
- extern time_t time();
- extern char *strcpy();
- extern voidp *malloc();
-+#endif
+-extern struct tm *localtime();
+-extern time_t time();
+-extern char *strcpy();
+-extern voidp *malloc();
++#include <sys/types.h>
FILE *
file_open(name, mode)
-@@ -535,8 +536,12 @@
+@@ -535,8 +529,12 @@ uint mode;
}
long
@@ -38,7 +36,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
#define NOONOFFSET 43200L
#define SEC_IN_DAY (24L * 60L * 60L)
#define INV_VALUE (SEC_IN_DAY + 1L)
-@@ -552,6 +557,7 @@
+@@ -552,6 +550,7 @@ gettz() /* returns the offset fr
noontm = localtime(&noon);
retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
return retval;
@@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
}
long
-@@ -609,7 +615,8 @@
+@@ -609,7 +608,8 @@ uint host;
(uint) attribute;
(uint) host;