Update unzip to 5.51, based on patch provided by Bruce J.A. Nourish in

PR pkg/25768.

New features:
5.51a (09 Mar 02):
 - no new features

5.51b (11 Jan 03):
 - TANDEM: new -r option to suppress extension merging [Dave Smith]
 - WinCE, new port in addition to pUnZip (GUI): command line tool usable for
    "batch" processes (not quite finished, needs "makefile" cleanup, tests,
    and refinements) [Simon Roberts, SPC]
 - SET_DIR_ATTRIB feature code revised and reorganized to allow seamless
    adaption to different OS environments; added support for restoring
    directory timestamps to the WIN32 port [Kai-Uwe-Rommel, SPC]

5.51c (13 May 03):
 - WinCE command line tool integration is (almost) finished: project file is
    cleaned up and works with VC-embedded 3.0; port needs testing... [SPC]

5.51d (27 Feb 04):
 - Cygwin is recognized as a target in the Unix port
    [Charles Wilson, Cosmin Truta, SPC]
 - remove support for quoting characters from all ports; this feature was a
    security hole [SPC]

5.51e (01 Mar 04):
 - Win32 port (list.c, unzpriv.h, win32.c, w32cfg.h): the date in (non-ZipInfo)
    listings is displayed using the separator given by the system's locale,
    when available [Cosmin Truta]

See History.551 in distfile for complete bug fix history.

4 files changed, 16 insertions, 24 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 714c58e4755..819c0e21a53 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,17 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2004/04/22 04:02:24 tv Exp $
+# $NetBSD: Makefile,v 1.49 2004/06/01 04:31:42 minskim Exp $
 
-DISTNAME=	unzip550
-PKGNAME=	unzip-5.50
-PKGREVISION=	2
+DISTNAME=	unzip551
+PKGNAME=	unzip-5.51
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
-		ftp://ftp.icce.rug.nl/infozip/src/ \
-		ftp://uiarchive.cso.uiuc.edu/pub/packages/zip/src/ \
-		ftp://ftp.fu-berlin.de/unix/tools/archivers/unzip/
-
-PATCH_SITES=		http://security.debian.org/pool/updates/main/u/unzip/
-PATCHFILES=		unzip_5.50-1woody2.diff.gz
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.info-zip.org/pub/infozip/UnZip.html
diff --git a/archivers/unzip/distinfo b/archivers/unzip/distinfo
index c8cee104880..e3bb7c19a53 100644
--- a/archivers/unzip/distinfo
+++ b/archivers/unzip/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/01/22 12:25:59 grant Exp $
+$NetBSD: distinfo,v 1.10 2004/06/01 04:31:42 minskim Exp $
 
-SHA1 (unzip550.tar.gz) = 51034a8098eddc8facb4db9ea1a935e813dbdb73
-Size (unzip550.tar.gz) = 1068662 bytes
-SHA1 (unzip_5.50-1woody2.diff.gz) = 2988b7954203f9e192e2cdbf590673c6ba986296
-Size (unzip_5.50-1woody2.diff.gz) = 5049 bytes
-SHA1 (patch-aa) = a90ed5bb96f5b1c1be4ef5ddc952edb364fa7a05
+SHA1 (unzip551.tar.gz) = 4643ca31419cfb34c9de8a182aabebd79662ba04
+Size (unzip551.tar.gz) = 1112594 bytes
+SHA1 (patch-aa) = de66b7b5c45904167e8596ce5235d957c2df4d2a
 SHA1 (patch-ab) = dd426fdf4b774bd73f4ee46da470ffa3c2cf6513
diff --git a/archivers/unzip/patches/patch-aa b/archivers/unzip/patches/patch-aa
index e190c7b6cce..59eb58a0891 100644
--- a/archivers/unzip/patches/patch-aa
+++ b/archivers/unzip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1998/12/30 04:06:35 tv Exp $
+$NetBSD: patch-aa,v 1.4 2004/06/01 04:31:42 minskim Exp $
 
---- unzip.h.orig	Sat Oct 18 18:58:07 1997
-+++ unzip.h	Sat Jun 20 18:33:18 1998
-@@ -175,10 +175,15 @@
+--- unzip.h.orig	2004-05-22 20:04:23.000000000 -0500
++++ unzip.h
+@@ -258,11 +258,16 @@ freely, subject to the following restric
  #endif
  
  /* used to remove arguments in function prototypes for non-ANSI C */
@@ -14,7 +14,8 @@ $NetBSD: patch-aa,v 1.3 1998/12/30 04:06:35 tv Exp $
  #  define OF(a) a
  #else
  #  define OF(a) ()
-+#endif
  #endif
++#endif
  
  /* enable the "const" keyword only if MODERN and if not otherwise instructed */
+ #ifdef MODERN
diff --git a/doc/CHANGES b/doc/CHANGES
index f822653c4dc..fc0a00925ab 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6081 2004/05/31 19:01:51 heinz Exp $
+$NetBSD: CHANGES,v 1.6082 2004/06/01 04:31:40 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2711,3 +2711,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated pcb-current to 20040530 [dmcmahill 2004-05-31]
 	Updated gail to 1.6.5 [recht 2004-05-31]
 	Updated spamassassin to 2.63nb2 [heinz 2004-05-31]
+	Updated unzip to 5.51 [minskim 2004-06-01]