Update to 1.2, provided by Dieter Baron.

Changes: new sfv were not zero padded; handle ' ' and '_' the same in
insensitive matching.

9 files changed, 141 insertions, 139 deletions

diff --git a/misc/cksfv/Makefile b/misc/cksfv/Makefile
index 373fb4c7045..bd88971eb66 100644
--- a/misc/cksfv/Makefile
+++ b/misc/cksfv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:08:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/28 15:44:15 wiz Exp $
 #
 
-DISTNAME=	cksfv-1.1
+DISTNAME=	cksfv-1.2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.fodder.org/cksfv/
 
diff --git a/misc/cksfv/files/md5 b/misc/cksfv/files/md5
index b71f514a3b1..e04e88d375c 100644
--- a/misc/cksfv/files/md5
+++ b/misc/cksfv/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/08/13 22:03:07 wiz Exp $
+$NetBSD: md5,v 1.2 2001/02/28 15:44:15 wiz Exp $
 
-MD5 (cksfv-1.1.tar.gz) = e32e3fc05b99ce8ff06af57df3f16952
+MD5 (cksfv-1.2.tar.gz) = 48334f179319b7e24745463dfd859f02
diff --git a/misc/cksfv/files/patch-sum b/misc/cksfv/files/patch-sum
index c27a7f0be64..133412648e9 100644
--- a/misc/cksfv/files/patch-sum
+++ b/misc/cksfv/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/09/09 02:53:10 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2001/02/28 15:44:16 wiz Exp $
 
-MD5 (patch-aa) = 412d245c2e30f25e90ee18c4948c864a
-MD5 (patch-ac) = 3ba80a0d46fd5298fce62c7cc9ff1b73
-MD5 (patch-ad) = a9ff722715c4abdf2600feec9324eb37
-MD5 (patch-ae) = 1788e7929bfc7cab88d49d01612ee529
+MD5 (patch-aa) = a9fbee9b2a891cdea220d6e29b7f20e0
+MD5 (patch-ab) = 3d22473d5c471ed71ba72bd66382adfa
+MD5 (patch-ac) = 7d67d2d471f518833549d7336947c27f
+MD5 (patch-ad) = 1682c384ce4a63776c029aa792aa339f
diff --git a/misc/cksfv/patches/patch-aa b/misc/cksfv/patches/patch-aa
index 83017fc88a9..7584d518694 100644
--- a/misc/cksfv/patches/patch-aa
+++ b/misc/cksfv/patches/patch-aa
@@ -1,27 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/13 22:03:07 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/28 15:44:16 wiz Exp $
 
---- Makefile.orig	Thu Aug 10 22:06:59 2000
-+++ Makefile	Thu Aug 10 22:07:17 2000
-@@ -17,13 +17,13 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+--- Makefile.orig	Wed Feb 28 15:10:37 2001
++++ Makefile	Wed Feb 28 15:11:02 2001
+@@ -19,13 +19,13 @@
+ VERSION="1.2"
  
  all:
--	cd src && gmake
-+	cd src && ${MAKE}
+-	cd src && gmake VERSION=$(VERSION)
++	cd src && ${MAKE} VERSION=$(VERSION)
  
  install:
--	cd src && gmake install
-+	cd src && ${MAKE} install
+-	cd src && gmake VERSION=$(VERSION) install
++	cd src && ${MAKE} VERSION=$(VERSION) install
  
  dist:
 -	gmake clean
 +	${MAKE} clean
- 	rm -rf ~/cksfv-1.1 && \
- 	cp -r . ~/cksfv-1.1 && cd ~ && rm -rf cksfv-1.1/CVS \
- 	&& rm -rf cksfv-1.1/src/CVS && tar cf cksfv-1.1.tar cksfv-1.1 \
-@@ -38,4 +38,4 @@
+ 	rm -rf ~/cksfv-$(VERSION) \
+ 	&& cp -r . ~/cksfv-$(VERSION) && cd ~ && rm -rf cksfv-$(VERSION)/CVS \
+ 	&& rm -rf cksfv-$(VERSION)/src/CVS \
+@@ -55,4 +55,4 @@
  clean:
