Upgrade to 3.9, and portlint.

8 files changed, 109 insertions, 117 deletions

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 09e9d4f04ff7..8d4dfaf52765 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,38 +3,33 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.18 1997/12/24 01:21:25 alex Exp $
+# $Id: Makefile,v 1.19 1998/01/21 08:57:15 obrien Exp $
 #
 
-DISTNAME=	mtools-3.8
+DISTNAME=	mtools-3.9
 CATEGORIES=	emulators
-MASTER_SITES=   ftp://linux.wauug.org/pub/knaff/mtools/ \
-                ftp://sunsite.unc.edu/pub/Linux/utils/disk-management/
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	mtools-3.8-1611.diff.gz
+MASTER_SITES=	ftp://linux.wauug.org/pub/knaff/mtools/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-PATCH_DIST_STRIP=	-p1
-HAS_CONFIGURE=  yes
-CONFIGURE_ARGS= --enable-xdf --prefix=${PREFIX}
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-xdf --prefix=${PREFIX}
 
 USE_GMAKE=	yes
 
 MAN1=		mattrib.1 mbadblocks.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 \
 		mdir.1 mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 \
-		mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1 \
-		mzip.1
+		mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 \
+		mzip.1 mpartition.1
 MAN5=		mtools.5
 
 post-patch:
 	@cd ${WRKSRC}; for f in config.c mtools.5 mtools.texi; do \
-	 mv $$f $$f.orig; \
-	 sed -e s:/etc/mtools.conf:${PREFIX}/etc/mtools.conf: \
+	 ${MV} $$f $$f.orig; \
+	 ${SED} -e s:/etc/mtools.conf:${PREFIX}/etc/mtools.conf: \
 	 < $$f.orig > $$f; done
 	@cd ${WRKSRC}/scripts; for f in ocopy xcopy; do \
-	 if [ ! -f $$f -a -f $$f.orig ]; then cp -p $$f.orig $$f ; fi \
+	 if [ ! -f $$f -a -f $$f.orig ]; then ${CP} -p $$f.orig $$f ; fi \
 	 done
 
 post-install:
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index bdcfaabefba7..717c0c2e275d 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1,2 +1 @@
-MD5 (mtools-3.8.tar.gz) = 837176ae3ef9ba3ab0aff6833dfa60b6
-MD5 (mtools-3.8-1611.diff.gz) = c44f15782f3a9371774856dfbd1ee421
+MD5 (mtools-3.9.tar.gz) = db6ff3db9751a1285f3ce75c9b81f0b8
diff --git a/emulators/mtools/files/patch-2 b/emulators/mtools/files/patch-2
index a02de070f53c..5b9c864466a8 100644
--- a/emulators/mtools/files/patch-2
+++ b/emulators/mtools/files/patch-2
@@ -1,8 +1,14 @@
---- mtools.conf.orig	Tue Apr 29 19:08:20 1997
-+++ mtools.conf	Sun Sep 28 00:45:54 1997
-@@ -1,17 +1,71 @@
--drive a: file="/dev/fd0" exclusive
--drive b: file="/dev/fd1" exclusive
+--- mtools.conf.orig	Sun Jan  4 17:29:32 1998
++++ mtools.conf	Wed May  6 21:56:43 1998
+@@ -1,22 +1,74 @@
+ # Example mtools.conf files.  Uncomment the lines which correspond to
+ # your architecture and comment out the "SAMPLE FILE" line below
+-SAMPLE FILE
++#SAMPLE FILE
+ 
+-# # Linux floppy drives
+-# drive a: file="/dev/fd0" exclusive
+-# drive b: file="/dev/fd1" exclusive
 +# A note on permissions:  a user must have read and write permissions for the
 +# devices named here in order to access the DOS file systems.  You might give
 +# ALL USERS access to ALL FLOPPY DISKS via the command
@@ -26,10 +32,17 @@
 +#
 +# The mformat command could also be used to build the DOS file system
 +# in place of mkdosfs.
+ 
+-# # First SCSI hard disk partition
+-# drive c: file="/dev/sda1"
 +drive a: file="/dev/rfd0"
 +drive b: file="/dev/rfd1"
