Update to 1.3.3:

2005-03-04  Heikki Orsila
	* version 1.3.3
	- lots of changes. see previous changelog entries.

2005-03-04  Heikki Orsila
        - configure script now ignore unknown arguments (but gives a warning)
	- configure allows setting mandir and compiler. Examples:
	  --mandir=/usr/man
	  --compiler=/opt/experimental/gcc-4/bin/gcc
	- fixed wording in man file (Thomas Klausner)
	- -b option: print only basenames of the given files when creating
	  an sfv.

2005-03-03  Heikki Orsila
	- fixed O_LARGEFILE for macosx
	- Thomas Klausner submitted partial sfv checking patch by Dieter Baron.
	  Now cksfv -f foo.sfv [FILE1 FILE2 ...] checks only given FILES.
	- Thomas Klausner submitted patch by Tobias Nygren
	  to avoid calculating CRC twice per
	  file (read once, compute twice).

2005-02-03  Heikki Orsila
        * version 1.3.2
        - solaris printf workaround. use %lu tu print filesizes. works
	  best on 64-bit architectures (with compilers assuming sizeof(long)
	  == sizeof(size_t)). GNU/Linux support %zu which is the appropriate
	  modifier for this case, but can't have it everywhere.
	- doesn't print directory infos into catalogues when creating sfvs
	- see other modifications since 1.3.1 (many of them)

2005-01-26  Heikki Orsila
	- fixed output (displayed only 32-bit file sizes, and months wrong)
	  OLD:
	  ;    100663296  14:54.37 2005-00-25 zeros
	  NEW:
	  ;   4395630592  14:54.37 2005-01-25 zeros
	- lots of code cleanups
	- solaris fixes

2005-01-25  Heikki Orsila
	* no new version
        - Added and edited man page from Debian distribution
	- Fixed Makefile issues for -jx
	- Added a simple configure script for more consistent compilation
	- Removed b0rken rpm creation from Makefile
	- Removed spam messages (when creating and verifying checksums)
	- Added test cases (make tests)
	- added fake and lousy stdint.h generation (OS that don't have it
	  should be upgraded)

2005-01-24  Heikki Orsila
        * no new version
	- I decided to start maintaining the program since Bryan Call is
	  unreachable.

2004-05-25  Heikki Orsila
        * version 1.3.1
	- Fixed 64-bit issues. Went into Gentoo portage.

10 files changed, 18 insertions, 236 deletions

diff --git a/misc/cksfv/Makefile b/misc/cksfv/Makefile
index f74ab55811a..c16e58c5ae7 100644
--- a/misc/cksfv/Makefile
+++ b/misc/cksfv/Makefile
@@ -1,18 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 11:48:31 dillo Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/05 00:45:49 wiz Exp $
 #
 
-DISTNAME=	cksfv-1.3
-PKGREVISION=	1
+DISTNAME=	cksfv-1.3.3
 CATEGORIES=	misc
-MASTER_SITES=	http://www.fodder.org/cksfv/
+MASTER_SITES=	http://www.modeemi.fi/~shd/foss/cksfv/files/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	dillo@NetBSD.org
-HOMEPAGE=	http://www.fodder.org/cksfv/
+HOMEPAGE=	http://www.modeemi.fi/~shd/foss/cksfv/
 COMMENT=	Check and create simple file verification (SFV) listings
 
-do-install:
-	@ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cksfv
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cksfv
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/cksfv ${PREFIX}/bin
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/man
+CONFIGURE_ARGS+=	--compiler=${CC:Q}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cksfv
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cksfv
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/cksfv/PLIST b/misc/cksfv/PLIST
index 41263f0f5dc..128577a1175 100644
--- a/misc/cksfv/PLIST
+++ b/misc/cksfv/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/05 00:45:49 wiz Exp $
 bin/cksfv
+man/man1/cksfv.1
 share/doc/cksfv/README
 @dirrm share/doc/cksfv
diff --git a/misc/cksfv/distinfo b/misc/cksfv/distinfo
index 6b6eb6c619f..1d7af77be7d 100644
--- a/misc/cksfv/distinfo
+++ b/misc/cksfv/distinfo
@@ -1,11 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/07/16 23:40:54 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2005/02/05 00:45:49 wiz Exp $
 