- 	rm -f *.o *~ *.core
- 	rm -f rpm/*.o rpm/*~ rpm/*.core
+ 	rm -f *.o *~ *.core core
+ 	rm -f rpm/*.o rpm/*~ rpm/*.core rpm/core
 -	cd src && gmake clean
 +	cd src && ${MAKE} clean
diff --git a/misc/cksfv/patches/patch-ab b/misc/cksfv/patches/patch-ab
new file mode 100644
index 00000000000..8eb2fa3e244
--- /dev/null
+++ b/misc/cksfv/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2001/02/28 15:44:16 wiz Exp $
+
+--- src/cksfv.c.orig	Fri Dec 29 01:34:33 2000
++++ src/cksfv.c	Wed Feb 28 15:11:46 2001
+@@ -21,7 +21,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-extern int  readsfv(char*, char*, int);
++extern int  readsfv(char*, char*, int, int, char **);
+ extern int  newsfv(char**);
+ extern void pusage();
+ 
+@@ -59,7 +59,7 @@
+   argv += optind;
+ 
+   if (rsfvflag == 1) {
+-    rval = readsfv(sfvfile, dir, nocase);
++    rval = readsfv(sfvfile, dir, nocase, argc, argv);
+   } else {
+     if (argc < 1) {
+       pusage();
diff --git a/misc/cksfv/patches/patch-ac b/misc/cksfv/patches/patch-ac
index e3f84e9d7d6..3b2c2b27e8a 100644
--- a/misc/cksfv/patches/patch-ac
+++ b/misc/cksfv/patches/patch-ac
@@ -1,22 +1,81 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/08/13 22:03:07 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/02/28 15:44:16 wiz Exp $
 
---- src/cksfv.c.orig	Thu Aug 10 22:54:48 2000
-+++ src/cksfv.c	Thu Aug 10 23:00:16 2000
-@@ -20,7 +20,7 @@
- #include <string.h>
- #include <unistd.h>
+--- src/readsfv.c.orig	Fri Dec 29 01:34:33 2000
++++ src/readsfv.c	Wed Feb 28 15:25:54 2001
+@@ -34,11 +34,12 @@
+ int find_file(char*, char*);
  
--extern int  readsfv(char*, char*, int);
-+extern int  readsfv(char*, char*, int, int, char **);
- extern int  newsfv(char**);
- extern void pusage();
+ extern int  quiet;
+-int readsfv(char *fn, char *dir, int nocase)
++int readsfv(char *fn, char *dir, int nocase, int argc, char **argv)
+ {
+   FILE          *fd;
+   char          buf[512], *end, filename[512], crc[9], path[256];
+   int           file, rval = 0;
++  int		i, check;
+   unsigned long len, val, sfvcrc;
+   
+   if (quiet == 0) {
+@@ -63,7 +64,7 @@
+     if (buf[0] != ';' && buf[0] != '\n' && buf[0] != '\r') { 
+       /* build filename and crc from the sfv file */
+       end = strrchr(buf, ' ');
+-      if (end == NULL) {
++      if (end == NULL || end-buf > 512-10) {
+         fprintf(stderr, "cksfv: %s: incorrect sfv file format\n", fn);
+         exit(1);
+       }
+@@ -71,7 +72,24 @@
+       *(end+9) = '\0';
+       strncpy(crc, ++end, 9);
+       strncpy(filename, buf, 512);
+-      sfvcrc = strtoul(crc, '\0', 16);
++      sfvcrc = strtoul(crc, NULL, 16);
++
++      if (argc) {
++        check = 0;
++        for (i=0; i<argc; i++) {
++          if (argv[i] == NULL)
++            continue;
++          if ((nocase == 1 && strcasecmp(argv[i], filename) == 0)
++              || (nocase == 0 && strcmp(argv[i], filename) == 0)) {
++            check = 1;
++            break;
++          }
++        }
++        if (check == 0)
++          continue;
++        else
++          argv[i] = NULL;
++      }
  
-@@ -58,7 +58,7 @@
-   argv += optind;
+       if (quiet == 0)
+         fprintf(stderr, "%-49s ", filename);
+@@ -120,6 +138,18 @@
+   }
+   fclose(fd);
  
