update to mtools 4.0.18

sysutils/mtools/Makefile

@@ -1,41 +1,37 @@
-# $OpenBSD: Makefile,v 1.57 2013/03/11 11:41:31 espie Exp $
+# $OpenBSD: Makefile,v 1.58 2013/11/06 15:06:53 sthen Exp $
 
 COMMENT=	read/write/list/format DOS disks under Unix
+DISTNAME=	mtools-4.0.18
 
-DATE=		20050317
-DISTNAME=	mtools-3.9.10
-PKGNAME=	${DISTNAME}.${DATE}
-REVISION =	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/ \
-		${HOMEPAGE}
-
-PATCHFILES=	${DISTNAME}-${DATE}.diff.gz
 
 HOMEPAGE=	http://mtools.linux.lu/
 
+# GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c
+
+WANTLIB += c
+
+MASTER_SITES=	${MASTER_SITE_GNU:=mtools/}
 
 USE_GMAKE=		Yes
 
-CONFIGURE_STYLE=	gnu dest
+CONFIGURE_STYLE=	gnu
 SEPARATE_BUILD=		Yes
-USE_GROFF =	Yes
 
 FLAVORS=	no_x11
 FLAVOR?=
 
+FAKE_FLAGS=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
 .if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS=		--with-x=no
 .else
-WANTLIB+=		ICE SM X11 Xau pthread-stubs xcb
+WANTLIB+=		X11 Xau
 .endif
 
