Update to 2.50, clean up a bit.

4 files changed, 37 insertions, 83 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 43e706e7504..402611726d7 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:18 frueauf Exp $
-# FreeBSD Id: Makefile,v 1.10 1997/08/10 22:31:33 fenner Exp 
-#
+# $NetBSD: Makefile,v 1.6 1999/05/22 21:41:44 tv Exp $
 
-DISTNAME=       unrar-2.01
+DISTNAME=	unrar-2.50
 CATEGORIES=	archivers
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/arcers/
-EXTRACT_SUFX=   .tgz
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
-MAINTAINER=     packages@netbsd.org
+MAINTAINER=	packages@netbsd.org
 
-NO_WRKSUBDIR=   Yes
+NO_WRKSUBDIR=
 
 do-build:
-	cd ${WRKSRC} && \
-		${CC} ${CFLAGS} -D_UNIX unrar.c -o unrar
+	cd ${WRKSRC} && ${LINK.c} -o unrar -D_UNIX unrar.c
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unrar
diff --git a/archivers/unrar/files/md5 b/archivers/unrar/files/md5
index e1ec7ecc097..7aeabccc3b1 100644
--- a/archivers/unrar/files/md5
+++ b/archivers/unrar/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 21:41:44 tv Exp $
 
-MD5 (unrar-2.01.tgz) = ba30fc400cd97b987b1076889c1736ef
+MD5 (unrar-2.50.tar.gz) = ac92453b6e1c3bd1d0a8fb36b1eb371f
diff --git a/archivers/unrar/patches/patch-aa b/archivers/unrar/patches/patch-aa
index 17090836c74..c12ed4cba90 100644
--- a/archivers/unrar/patches/patch-aa
+++ b/archivers/unrar/patches/patch-aa
@@ -1,47 +1,30 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:51 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/05/22 21:41:44 tv Exp $
 
-*** smallfn.c.bak	Mon May 19 23:58:11 1997
---- smallfn.c	Tue May 20 00:19:28 1997
-***************
-*** 92,99 ****
-        }
-        if (Choice==4)
-        {
-          mprintf(MAskNewName);
-!         gets(Name);
-          continue;
-        }
-        if (Choice==5)
---- 92,103 ----
-        }
-        if (Choice==4)
-        {
-+ 	char *s;
-          mprintf(MAskNewName);
-! 	*Name = '\0';
-! 	fgets(Name, NM, stdin);
-! 	if ((s = strchr(Name, '\n')) != NULL)
-! 		*s = '\0';
-          continue;
-        }
-        if (Choice==5)
-***************
-*** 110,116 ****
-  int GetKey(void)
-  {
-    char Str[80];
-!   gets(Str);
-    return(Str[0]);
-  }
-  
---- 114,123 ----
-  int GetKey(void)
-  {
-    char Str[80];
-!   *Str = '\0';
-!   fgets(Str, 80, stdin);
-!   if (*Str == '\n')
-! 	*Str = '\0';
-    return(Str[0]);
-  }
-  
+--- smallfn.c.orig	Sat Apr 17 10:53:02 1999
++++ smallfn.c	Sat May 22 17:38:30 1999
+@@ -92,8 +92,12 @@
+       }
+       if (Choice==4)
+       {
++	char *s;
+         mprintf(MAskNewName);
+-        gets(Name);
++	*Name = '\0';
++	fgets(Name, NM, stdin);
++	if ((s = strchr(Name, '\n')) != NULL)
++		*s = '\0';
+         continue;
+       }
+       if (Choice==5)
+@@ -110,7 +114,10 @@
+ int GetKey(void)
+ {
+   char Str[80];
+-  gets(Str);
++  *Str = '\0';
++  fgets(Str, 80, stdin);
++  if (*Str == '\n')
++	*Str = '\0';
+   return(Str[0]);
+ }
+ 
diff --git a/archivers/unrar/patches/patch-ab b/archivers/unrar/patches/patch-ab
deleted file mode 100644
index 3db71f0a95c..00000000000
--- a/archivers/unrar/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:35:51 agc Exp $
-
-*** os.c.bak	Mon May 19 23:58:11 1997
---- os.c	Tue May 20 00:22:57 1997
-***************
-*** 67,73 ****
-  
-  void GetPswStr(char *Str)
-  {
-!   gets(Str);
-  }
-  
-  
---- 67,77 ----
-  
-  void GetPswStr(char *Str)
-  {
-!   char *s;
-!   *Str = '\0';
-!   fgets(Str, 128, stdin);
-!   if ((s = strchr(Str, '\n')) != NULL)
-! 	*s = '\0';
-  }
-  
-