3 files changed, 73 insertions, 4 deletions

diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index f3c38a281a99..88aadf147d3e 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -6,24 +6,31 @@
 #
 
 PORTNAME=	mtoolsfm
-PORTVERSION= 	1.6
+PORTVERSION= 	1.7
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
-DISTNAME=	MToolsFM-${PORTVERSION}
+DISTNAME=	MToolsFM-${PORTVERSION}-2
 
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
 
+WRKSRC=		${WRKDIR}/MToolsFM-${PORTVERSION}
+
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-conffile="${PREFIX}/etc/mfm.conf" \
+CONFIGURE_ARGS=	--with-conffile="${PREFIX}/etc/mtoolsfm.conf" \
 		--with-mtoolsdir="${LOCALBASE}/bin" \
 		--disable-gtktest
 
 MAN1=		mtoolsfm.1
 
+post-patch:
+	@${PERL} -pi.in \
+		-e "s|%%PREFIX%%|${PREFIX}|g;" \
+		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/MToolsFM.1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/MToolsFM ${PREFIX}/bin/mtoolsfm
 	${INSTALL_MAN} ${WRKSRC}/MToolsFM.1 ${MANPREFIX}/man/man1/mtoolsfm.1
diff --git a/x11-fm/mtoolsfm/distinfo b/x11-fm/mtoolsfm/distinfo
index 304e782a863c..5eb3ee0b2481 100644
--- a/x11-fm/mtoolsfm/distinfo
+++ b/x11-fm/mtoolsfm/distinfo
@@ -1 +1 @@
-MD5 (MToolsFM-1.6.tar.gz) = c1e3de428ad0df77b7c82cb844a03641
+MD5 (MToolsFM-1.7-2.tar.gz) = 5acd129c9bd43a5a7cfb4309e62ce74c
diff --git a/x11-fm/mtoolsfm/files/patch-aa b/x11-fm/mtoolsfm/files/patch-aa
new file mode 100644
index 000000000000..c28cb1de866f
--- /dev/null
+++ b/x11-fm/mtoolsfm/files/patch-aa
@@ -0,0 +1,62 @@
+--- MToolsFM.1.orig	Sat Dec 23 23:28:00 2000
++++ MToolsFM.1	Mon Jan 22 21:41:04 2001
+@@ -1,8 +1,8 @@
+ .TH MTOOLSFM 1 "23 December 2000"
+ .SH NAME
+-MToolsFM \- graphical user interface to the mtools diskette package for UNIX
++mtoolsfm \- graphical user interface to the mtools diskette package for UNIX
+ .SH SYNOPSIS
+-.B MToolsFM
++.B mtoolsfm
+ .RB [ \-\-nosysconf ]
+ .RB [ \-\-nouserconf ]
+ .RB [ \-\-nosave ]
+@@ -10,7 +10,7 @@
+ .RB [ \-\-debug ]
+ .SH DESCRIPTION
+ The
+-.I MToolsFM
++.I mtoolsfm
+ is a gtk-based graphical user interface for the
+ .IR mtools (1)
+ package for reading and writing DOS-format diskettes on UNIX systems.
+@@ -20,7 +20,7 @@
+ .TP
+ .B \-\-nosysconf
+ Do not attempt to read system-wide configuration in
+-.IR /etc/mtoolsfm.conf .
++.IR %%PREFIX%%/etc/mtoolsfm.conf .
+ .TP
+ .B \-\-nouserconf
+ Do not read user config file in
+@@ -38,7 +38,7 @@
+ Print debugging messages to stdout.
+ .SH "CONFIGURATION FILE"
+ User-based and system-wide configuration files control the behavior of
+-.IR MToolsFM .
++.IR mtoolsfm .
+ The values in this file are set by selecting "Options -> Configure MToolsFM/..."
+ from the control var at the top of the tool. 
+ You can set references to the diskette drives available on the local system,
+@@ -47,10 +47,10 @@
+ binaries.
+ .SH FILES
+ .TP
+-/usr/X11R6/bin/MToolsFM
++%%PREFIX%%/bin/mtoolsfm
+ executable
+ .TP
+-/usr/bin
++%%LOCALBASE%%/bin
+ directory containing
+ .IR mtools (1)
+ binaries
+@@ -58,7 +58,7 @@
+ ~/.mtoolsfm
+ User-based initialization file
+ .TP
+-/etc/mtoolsfm.conf
++%%PREFIX%%/etc/mtoolsfm.conf
+ System-wide initialization file
+ .SH DIAGNOSTICS
+ Diagnostics appear in a little textfield at the bottom of the main window.