-+
-+
+ 
+-# # First IDE hard disk partition
+-# drive c: file="/dev/hda1"
+ 
+-# # dosemu floppy image
+-# drive m: file="/var/lib/dosemu/diskimage"
 +# Drive T: is a 1.72M floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
@@ -41,12 +54,7 @@
 +#
 +# The above note on access permissions applies to /dev/rfd0.1720 as well.
 +drive t: file="/dev/rfd0.1720"
- 
--# First SCSI hard disk partition
--drive c: file="/dev/sda1"
- 
--# First IDE hard disk partition
--#drive c: file="/dev/hda1"
++ 
 +# Drive S: is a 720K floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
@@ -57,12 +65,7 @@
 +#   [3] then use mcopy/mdir etc. in the usual way.
 +#
 +drive s: file="/dev/rfd0.720"
- 
--#dosemu floppy image
--drive m: file="/var/lib/dosemu/diskimage"
- 
--#dosemu hdimage
--drive n: file="/var/lib/dosemu/diskimage" offset=3840
++ 
 +# SCSI hard disks
 +#  first disk (sd0) slice 1 (s1)
 +#drive c: file="/dev/rsd0s1"
@@ -76,16 +79,25 @@
 +#drive d: file="/dev/rwd1s1"
 +#  first disk on the second IDE interface (wd2) slice 1 (s1)
 +drive d: file="/dev/rwd2s1"
-+
+ 
+-# # dosemu hdimage
+-# drive n: file="/var/lib/dosemu/diskimage" offset=3840
 +# PCEMU floppy boot image
 +drive p: file="/usr/local/lib/pcemu/DriveA"
  
  # # Atari ramdisk image
  # drive o: file="/tmp/atari_rd" offset=136
-@@ -39,20 +93,6 @@
+@@ -37,28 +89,11 @@
+ #          A/UX target 5 on 1st scsi bus   jaz or zip
+ # drive X: file="/dev/rdsk/c105d0s31"      partition=4
+ 
+-
+ # Some examples for BeOS.
+ # floppy drive. hardcoded in devices.c, so no real need to define it here
+ #drive a: file="/dev/floppy_disk" exclusive
  # ZIP drive on SCSI ID 6
  #drive z: file="/dev/scsi_disk_060" offset=16384 fat_bits=16                        
- 
+-
 -# SCO Unix 3.2v4
 -# # Floppy disk drives
 -#
@@ -101,6 +113,7 @@
 -# drive g: file="/dev/dsk/0sG"
 -# drive h: file="/dev/dsk/0sH"
 -
