Changes 2.1:

* Added -L compression level option
* minor portability fixes
* fixed a bug that could cause some files to not be able to be uncompressed

4 files changed, 23 insertions, 31 deletions

diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile
index d61489ac38b..6ac79e54825 100644
--- a/archivers/rzip/Makefile
+++ b/archivers/rzip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/10/23 17:55:44 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/14 20:58:18 adam Exp $
 
-DISTNAME=	rzip-2.0
-PKGREVISION=	1
+DISTNAME=	rzip-2.1
 CATEGORIES=	archivers
 MASTER_SITES=	http://rzip.samba.org/ftp/rzip/
 
@@ -9,7 +8,7 @@ MAINTAINER=	carton@Ivy.NET
 HOMEPAGE=	http://rzip.samba.org/
 COMMENT=	Create or extract .rz files, like gzip but smaller
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 
 post-install:
 	${LN} -f ${PREFIX}/bin/rzip ${PREFIX}/bin/runzip
diff --git a/archivers/rzip/distinfo b/archivers/rzip/distinfo
index d68eb62a28e..ca8f6baad61 100644
--- a/archivers/rzip/distinfo
+++ b/archivers/rzip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/10/23 17:53:01 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/02/14 20:58:18 adam Exp $
 
-SHA1 (rzip-2.0.tar.gz) = 65d3d95689d14a6fb3b7c805768bf34868de5c17
-RMD160 (rzip-2.0.tar.gz) = a3bc1bb5afe9025ec53cc03bf5f55d65728c0529
-Size (rzip-2.0.tar.gz) = 42699 bytes
-SHA1 (patch-aa) = efa046e26d01dc5d38cb4648119e8cd2ad91ea41
-SHA1 (patch-ab) = b00a141d6b4ca6fb970eae3783a84c2fb7f8cc36
+SHA1 (rzip-2.1.tar.gz) = efeafc7a5bdd7daa0cea8d797ff21aa28bdfc8d9
+RMD160 (rzip-2.1.tar.gz) = 7ef5299cd526c8c49a779e050ad515a53180c1c5
+Size (rzip-2.1.tar.gz) = 46785 bytes
+SHA1 (patch-aa) = 10c4726d04ef8cea8f1e0e009d19db3178b3caa2
+SHA1 (patch-ab) = 0e68db21e8d605c6ba52cf2e6d8b70805a2635ab
 SHA1 (patch-ac) = 17ce38121ea20b705c7aa19fa8103dd184597df0
diff --git a/archivers/rzip/patches/patch-aa b/archivers/rzip/patches/patch-aa
index 6f47ed7bb82..d3f252ea878 100644
--- a/archivers/rzip/patches/patch-aa
+++ b/archivers/rzip/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/29 15:29:04 recht Exp $
+$NetBSD: patch-aa,v 1.2 2006/02/14 20:58:18 adam Exp $
 
---- main.c.orig	Thu Aug 26 23:31:21 2004
-+++ main.c	Thu Aug 26 23:35:52 2004
+--- main.c.orig	2006-02-14 01:38:23.000000000 +0100
++++ main.c
 @@ -18,6 +18,7 @@
  /* rzip compression - main program */
  
@@ -10,19 +10,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/29 15:29:04 recht Exp $
  
  static void usage(void)
  {
-@@ -138,9 +139,14 @@
- 			fatal("%s: unknown suffix\n", control->infile);
- 		}
- 		
--		control->outfile = strndup(control->infile, 
-+		control->outfile = malloc(strlen(control->infile) - 
-+					strlen(control->suffix) + 1);
-+		assert(control->outfile);
-+		strncpy(control->outfile, control->infile, 
- 					   strlen(control->infile) - 
- 					   strlen(control->suffix));
-+		*(control->outfile + strlen(control->infile) - 
-+				strlen(control->suffix)) = '\0';
- 	}
- 
- 	fd_in = open(control->infile,O_RDONLY);
diff --git a/archivers/rzip/patches/patch-ab b/archivers/rzip/patches/patch-ab
index 3c2694ea36e..a889597371e 100644
--- a/archivers/rzip/patches/patch-ab
+++ b/archivers/rzip/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/11/23 06:42:22 tv Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/14 20:58:18 adam Exp $
 
---- Makefile.in.orig	Tue Nov 23 01:39:56 2004
+--- Makefile.in.orig	2006-02-14 01:38:23.000000000 +0100
 +++ Makefile.in
 @@ -9,6 +9,7 @@ INSTALL_MAN=$(prefix)/man
  LIBS=@LIBS@
@@ -10,3 +10,12 @@ $NetBSD: patch-ab,v 1.1 2004/11/23 06:42:22 tv Exp $
  
  INSTALLCMD=@INSTALL@
  
+@@ -37,7 +38,7 @@ install: all
+ 	${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
+ 
+ rzip: $(OBJS)
+-	$(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rzip $(OBJS) $(LIBS)
+ 
+ rzip.1: rzip.yo
+ 	yodl2man -o rzip.1 rzip.yo