Break patch into multiple patches.

Fix install target to work.
Minor LP64 cleanup. (fix lack of needed headers)

4 files changed, 77 insertions, 67 deletions

diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 5feb416a111..1dd0add16a9 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/11/12 15:22:56 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/12/26 15:46:10 garbled Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/12 02:17:38 obrien Exp 
 #
 
@@ -13,6 +13,6 @@ MAINTAINER=     packages@netbsd.org
 WRKSRC=		${WRKDIR}/unarj
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} ${DISTNAME} ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unarj/patches/patch-aa b/archivers/unarj/patches/patch-aa
index 938161cd5ec..120cd9bba05 100644
--- a/archivers/unarj/patches/patch-aa
+++ b/archivers/unarj/patches/patch-aa
@@ -1,68 +1,3 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:35:50 agc Exp $
-
-*** Makefile.old	Wed Jul 17 22:02:20 1991
---- Makefile	Wed Dec 28 04:39:21 1994
-***************
-*** 1,5 ****
-! 
-! CC=cc 
-  
-  all:	      unarj
-  
---- 1,4 ----
-! CFLAGS+=-DUNIX
-  
-  all:	      unarj
-  
---- environ.c.orig	Wed Jun 23 06:07:20 1993
-+++ environ.c	Wed Jan 21 14:59:59 1998
-@@ -435,10 +435,14 @@
- #define time_t long
- #endif
- 
-+#include <sys/param.h>
-+
-+#if !(defined(BSD) && BSD >= 199306)
- extern struct tm *localtime();
- extern time_t time();
- extern char   *strcpy();
- extern voidp  *malloc();
-+#endif
- 
- FILE *
- file_open(name, mode)
-@@ -534,8 +538,12 @@
- }
- 
- long
--gettz()         /* returns the offset from GMT in seconds */
-+gettz(stamp)         /* returns the offset from GMT in seconds */
-+time_t stamp;
- {
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+	return -localtime(&stamp)->tm_gmtoff;
-+#else
- #define NOONOFFSET    43200L
- #define SEC_IN_DAY    (24L * 60L * 60L)
- #define INV_VALUE     (SEC_IN_DAY + 1L)
-@@ -551,6 +559,7 @@
-     noontm = localtime(&noon);
-     retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
-     return retval;
-+#endif
- }
- 
- long
-@@ -608,7 +617,8 @@
-     (uint) attribute;
-     (uint) host;
- 
--    m_time = mstonix(tstamp) + gettz();
-+    m_time = mstonix(tstamp);
-+    m_time += gettz(m_time);
- 
-     tb.mtime = m_time;                  /* Set modification time */
-     tb.atime = m_time;                  /* Set access time */
 --- unarj.h.orig	Wed Jun 23 06:07:20 1993
 +++ unarj.h	Wed Jan 21 15:03:39 1998
 @@ -104,9 +104,13 @@
diff --git a/archivers/unarj/patches/patch-ab b/archivers/unarj/patches/patch-ab
new file mode 100644
index 00000000000..7e802c89f41
--- /dev/null
+++ b/archivers/unarj/patches/patch-ab
@@ -0,0 +1,14 @@
+*** Makefile.old	Wed Jul 17 22:02:20 1991
+--- Makefile	Wed Dec 28 04:39:21 1994
+***************
+*** 1,5 ****
+! 
+! CC=cc 
+  
+  all:	      unarj
+  
+--- 1,4 ----
+! CFLAGS+=-DUNIX
+  
+  all:	      unarj
+  
diff --git a/archivers/unarj/patches/patch-ac b/archivers/unarj/patches/patch-ac
new file mode 100644
index 00000000000..4f75211e513
--- /dev/null
+++ b/archivers/unarj/patches/patch-ac
@@ -0,0 +1,61 @@
+--- environ.c.orig	Tue Jun 22 22:07:20 1993
++++ environ.c	Sat Dec 26 08:39:07 1998
+@@ -429,16 +429,23 @@
+ 
+ #define SUBS_DEFINED
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <time.h>
++#include <sys/types.h>
+ 
+-#ifndef time_t
+-#define time_t long
+-#endif
++/*#ifndef time_t
++ #define time_t long
++ #endif*/
++
++#include <sys/param.h>
+ 
++#if !(defined(BSD) && BSD >= 199306)
+ extern struct tm *localtime();
+ extern time_t time();
+ extern char   *strcpy();
+ extern voidp  *malloc();
++#endif
+ 
+ FILE *
+ file_open(name, mode)
+@@ -534,8 +541,12 @@
+ }
+ 
+ long
+-gettz()         /* returns the offset from GMT in seconds */
++gettz(stamp)         /* returns the offset from GMT in seconds */
++time_t stamp;
+ {
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++	return -localtime(&stamp)->tm_gmtoff;
++#else
+ #define NOONOFFSET    43200L
+ #define SEC_IN_DAY    (24L * 60L * 60L)
+ #define INV_VALUE     (SEC_IN_DAY + 1L)
+@@ -551,6 +562,7 @@
+     noontm = localtime(&noon);
+     retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
+     return retval;
++#endif
+ }
+ 
+ long
+@@ -608,7 +620,8 @@
+     (uint) attribute;
+     (uint) host;
+ 
+-    m_time = mstonix(tstamp) + gettz();
++    m_time = mstonix(tstamp);
++    m_time += gettz(m_time);
+ 
+     tb.mtime = m_time;                  /* Set modification time */
+     tb.atime = m_time;                  /* Set access time */