- mtools_lower_case=1
-+
- 
+ # # uncomment the following line to display all file names in lower
+ # # case by default
+-# mtools_lower_case=1
++mtools_lower_case=1
diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a
index 9482e23199f5..d34f8800fff5 100644
--- a/emulators/mtools/files/patch-a
+++ b/emulators/mtools/files/patch-a
@@ -1,36 +1,26 @@
-*** Makefile.in.orig	Thu Feb 20 18:54:20 1997
---- Makefile.in	Thu Apr  3 04:16:37 1997
-***************
-*** 98,104 ****
-  streamcache.c subdir.c toupper.c tty.o vfat.c xdf_io.c mkmanifest.c
-  
-  
-! SCRIPTS = mcheck mxtar uz tgz xcopy mcomp
-  
-  LINKS=mattrib mcd mcopy mdel mdeltree mdir mformat minfo mlabel \
-  mmd mmount mmove mpartition mrd mread mren mtype mwrite mtoolstest \
---- 98,104 ----
-  streamcache.c subdir.c toupper.c tty.o vfat.c xdf_io.c mkmanifest.c
-  
-  
-! SCRIPTS = mcheck mxtar xcopy mcomp
-  
-  LINKS=mattrib mcd mcopy mdel mdeltree mdir mformat minfo mlabel \
-  mmd mmount mmove mpartition mrd mread mren mtype mwrite mtoolstest \
-***************
-*** 195,201 ****
-  install-scripts: $(bindir)/mtools
-  	@$(top_srcdir)/mkinstalldirs $(bindir)
-  	@for j in $(SCRIPTS) ; do \
-! 		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-  		echo $(bindir)/$$j ; \
-  	done
-  	rm -f $(bindir)/lz
---- 195,201 ----
-  install-scripts: $(bindir)/mtools
-  	@$(top_srcdir)/mkinstalldirs $(bindir)
-  	@for j in $(SCRIPTS) ; do \
-! 		install -o bin -g bin -m 755 $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-  		echo $(bindir)/$$j ; \
-  	done
-  	rm -f $(bindir)/lz
+--- Makefile.in.orig	Wed May  6 21:57:14 1998
++++ Makefile.in	Wed May  6 21:59:13 1998
+@@ -102,7 +102,7 @@
+ xdf_io.c mkmanifest.c
+ 
+ 
+-SCRIPTS = mcheck mxtar uz tgz mcomp
++SCRIPTS = mcheck mxtar mcomp
+ 
+ LINKS=mattrib mcd mcopy mdel mdeltree mdir mdu mformat minfo mlabel \
+ mmd mmount mmove mpartition mrd mread mren mtype mtoolstest mshowfat \
+@@ -200,11 +200,11 @@
+ install-scripts: $(bindir)/mtools
+ 	@$(top_srcdir)/mkinstalldirs $(bindir)
+ 	@for j in $(SCRIPTS) ; do \
+-		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
++		install -o bin -g bin -m 755 $(srcdir)/scripts/$$j $(bindir)/$$j ; \
+ 		echo $(bindir)/$$j ; \
+ 	done
+-	rm -f $(bindir)/lz
+-	$(LN_S) uz $(bindir)/lz
++#	rm -f $(bindir)/lz
++#	$(LN_S) uz $(bindir)/lz
+ 
+ install-man:
+ 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
diff --git a/emulators/mtools/files/patch-b b/emulators/mtools/files/patch-b
index 93e7e6022ecc..20eb0ba86364 100644
--- a/emulators/mtools/files/patch-b
+++ b/emulators/mtools/files/patch-b
@@ -1,15 +1,13 @@
-*** file.c~	Fri Apr  4 22:08:01 1997
---- file.c	Fri Apr 18 04:51:07 1997
-***************
-*** 201,208 ****
---- 201,210 ----
-  #ifdef HAVE_TZSET
-  	{
-  #ifndef OS_ultrix
-+ #ifndef __FreeBSD__
-  		/* Ultrix defines this to be a different type */
-  		extern long timezone;
-+ #endif
-  #endif
-  		tzset();
-  		tzone = (long) timezone;
+--- file.c.orig	Wed May  6 21:59:40 1998
++++ file.c	Wed May  6 22:00:24 1998
+@@ -295,8 +295,10 @@
+ #ifdef HAVE_TZSET
+ 	{
+ #ifndef OS_ultrix
++#ifndef __FreeBSD__
+ 		/* Ultrix defines this to be a different type */
+ 		extern long timezone;
++#endif
+ #endif
+ 		tzset();
+ 		tzone = (long) timezone;
diff --git a/emulators/mtools/files/patch-d b/emulators/mtools/files/patch-d
index 6649c0e28c26..44501fc16a8c 100644
--- a/emulators/mtools/files/patch-d
+++ b/emulators/mtools/files/patch-d
@@ -1,11 +1,11 @@
---- configure.38-1611	Wed Jan 21 00:15:20 1998
-+++ configure	Wed Jan 21 00:19:56 1998
-@@ -2067,7 +2067,7 @@
- fi
- 
- echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6
--test $cf_cv_dcl_sys_errlist = no && cat >> confdefs.h <<\EOF
-+test $cf_cv_dcl_sys_errlist = no || cat >> confdefs.h <<\EOF
- #define DECL_SYS_ERRLIST 1
- EOF
- 
+--- configure.orig	Mon Dec 29 23:10:02 1997
++++ configure	Wed May  6 22:09:37 1998
+@@ -2108,7 +2108,7 @@
+ 	    CFLAGS="$CFLAGS -ZP"
+ 	    MACHDEPLIBS="-lposix -UTIL"
+     fi	
+-    CFLAGS="$CFLAGS -O4 $Wall"
++    CFLAGS="$CFLAGS $Wall"
+ else
+     if [ $host_os3 = hpux ] ; then
+ 	    CPPFLAGS="$CPPFLAGS -Ae"
diff --git a/emulators/mtools/pkg-descr b/emulators/mtools/pkg-descr
index f120e491e04c..f5a5c37d9a1a 100644
--- a/emulators/mtools/pkg-descr
+++ b/emulators/mtools/pkg-descr
@@ -20,7 +20,6 @@ mrd             RD/RMDIR        remove an MSDOS subdirectory
 mread           COPY            low level read (copy) an MSDOS file to Unix
 mren            REN/RENAME      rename an existing MSDOS file
 mtype           TYPE            display contents of an MSDOS file
-mwrite          COPY            low level write (copy) a Unix file to MSDOS
 
 You should be able to just close your eyes and pretend you're on an MSDOS
 system.  Everything should work the same... except for the added 'm' at
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index e8de120cabe1..0c6bc187225e 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -1,10 +1,12 @@
 bin/mtools
 @exec ln -fs %D/%F %B/mattrib
+@exec ln -fs %D/%F %B/mbadblocks
 @exec ln -fs %D/%F %B/mcd
 @exec ln -fs %D/%F %B/mcopy
 @exec ln -fs %D/%F %B/mdel
 @exec ln -fs %D/%F %B/mdeltree
 @exec ln -fs %D/%F %B/mdir
+@exec ln -fs %D/%F %B/mdu
 @exec ln -fs %D/%F %B/mformat
 @exec ln -fs %D/%F %B/minfo
 @exec ln -fs %D/%F %B/mlabel
@@ -15,17 +17,18 @@ bin/mtools
 @exec ln -fs %D/%F %B/mrd
 @exec ln -fs %D/%F %B/mread
 @exec ln -fs %D/%F %B/mren
-@exec ln -fs %D/%F %B/mtype
-@exec ln -fs %D/%F %B/mwrite
+@exec ln -fs %D/%F %B/mshowfat
 @exec ln -fs %D/%F %B/mtoolstest
-@exec ln -fs %D/%F %B/mbadblocks
+@exec ln -fs %D/%F %B/mtype
 @exec ln -fs %D/%F %B/mzip
 @unexec rm %B/mattrib
+@unexec rm %B/mbadblocks
 @unexec rm %B/mcd
 @unexec rm %B/mcopy
 @unexec rm %B/mdel
 @unexec rm %B/mdeltree
 @unexec rm %B/mdir
+@unexec rm %B/mdu
 @unexec rm %B/mformat
 @unexec rm %B/minfo
 @unexec rm %B/mlabel
@@ -36,19 +39,14 @@ bin/mtools
 @unexec rm %B/mrd
 @unexec rm %B/mread
 @unexec rm %B/mren
-@unexec rm %B/mtype
-@unexec rm %B/mwrite
+@unexec rm %B/mshowfat
 @unexec rm %B/mtoolstest
-@unexec rm %B/mbadblocks
+@unexec rm %B/mtype
 @unexec rm %B/mzip
 bin/mcheck
+bin/mcomp
 bin/mkmanifest
 bin/mxtar
-bin/xcopy
-bin/mcomp
-bin/lz
-bin/mdu
-bin/mshowfat
 @unexec install-info --delete %D/info/mtools.info %D/info/dir
 info/mtools.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -68,6 +66,7 @@ man/man1/mlabel.1.gz
 man/man1/mmd.1.gz
 man/man1/mmount.1.gz
 man/man1/mmove.1.gz
+man/man1/mpartition.1.gz
 man/man1/mrd.1.gz
 man/man1/mread.1.gz
 man/man1/mren.1.gz
@@ -75,6 +74,5 @@ man/man1/mshowfat.1.gz
 man/man1/mtoolstest.1.gz
 man/man1/mtools.1.gz
 man/man1/mtype.1.gz
-man/man1/mwrite.1.gz
 man/man1/mzip.1.gz
 man/man5/mtools.5.gz