update to release 3.9.7 dist. patch 20000623. bump NEED_VERSION.

clean a bit.

sysutils/mtools/Makefile

@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.28 2000/06/11 01:31:24 fgsch Exp $
+# $OpenBSD: Makefile,v 1.29 2000/06/30 05:42:55 fgsch Exp $
 
-DATE=		20000520
-DISTNAME=	mtools-3.9.6
-PKGNAME=	mtools-3.9.6.${DATE}
+DATE=		20000623
+DISTNAME=	mtools-3.9.7
+PKGNAME=	mtools-3.9.7.${DATE}
 CATEGORIES=	sysutils
-NEED_VERSION=	1.301
+NEED_VERSION=	1.309
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
 
-PATCHFILES=	mtools-3.9.6-${DATE}.diff.gz
+PATCHFILES=	mtools-3.9.7-${DATE}.diff.gz
 
 MAINTAINER=	fgsch@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -19,8 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_GMAKE=		Yes
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
+CONFIGURE_STYLE=	gnu dest
 SEPARATE_BUILD=	Simple
 
 pre-patch:

sysutils/mtools/files/md5

@@ -1,6 +1,6 @@
-MD5 (mtools-3.9.6-20000520.diff.gz) = 9539685778f9fe658476d42aa2c41e43
-MD5 (mtools-3.9.6.tar.gz) = 458415bec45b404d4a7517a95253a99c
-RMD160 (mtools-3.9.6-20000520.diff.gz) = 42ce3d05d5cf4d5be69d9ad66dc51abdc5ceccb1
-RMD160 (mtools-3.9.6.tar.gz) = 537775690f5acb3f20d69aba90b9f513bec4748e
-SHA1 (mtools-3.9.6-20000520.diff.gz) = 297e4ba21587705aa46b61eae5aa417c7f966788
-SHA1 (mtools-3.9.6.tar.gz) = 15474b234c9b1b14db7946009fd25d4ae3947ff9
+MD5 (mtools-3.9.7-20000623.diff.gz) = 2c86ae68fadb2495ce3f847715a949c8
+MD5 (mtools-3.9.7.tar.gz) = 6be028b20b5f94e74107442d972efe22
+RMD160 (mtools-3.9.7-20000623.diff.gz) = 3f644d84ec7716409c56634b7ef0c55dcaaf1232
+RMD160 (mtools-3.9.7.tar.gz) = 5de0d1a7c94f325e6c9203d36abf44cbb4a1b7ab
+SHA1 (mtools-3.9.7-20000623.diff.gz) = 10e72c97a83dba4792d601aa1f8c01a9c198b30b
+SHA1 (mtools-3.9.7.tar.gz) = b54f8a7041854edb5c17b116b3d77e4d088aedfb

sysutils/mtools/patches/patch-ab

@@ -0,0 +1,37 @@
+--- mdir.c.orig	Sun May 28 07:20:44 2000
++++ mdir.c	Fri Jun 30 00:07:27 2000
+@@ -209,7 +209,7 @@
+ 	if(!filesInDir)
+ 		printf("No files\n");
+ 	else {		
+-		char *s1;
++		char *s1 = NULL;
+ 		printf("      %3d file", files);
+ 		if(files == 1)
+ 			putchar(' ');
+@@ -230,13 +230,13 @@
+ 		return;
+ 	leaveDirectory(haveError);
+ 	if(!concise && !haveError) {
+-		char *s1;
+ 
+ 		if(dirsOnDrive > 1) {
+ 			printf("\nTotal files listed:\n");
+ 			printSummary(filesOnDrive, bytesOnDrive);
+ 		}
+ 		if(RootDir && !fast) {
++			char *s1 = NULL;
+ 			mt_off_t bytes = getfree(RootDir);
+ 			printf("                  %s bytes free\n\n",
+ 			       dotted_num(bytes,17, &s1));
+@@ -246,9 +246,9 @@
+ 			printf("                  %s bytes free\n\n",
+ 			       dotted_num(bytes,17, &s1));
+ #endif
+-		}
+ 		if(s1)
+ 			free(s1);
++		}
+ 	}
+ 	FREE(&RootDir);
+ 	currentDrive = '\0';

sysutils/mtools/pkg/PLIST

@@ -1,8 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/06/11 01:31:24 fgsch Exp $
-bin/mtools
+@comment $OpenBSD: PLIST,v 1.4 2000/06/30 05:42:55 fgsch Exp $
+@unexec install-info --delete --info-dir=%D/info %D/info/mtools.info
+bin/floppyd
+bin/floppyd_installtest
+bin/lz
 bin/mattrib
+bin/mbadblocks
 bin/mcat
 bin/mcd
+bin/mcheck
+bin/mcomp
 bin/mcopy
 bin/mdel
 bin/mdeltree
@@ -10,6 +16,7 @@ bin/mdir
 bin/mdu
 bin/mformat
 bin/minfo
+bin/mkmanifest
 bin/mlabel
 bin/mmd
 bin/mmount
@@ -18,23 +25,15 @@ bin/mpartition
 bin/mrd
 bin/mread
 bin/mren
-bin/mtype
-bin/mtoolstest
 bin/mshowfat
-bin/mbadblocks
-bin/mzip
-bin/mkmanifest
-bin/floppyd
-bin/floppyd_installtest
-bin/mcheck
+bin/mtools
+bin/mtoolstest
+bin/mtype
 bin/mxtar
-bin/uz
+bin/mzip
 bin/tgz
-bin/mcomp
-bin/lz
-@unexec install-info --delete %D/info/mtools.info %D/info/dir
+bin/uz
 info/mtools.info
-@exec install-info %D/info/mtools.info %D/info/dir
 man/man1/floppyd.1
 man/man1/mattrib.1
 man/man1/mbadblocks.1
@@ -56,8 +55,9 @@ man/man1/mrd.1
 man/man1/mread.1
 man/man1/mren.1
 man/man1/mshowfat.1
-man/man1/mtoolstest.1
 man/man1/mtools.1
+man/man1/mtoolstest.1
 man/man1/mtype.1
 man/man1/mzip.1
 man/man5/mtools.5
+@exec install-info --info-dir=%D/info %D/info/mtools.info