Add official patch mtools-3.9.7-20001213.diff.

Do not overwrite an existing mtools.conf file - install it as
mtools.conf.sample

7 files changed, 28 insertions, 43 deletions

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 52122391290c..ee88ba50cd0a 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -7,11 +7,15 @@
 
 PORTNAME=	mtools
 PORTVERSION=	3.9.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.tux.org/pub/knaff/mtools/  \
 		http://mtools.linux.lu/
 
+PATCH_SITES=	http://mtools.linux.lu/
+PATCHFILES=	mtools-3.9.7-20001213.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	jmz@FreeBSD.org
 
 GNU_CONFIGURE=	yes
@@ -38,7 +42,7 @@ post-install:
 	@#	mwrite has been removed by author, but we'll keep it just a bit longer
 	@${LN} -sf ${PREFIX}/bin/mtools ${PREFIX}/bin/mwrite
 	@${LN} -sf ${PREFIX}/man/man1/mcopy.1.gz ${PREFIX}/man/man1/mwrite.1.gz
-	@${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc
+	@${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc/mtools.conf.sample
 	@${ECHO} "Please verify ${PREFIX}/etc/mtools.conf for your machine."
 	@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
 
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index 74792f04b6fe..a0dfb325463c 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1 +1,2 @@
 MD5 (mtools-3.9.7.tar.gz) = 6be028b20b5f94e74107442d972efe22
+MD5 (mtools-3.9.7-20001213.diff.gz) = dd2fe2f08bf20f28c909eedc9be29c00
diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a
index d9d1dd9c72a3..ce39f677f370 100644
--- a/emulators/mtools/files/patch-a
+++ b/emulators/mtools/files/patch-a
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Thu Jan 28 11:08:18 1999
-+++ Makefile.in	Thu Jan 28 11:14:03 1999
-@@ -55,7 +55,7 @@
+--- Makefile.in~	Tue Mar  6 17:25:13 2001
++++ Makefile.in	Tue Mar  6 17:27:00 2001
+@@ -57,7 +57,7 @@
+ .SUFFIXES: .o .c
  .SUFFIXES: .o .c
- .SUFFIXES: .o .c .cpp
  
--MAN1 = floppyd.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
-+MAN1 = mattrib.1 mbadblocks.1 mcat.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 mpartition.1 \
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
++MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
+ mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 mkmanifest.1 \
+ mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
  mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
- MAN1EXT	= 1
-@@ -111,7 +111,7 @@
+@@ -116,7 +116,7 @@
  xdf_io.c mkmanifest.c
  
  
@@ -18,12 +18,12 @@
  
  LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdu mformat minfo mlabel \
  mmd mmount mmove mpartition mrd mread mren mtype mtoolstest mshowfat \
-@@ -228,11 +228,11 @@
+@@ -258,11 +258,11 @@
  install-scripts: $(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(bindir)
  	@for j in $(SCRIPTS) ; do \
 -		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+ 		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
++		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
  		echo $(bindir)/$$j ; \
  	done
 -	rm -f $(bindir)/lz
diff --git a/emulators/mtools/files/patch-d b/emulators/mtools/files/patch-d
deleted file mode 100644
index befefa4fbf1e..000000000000
--- a/emulators/mtools/files/patch-d
+++ /dev/null
@@ -1,11 +0,0 @@
---- mtools.5~	Mon May 17 14:42:34 1999
-+++ mtools.5	Mon May 17 14:48:20 1999
-@@ -18,7 +18,7 @@
- .SH Name
- mtools.conf - mtools configuration files
- .PP
--.SS Description
-+.SH Description
- .PP
- This manpage describes the configuration files for mtools. They 
- are called \fR\&\f(CW\(if/usr/local/usr/local/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If
diff --git a/emulators/mtools/files/patch-h b/emulators/mtools/files/patch-h
deleted file mode 100644
index 210da92312b8..000000000000
--- a/emulators/mtools/files/patch-h
+++ /dev/null
@@ -1,18 +0,0 @@
---- mformat.c~	Thu Jun  1 22:49:28 2000
-+++ mformat.c	Sun Nov 26 05:05:27 2000
-@@ -355,13 +355,13 @@
- 
- 	if ( Fs->num_clus > FAT12 && Fs->fat_bits == 12 ){
- 		fprintf(stderr,"Too many clusters for this fat size."
--			" Please choose a 16-bit fat in your /etc/mtools"
-+			" Please choose a 16-bit fat in your /etc/mtools.conf"
- 			" or .mtoolsrc file\n");
- 		exit(1);
- 	}
- 	if ( Fs->num_clus <= FAT12 && Fs->fat_bits > 12 ){
- 		fprintf(stderr,"Too few clusters for this fat size."
--			" Please choose a 12-bit fat in your /etc/mtools"
-+			" Please choose a 12-bit fat in your /etc/mtools.conf"
- 			" or .mtoolsrc file\n");
- 		exit(1);
- 	}
diff --git a/emulators/mtools/pkg-install b/emulators/mtools/pkg-install
new file mode 100644
index 000000000000..2837d17e01ac
--- /dev/null
+++ b/emulators/mtools/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ $2 != "POST-INSTALL" ]; then
+  exit 0
+fi
+if [ -e ${PKG_PREFIX}/etc/mtools.conf ]; then
+  echo "Will not overwrite existing ${PKG_PREFIX}/etc/mtools.conf file."
+else
+  cp -p ${PKG_PREFIX}/etc/mtools.conf.sample ${PKG_PREFIX}/etc/mtools.conf
+fi
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index 6e87eb8d00b9..095bc13e664a 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -32,6 +32,6 @@ bin/mzip
 @unexec install-info --delete %D/info/mtools.info %D/info/dir
 info/mtools.info
 @exec install-info %D/info/mtools.info %D/info/dir
-etc/mtools.conf
+etc/mtools.conf.sample
 @exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
 @unexec rm %D/man/man1/mwrite.1.gz