-   if (rsfvflag == 1) {
--    rval = readsfv(sfvfile, dir, nocase);
-+    rval = readsfv(sfvfile, dir, nocase, argc, argv);
-   } else {
-     if (argc < 1) {
-       pusage();
++  if (argc) {
++    for (i=0; i<argc; i++) {
++      if (argv[i]) {
++        if (quiet == 0)
++          fprintf(stderr, "%-49s not found in sfv\n", argv[i]);
++	else
++	  fprintf(stderr, "cksfv: %s: not found in sfv\n", argv[i]);
++	rval = 1;
++      }
++    }
++  }
++
+   if (quiet == 0) {
+     if (rval == 0) {
+       printf("--------------------------------------------------------------------------------\nEverything OK\a\n");
+@@ -166,7 +196,7 @@
+       strcpy(filename, dirinfo->d_name);
+       
+   }
+-  rewinddir(dirp);
++  closedir(dirp);
+ 
+   
+   return 1;
diff --git a/misc/cksfv/patches/patch-ad b/misc/cksfv/patches/patch-ad
index 00a7dfbb881..f2f0eb5a265 100644
--- a/misc/cksfv/patches/patch-ad
+++ b/misc/cksfv/patches/patch-ad
@@ -1,79 +1,21 @@
-$NetBSD: patch-ad,v 1.2 2000/09/09 02:53:10 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2001/02/28 15:44:16 wiz Exp $
 
---- src/readsfv.c.orig	Mon May 22 23:57:05 2000
-+++ src/readsfv.c	Sat Sep  9 04:43:44 2000
-@@ -33,12 +33,13 @@
- 
- extern int  verbose;
- 
--int readsfv(char *fn, char *dir, int nocase)
-+int readsfv(char *fn, char *dir, int nocase, int argc, char **argv)
- {
-   FILE          *fd;
-   DIR           *dirp = NULL;
-   char          buf[512], *end, filename[512], crc[9], path[256];
-   int           file, rval = 0;
-+  int           i, check;
-   unsigned long len, val, sfvcrc;
-   struct dirent *dirinfo;
-   
-@@ -67,17 +68,35 @@
-   }
-   
-   while(fgets(buf, 512, fd)) {
--    if (buf[0] != ';') {                /* comment in the sfv file ignore */
-+    if (buf[0] != ';' && buf[0] != '\n') { /* comment or empty line, ignore */
-       /* build filename and crc from the sfv file */
-       end = strrchr(buf, ' ');
--      if (end == NULL) {
-+      if (end == NULL || end-buf > 512-10) {
-         fprintf(stderr, "cksfv: %s: incorrect sfv file format\n", fn);
-+	continue;
-       }
-       *end = '\0';
-       *(end+9) = '\0';
-       strncpy(crc, ++end, 9);
-       strncpy(filename, buf, 512);
--      sfvcrc = strtoul(crc, '\0', 16);
-+      sfvcrc = strtoul(crc, NULL, 16);
+--- README.orig	Fri Dec 29 01:34:33 2000
++++ README	Wed Feb 28 15:22:27 2001
+@@ -55,6 +55,16 @@
+         ------------------------------------------------------------
+         Everything OK
+         
++If you do not want to check all files liste in an .sfv file, name the
++files you want checked on the command line:
 +
-+      if (argc) {
-+	check = 0;
-+        for (i=0; i<argc; i++) {
-+	  if (argv[i] == NULL)
-+	    continue;
-+	  if ((nocase == 1 && strcasecmp(argv[i], filename) == 0)
-+	      || (nocase == 0 && strcmp(argv[i], filename) == 0)) {
-+	    check = 1;
-+	    break;
-+	  }
-+	}
-+	if (check == 0)
-+	  continue;
-+	else
-+	  argv[i] = NULL;
-+      }
- 
-       if (nocase == 1) {
-         len = strlen(filename);
-@@ -126,6 +145,20 @@
-     }
-   }
-   fclose(fd);
-+  if (nocase == 1)
-+    closedir(dirp);
++      $ cksfv -f new_files.sfv -i COPYING ChangeLog
++      --( Verifying file: new_files.sfv )-------------------------
++      COPYING:        OK
++      ChangeLog:      OK
++      ------------------------------------------------------------
++      Everything OK
 +
-+  if (argc) {
-+    for (i=0; i<argc; i++) {
-+      if (argv[i]) {
-+        if (verbose == 1)
-+          fprintf(stderr, "%-49s not found in sfv\n", argv[i]);
-+	else
-+	  fprintf(stderr, "cksfv: %s: not found in sfv\n", argv[i]);
-+	rval = 1;
-+      }
-+    }
-+  }
+ Now for creating your own .sfv files.  You can run the following command.
  
-   if (verbose == 1) {
-     if (rval == 0) {
+         $ cksfv * > mine.sfv
diff --git a/misc/cksfv/patches/patch-ae b/misc/cksfv/patches/patch-ae
deleted file mode 100644
index 1381657ab27..00000000000
--- a/misc/cksfv/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/08/13 22:03:08 wiz Exp $
-
---- README.orig	Sun Aug 13 23:33:33 2000
-+++ README	Sun Aug 13 23:36:07 2000
-@@ -48,6 +48,16 @@
-         ------------------------------------------------------------
-         Everything OK
-         
-+    If you do not want to check all files liste in an .sfv file, name the
-+    files you want checked on the command line:
-+
-+	$ cksfv -f new_files.sfv -i COPYING ChangeLog
-+	--( Verifying file: new_files.sfv )-------------------------
-+	COPYING:        OK
-+	ChangeLog:      OK
-+	------------------------------------------------------------
-+	Everything OK
-+
-     Now for creating your own .sfv files.  You can run the following command.
- 
-         $ cksfv * > mine.sfv
diff --git a/misc/cksfv/pkg/PLIST b/misc/cksfv/pkg/PLIST
index 532345c5f88..25bb733dd36 100644
--- a/misc/cksfv/pkg/PLIST
+++ b/misc/cksfv/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/13 22:03:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/28 15:44:16 wiz Exp $
 bin/cksfv
 share/doc/cksfv/README
 @dirrm share/doc/cksfv