-SHA1 (cksfv-1.3.tar.gz) = be8a2adff70a3787b367cf01f247014113bfc646
-Size (cksfv-1.3.tar.gz) = 14925 bytes
-SHA1 (patch-aa) = 41e2755168de7b1b07fbba22f48a8bab3220ecd6
-SHA1 (patch-ab) = e532c68c27518374de69f247f0b82160d11c7f08
-SHA1 (patch-ac) = 4048202c1e2baf8f01cd237e7c16368a0a8d1773
-SHA1 (patch-ad) = 99294fce6cdecbe7c256eaef90bc0e3c66096153
-SHA1 (patch-ae) = dd36480ccebd825a74554906ca075a82af304cd1
-SHA1 (patch-af) = c16ee21d0d45a89d3ae2dac6d647a43cba4671c1
-SHA1 (patch-ag) = 97cfdaef84f41349a96a0d5afd2f2b3b4a722cf7
+SHA1 (cksfv-1.3.3.tar.bz2) = a1e6aa4fd59ddc03aca3a9192d9d28bc59c35471
+Size (cksfv-1.3.3.tar.bz2) = 18266 bytes
diff --git a/misc/cksfv/patches/patch-aa b/misc/cksfv/patches/patch-aa
deleted file mode 100644
index 0a0667e4098..00000000000
--- a/misc/cksfv/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/01/31 22:17:42 dillo Exp $
-
---- Makefile.orig	Fri Jul  6 08:33:08 2001
-+++ Makefile
-@@ -20,13 +20,13 @@
- WEBSITE=/var/www/html/cksfv/
- 
- all:
--	cd src && gmake VERSION=$(VERSION)
-+	cd src && ${MAKE} VERSION=$(VERSION)
- 
- install:
--	cd src && gmake VERSION=$(VERSION) install
-+	cd src && ${MAKE} VERSION=$(VERSION) install
- 
- dist:
--	gmake clean
-+	${MAKE} clean
- 	rm -rf ~/cksfv-$(VERSION) \
- 	&& cp -r . ~/cksfv-$(VERSION) && cd ~ && rm -rf cksfv-$(VERSION)/CVS \
- 	&& rm -rf cksfv-$(VERSION)/src/CVS \
-@@ -57,4 +57,4 @@
- clean:
- 	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
deleted file mode 100644
index 363fc46dcfb..00000000000
--- a/misc/cksfv/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/31 22:17:42 dillo Exp $
-
---- src/cksfv.c.orig	Fri Jul  6 08:33:08 2001
-+++ src/cksfv.c
-@@ -22,7 +22,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--extern int  readsfv(char*, char*, int);
-+extern int  readsfv(char*, char*, int, int, char **);
- extern int  newsfv(char**);
- extern void pusage();
- 
-@@ -60,7 +60,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
deleted file mode 100644
index 3b2c2b27e8a..00000000000
--- a/misc/cksfv/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/02/28 15:44:16 wiz Exp $
-
---- 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  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;
-+      }
- 
-       if (quiet == 0)
-         fprintf(stderr, "%-49s ", filename);
-@@ -120,6 +138,18 @@
-   }
-   fclose(fd);
- 
-+  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
deleted file mode 100644
index f2f0eb5a265..00000000000
--- a/misc/cksfv/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/02/28 15:44:16 wiz Exp $
-
---- 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:
-+
-+      $ 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/patches/patch-ae b/misc/cksfv/patches/patch-ae
deleted file mode 100644
index 56dd7910d60..00000000000
--- a/misc/cksfv/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/09/22 09:11:32 wiz Exp $
-
---- src/print.c.orig	Fri Jul  6 08:33:08 2001
-+++ src/print.c
-@@ -33,7 +33,7 @@ void pnsfv_head()
-   timeinfo = localtime(&clock);
-   printf("; Generated by cksfv v%s on ", VERSION);
-   printf("%02d-%02d-%02d at %02d:%02d.%02d\n", timeinfo->tm_year+1900,
--         timeinfo->tm_mon, timeinfo->tm_mday, timeinfo->tm_hour,
-+         timeinfo->tm_mon+1, timeinfo->tm_mday, timeinfo->tm_hour,
-          timeinfo->tm_min, timeinfo->tm_sec);
-   printf("; Written by Bryan Call <bc@fodder.org> ");
-   printf("- http://www.fodder.org/cksfv\n");
-@@ -54,7 +54,7 @@ void pfileinfo(char **argv)
-       printf(";%13d  %02d:%02d.%02d %02d-%02d-%02d %s\n",
-              (int)sb.st_size, timeinfo->tm_hour, timeinfo->tm_min,
-              timeinfo->tm_sec,
--             timeinfo->tm_year+1900, timeinfo->tm_mon, timeinfo->tm_mday, fn);
-+             timeinfo->tm_year+1900, timeinfo->tm_mon+1, timeinfo->tm_mday, fn);
-     }
-   }
- }
diff --git a/misc/cksfv/patches/patch-af b/misc/cksfv/patches/patch-af
deleted file mode 100644
index 26312e85ad6..00000000000
--- a/misc/cksfv/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/09/22 12:23:21 wiz Exp $
-
---- src/Makefile.orig	Fri Jul  6 07:33:08 2001
-+++ src/Makefile	Mon Sep 22 11:42:14 2003
-@@ -17,11 +17,11 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- PROG=		cksfv
--CFLAGS+=	-Wall -Werror -O2 -g
-+#CFLAGS+=	-Wall -Werror -O2 -g
- SRCS=		cksfv.c print.c crc32.c readsfv.c newsfv.c
- 
- cksfv: $(SRCS)
--	gcc -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(SRCS)
-+	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(SRCS)
- 
- install: cksfv
- 	cp $(PROG) /usr/local/bin
-
diff --git a/misc/cksfv/patches/patch-ag b/misc/cksfv/patches/patch-ag
deleted file mode 100644
index bd945bdabff..00000000000
--- a/misc/cksfv/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/07/16 23:40:54 xtraeme Exp $
-
---- src/crc32.c.orig	2001-07-06 08:33:08.000000000 +0200
-+++ src/crc32.c
-@@ -95,17 +95,16 @@ int crc32(register int fd, unsigned long
- {
-   char                  buf[BUFFERSIZE], *p;
-   int                   len = 0, nr;
--  unsigned long         crc = ~0, crc32_total = ~0;
-+  unsigned long         crc = 0xffffffff;
- 	
-   while ((nr = read(fd, buf, sizeof(buf))) > 0)
-     for (len += nr, p = buf; nr--; ++p) {
-       crc = (crc >> 8) ^ crctable[(crc ^ *p) & 0xff];
--      crc32_total = (crc >> 8) ^ crctable[(crc32_total ^ *p) & 0xff];
-     }
-   if (nr < 0)
-     return 1;
- 
-   *main_len = len;
--  *main_val = ~crc;
-+  *main_val = (~crc)&0xffffffff;
-   return 0;
- }