Upgrade to version 3.3

6 files changed, 90 insertions, 10 deletions

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 9a721258d2d1..54d432425a28 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    mtools
-# Version required:     3.0
+# Version required:     3.3
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.11 1996/11/18 10:23:04 asami Exp $
+# $Id: Makefile,v 1.12 1996/12/21 07:27:17 ache Exp $
 #
 
-DISTNAME=	mtools-3.0
+DISTNAME=	mtools-3.3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GNU}
 
@@ -14,9 +14,12 @@ MAINTAINER=	jmz@FreeBSD.org
 
 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 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 \
-		mrd.1 mread.1 mren.1 mttest.1 mtools.1 mtype.1 mwrite.1
+		mrd.1 mread.1 mren.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1
 MAN5=		mtools.5
 
 post-patch:
@@ -24,7 +27,6 @@ post-patch:
 	 mv $$f $$f.orig; \
 	 sed -e s:/etc/mtools.conf:${PREFIX}/etc/mtools.conf: \
 	 < $$f.orig > $$f; done
-	@cd ${WRKSRC}; mv mtest.1 mttest.1
 
 post-install:
 	@install -c ${WRKSRC}/mtools.conf ${PREFIX}/etc
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index cc6c766d3cad..0800ead41ae3 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1 +1 @@
-MD5 (mtools-3.0.tar.gz) = 8c03f45a5e5533cc563ba735761d6271
+MD5 (mtools-3.3.tar.gz) = 52cfe355bb72e38112b5691ac7fff2b8
diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a
new file mode 100644
index 000000000000..710db0cac0b7
--- /dev/null
+++ b/emulators/mtools/files/patch-a
@@ -0,0 +1,36 @@
+*** Makefile.in.orig	Thu Feb 20 18:54:20 1997
+--- Makefile.in	Thu Apr  3 04:16:37 1997
+***************
+*** 96,102 ****
+  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 \
+--- 96,102 ----
+  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 \
+***************
+*** 187,193 ****
+  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
+--- 187,193 ----
+  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
diff --git a/emulators/mtools/files/patch-b b/emulators/mtools/files/patch-b
new file mode 100644
index 000000000000..831f20119d1e
--- /dev/null
+++ b/emulators/mtools/files/patch-b
@@ -0,0 +1,19 @@
+*** devices.c~	Mon Feb 17 18:57:19 1997
+--- devices.c	Fri Feb 28 15:55:38 1997
+***************
+*** 626,632 ****
+  struct device devices[] = {
+  	{"/dev/rfd0.1440", 'A', HD312},
+  	{"/dev/rfd1.1200", 'B', HD514},
+! 	+    {"/dev/sd0s1",    'C', GENHD},
+  };
+  #define INIT_NOOP
+  #endif /* __FreeBSD__ */
+--- 626,632 ----
+  struct device devices[] = {
+  	{"/dev/rfd0.1440", 'A', HD312},
+  	{"/dev/rfd1.1200", 'B', HD514},
+! 	{"/dev/sd0s1",    'C', GENHD},
+  };
+  #define INIT_NOOP
+  #endif /* __FreeBSD__ */
diff --git a/emulators/mtools/files/patch-c b/emulators/mtools/files/patch-c
new file mode 100644
index 000000000000..d0a0e5c333ca
--- /dev/null
+++ b/emulators/mtools/files/patch-c
@@ -0,0 +1,15 @@
+*** sysincludes.h~	Tue Feb 11 18:19:17 1997
+--- sysincludes.h	Fri Feb 28 15:50:01 1997
+***************
+*** 108,117 ****
+  
+  #include <errno.h>
+  extern int errno;
+- #ifndef netbsd
+- /* NetBSD seems to choke on this, due to a slightly non-standard definition */
+- extern char *sys_errlist[];
+- #endif
+  #include <pwd.h>
+  
+  /* On AIX, we have to prefer strings.h, as string.h lacks a prototype 
+--- 108,113 ----
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index 6b2a7c278e80..245e9e3ad1e9 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -6,16 +6,20 @@ bin/mtools
 @exec ln -fs %D/%F %B/mdeltree
 @exec ln -fs %D/%F %B/mdir
 @exec ln -fs %D/%F %B/mformat
+@exec ln -fs %D/%F %B/minfo
 @exec ln -fs %D/%F %B/mlabel
 @exec ln -fs %D/%F %B/mmd
 @exec ln -fs %D/%F %B/mmount
 @exec ln -fs %D/%F %B/mmove
+@exec ln -fs %D/%F %B/mpartition
 @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/mttest
+@exec ln -fs %D/%F %B/mtoolstest
+@exec ln -fs %D/%F %B/mbadblocks
+@exec ln -fs %D/%F %B/mzip
 @unexec rm %B/mattrib
 @unexec rm %B/mcd
 @unexec rm %B/mcopy
@@ -23,18 +27,22 @@ bin/mtools
 @unexec rm %B/mdeltree
 @unexec rm %B/mdir
 @unexec rm %B/mformat
+@unexec rm %B/minfo
 @unexec rm %B/mlabel
 @unexec rm %B/mmd
 @unexec rm %B/mmount
 @unexec rm %B/mmove
+@unexec rm %B/mpartition
 @unexec rm %B/mrd
 @unexec rm %B/mread
 @unexec rm %B/mren
 @unexec rm %B/mtype
 @unexec rm %B/mwrite
-@unexec rm %B/mttest
-bin/mkmanifest
+@unexec rm %B/mtoolstest
+@unexec rm %B/mbadblocks
+@unexec rm %B/mzip
 bin/mcheck
+bin/mkmanifest
 bin/mxtar
 bin/xcopy
 bin/mcomp
@@ -56,7 +64,7 @@ man/man1/mmove.1.gz
 man/man1/mrd.1.gz
 man/man1/mread.1.gz
 man/man1/mren.1.gz
-man/man1/mttest.1.gz
+man/man1/mtoolstest.1.gz
 man/man1/mtools.1.gz
 man/man1/mtype.1.gz
 man/man1/mwrite.1.gz