-pre-patch:
-	@ln -s . ${WRKSRC}/mtools
-
-post-patch:
-	@rm ${WRKSRC}/mtools
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mtools/
+	${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/share/examples/mtools/
 
 .include <bsd.port.mk>

sysutils/mtools/distinfo

@@ -1,10 +1,2 @@
-MD5 (mtools-3.9.10-20050317.diff.gz) = 0joTylGygLvCQdx20oWLIg==
-MD5 (mtools-3.9.10.tar.gz) = GbwfBunFhluK0gsd3ZdvXw==
-RMD160 (mtools-3.9.10-20050317.diff.gz) = YNmA6wH5L/1eJkPMEeoLwK9HkOg=
-RMD160 (mtools-3.9.10.tar.gz) = X3AafP6hRrhn7VcOSr6p8Lf/aL8=
-SHA1 (mtools-3.9.10-20050317.diff.gz) = TCHuVvcaPbZyGEtPDfchbJcw15I=
-SHA1 (mtools-3.9.10.tar.gz) = GZL9Ng3Bu5cX2gKKo9OvsXSIvNE=
-SHA256 (mtools-3.9.10-20050317.diff.gz) = OG8mK5/Jp/xIoYqxxR9mfiymQESomWoHXjh8PBSe8n0=
-SHA256 (mtools-3.9.10.tar.gz) = iNMhOlyWE7yZJufJaN8cNQMmbS6eiqLD2lvRjWc2E9Y=
-SIZE (mtools-3.9.10-20050317.diff.gz) = 2670
-SIZE (mtools-3.9.10.tar.gz) = 387208
+SHA256 (mtools-4.0.18.tar.gz) = MNQI0Dm0ztzQT7+CTImw/4Xcu29x8T0tjWWrs/WMrMM=
+SIZE (mtools-4.0.18.tar.gz) = 530710

sysutils/mtools/patches/patch-Makefile_in

@@ -1,52 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2003/05/26 02:02:08 fgsch Exp $
---- Makefile.in.orig	Sun Feb 16 18:55:16 2003
-+++ Makefile.in	Sun May 25 22:26:02 2003
-@@ -26,7 +26,7 @@ top_srcdir=@top_srcdir@
- srcdir=@srcdir@
- VPATH=@srcdir@
- 
--prefix      = @prefix@
-+prefix      = ${PREFIX}
- exec_prefix = @exec_prefix@
- bindir      = @bindir@
- infodir     = @infodir@
-@@ -47,10 +47,11 @@ SHLIB       = @SHLIB@
- MACHDEPLIBS = @MACHDEPLIBS@	
- LN_S        = @LN_S@
- 
--INSTALL         = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA    = @INSTALL_DATA@
--INSTALL_INFO	= @INSTALL_INFO@
-+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA    = ${BSD_INSTALL_DATA}
-+INSTALL_SCRIPT  = ${BSD_INSTALL_SCRIPT}
-+INSTALL_MAN     = ${BSD_INSTALL_MAN}
-+INSTALL_INFO    = @INSTALL_INFO@
- 
- .SUFFIXES:
- .SUFFIXES: .o .c
-@@ -257,7 +258,7 @@ install-links: $(bindir)/mtools
- install-scripts: $(bindir)/mtools
- 	@$(top_srcdir)/mkinstalldirs $(bindir)
+$OpenBSD: patch-Makefile_in,v 1.3 2013/11/06 15:06:53 sthen Exp $
+--- Makefile.in.orig	Sun Oct 17 16:41:09 2010
++++ Makefile.in	Wed Nov  6 14:31:40 2013
+@@ -277,7 +277,7 @@ install-links: $(DESTDIR)$(bindir)/mtools
+ install-scripts: $(DESTDIR)$(bindir)/mtools
+ 	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	@for j in $(SCRIPTS) ; do \
--		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+		$(INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
- 		echo $(bindir)/$$j ; \
+-		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
++		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
+ 		echo $(DESTDIR)$(bindir)/$$j ; \
  	done
- 	rm -f $(bindir)/lz
-@@ -266,12 +267,12 @@ install-scripts: $(bindir)/mtools
- install-man:
- 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
- 	@for j in $(MAN1); do \
--		$(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
-+		$(INSTALL_MAN) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
- 		echo $(MAN1DIR)/$$j ; \
- 	done
- 	@$(top_srcdir)/mkinstalldirs $(MAN5DIR)
- 	@for j in $(MAN5); do \
--		$(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
-+		$(INSTALL_MAN) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
- 		echo $(MAN5DIR)/$$j ; \
- 	done
- 
+ 	rm -f $(DESTDIR)$(bindir)/lz

sysutils/mtools/patches/patch-mtools_conf

@@ -0,0 +1,13 @@
+$OpenBSD: patch-mtools_conf,v 1.1 2013/11/06 15:06:53 sthen Exp $
+--- mtools.conf.orig	Wed Nov  6 14:50:50 2013
++++ mtools.conf	Wed Nov  6 14:50:59 2013
+@@ -15,8 +15,7 @@
+ # along with Mtools.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ # Example mtools.conf files.  Uncomment the lines which correspond to
+-# your architecture and comment out the "SAMPLE FILE" line below
+-SAMPLE FILE
++# your architecture.
+ 
+ # # Linux floppy drives
+ # drive a: file="/dev/fd0" exclusive

sysutils/mtools/pkg/PFRAG.no-no_x11

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2005/04/15 19:06:56 fgsch Exp $
-bin/floppyd
-bin/floppyd_installtest
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2013/11/06 15:06:53 sthen Exp $
+@bin bin/floppyd
+@bin bin/floppyd_installtest
 @man man/man1/floppyd.1
 @man man/man1/floppyd_installtest.1

sysutils/mtools/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2005/04/15 19:06:56 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.11 2013/11/06 15:06:53 sthen Exp $
 !%%no_x11%%
 bin/amuFormat.sh
 bin/lz
@@ -16,7 +16,7 @@ bin/mdir
 bin/mdu
 bin/mformat
 bin/minfo
-bin/mkmanifest
+@bin bin/mkmanifest
 bin/mlabel
 bin/mmd
 bin/mmount
@@ -24,8 +24,9 @@ bin/mmove
 bin/mpartition
 bin/mrd
 bin/mren
+bin/mshortname
 bin/mshowfat
-bin/mtools
+@bin bin/mtools
 bin/mtoolstest
 bin/mtype
 bin/mxtar
@@ -53,9 +54,13 @@ bin/uz
 @man man/man1/mpartition.1
 @man man/man1/mrd.1
 @man man/man1/mren.1
+@man man/man1/mshortname.1
 @man man/man1/mshowfat.1
 @man man/man1/mtools.1
 @man man/man1/mtoolstest.1
 @man man/man1/mtype.1
 @man man/man1/mzip.1
 @man man/man5/mtools.5
+share/examples/mtools/
+share/examples/mtools/mtools.conf
+@sample ${SYSCONFDIR}/mtools.conf