Update to 2.43, clean up.

4 files changed, 16 insertions, 42 deletions

diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 1dd0add16a9..eaa2be35b76 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,18 +1,13 @@
-# $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 
-#
+# $NetBSD: Makefile,v 1.7 1999/05/22 22:07:03 tv Exp $
 
-DISTNAME=       unarj241
-PKGNAME=	unarj-2.41
+DISTNAME=       unarj-2.43
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://garbo.uwasa.fi/unix/arcers/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     packages@netbsd.org
 
-WRKSRC=		${WRKDIR}/unarj
-
 do-install:
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unarj/files/md5 b/archivers/unarj/files/md5
index fb3568157a8..4a97e5e12a8 100644
--- a/archivers/unarj/files/md5
+++ b/archivers/unarj/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:16:52 agc Exp $
+$NetBSD: md5,v 1.3 1999/05/22 22:07:03 tv Exp $
 
-MD5 (unarj241.tar.Z) = 19d0849fa336847a49206778f1c61953
+MD5 (unarj-2.43.tgz) = 5240b3c376a3ecac692246c9c482d8c7
diff --git a/archivers/unarj/patches/patch-ab b/archivers/unarj/patches/patch-ab
deleted file mode 100644
index df2b524276d..00000000000
--- a/archivers/unarj/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/02/10 14:53:34 frueauf 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
-  
diff --git a/archivers/unarj/patches/patch-ac b/archivers/unarj/patches/patch-ac
index 13e64120657..ceaaff1a302 100644
--- a/archivers/unarj/patches/patch-ac
+++ b/archivers/unarj/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/02/10 14:53:34 frueauf Exp $
+$NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
 
---- environ.c.orig	Tue Jun 22 22:07:20 1993
-+++ environ.c	Sat Dec 26 08:39:07 1998
-@@ -429,16 +429,23 @@
+--- environ.c.orig	Mon Sep 29 06:00:24 1997
++++ environ.c	Sat May 22 18:03:52 1999
+@@ -430,16 +430,17 @@
  
  #define SUBS_DEFINED
  
@@ -14,13 +14,8 @@ $NetBSD: patch-ac,v 1.2 1999/02/10 14:53:34 frueauf Exp $
 -#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)
+-
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  extern struct tm *localtime();
  extern time_t time();
  extern char   *strcpy();
@@ -29,7 +24,7 @@ $NetBSD: patch-ac,v 1.2 1999/02/10 14:53:34 frueauf Exp $
  
  FILE *
  file_open(name, mode)
-@@ -534,8 +541,12 @@
+@@ -535,8 +536,12 @@
  }
  
  long
@@ -43,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 1999/02/10 14:53:34 frueauf Exp $
  #define NOONOFFSET    43200L
  #define SEC_IN_DAY    (24L * 60L * 60L)
  #define INV_VALUE     (SEC_IN_DAY + 1L)
-@@ -551,6 +562,7 @@
+@@ -552,6 +557,7 @@
      noontm = localtime(&noon);
      retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
      return retval;
@@ -51,7 +46,7 @@ $NetBSD: patch-ac,v 1.2 1999/02/10 14:53:34 frueauf Exp $
  }
  
  long
-@@ -608,7 +620,8 @@
+@@ -609,7 +615,8 @@
      (uint) attribute;
      (uint) host;