9 files changed, 12 insertions, 43 deletions

diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 8f75a13f6fd3..3fa2179b8932 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -10,7 +10,7 @@
     SUBDIR += fsv
     SUBDIR += gnomemc
     SUBDIR += jafm
-    SUBDIR += mfm
+    SUBDIR += mtoolsfm
     SUBDIR += nautilus
     SUBDIR += offix-files
     SUBDIR += rox-base
diff --git a/x11-fm/mfm/Makefile b/x11-fm/mfm/Makefile
deleted file mode 100644
index 5c456488f3d9..000000000000
--- a/x11-fm/mfm/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	mfm
-# Date created:				12 Jan 2000
-# Whom:					Michael Vasilenko <acid@stu.cn.ua>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mfm
-PORTVERSION= 	1.5
-CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.core-coutainville.org/mfm/archive/SOURCES/
-
-MAINTAINER=	ports@FreeBSD.org
-
-RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
-
-USE_X_PREFIX=	yes
-USE_GTK=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-conffile="${PREFIX}/etc/mfm.conf" \
-		--with-mtoolsdir="${LOCALBASE}/bin" \
-		--disable-gtktest
-
-MAN1=		mfm.1
-
-.include <bsd.port.mk>
diff --git a/x11-fm/mfm/distinfo b/x11-fm/mfm/distinfo
deleted file mode 100644
index 42eba4c3996f..000000000000
--- a/x11-fm/mfm/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mfm-1.5.tar.gz) = fe3297c55fee68a1ba1508e46913bca0
diff --git a/x11-fm/mfm/pkg-comment b/x11-fm/mfm/pkg-comment
deleted file mode 100644
index a07ba2316cd4..000000000000
--- a/x11-fm/mfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical frontend to mtools
diff --git a/x11-fm/mfm/pkg-descr b/x11-fm/mfm/pkg-descr
deleted file mode 100644
index de4edd9a64e1..000000000000
--- a/x11-fm/mfm/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A graphical frontend to mtools.
-
-mfm is a program which should give people easy access to floppies under
-UNIX-like operating systems. It can do simple tasks of a file-manager and 
-makes use of mtools to access floppies.
-
-WWW: http://www.core-coutainville.org/mfm/
diff --git a/x11-fm/mfm/pkg-plist b/x11-fm/mfm/pkg-plist
deleted file mode 100644
index 02e3c5c3a772..000000000000
--- a/x11-fm/mfm/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mfm
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 5c456488f3d9..7a1c9ac2c645 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -1,14 +1,15 @@
-# New ports collection makefile for:	mfm
+# New ports collection makefile for:	MToolsFM
 # Date created:				12 Jan 2000
 # Whom:					Michael Vasilenko <acid@stu.cn.ua>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mfm
-PORTVERSION= 	1.5
+PORTNAME=	mtoolsfm
+PORTVERSION= 	1.6
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.core-coutainville.org/mfm/archive/SOURCES/
+DISTNAME=	MToolsFM-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -21,6 +22,10 @@ CONFIGURE_ARGS=	--with-conffile="${PREFIX}/etc/mfm.conf" \
 		--with-mtoolsdir="${LOCALBASE}/bin" \
 		--disable-gtktest
 
-MAN1=		mfm.1
+MAN1=		mtoolsfm.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/MToolsFM ${PREFIX}/bin/mtoolsfm
+	${INSTALL_MAN} ${WRKSRC}/MToolsFM.1 ${MANPREFIX}/man/man1/mtoolsfm.1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/mtoolsfm/distinfo b/x11-fm/mtoolsfm/distinfo
index 42eba4c3996f..304e782a863c 100644
--- a/x11-fm/mtoolsfm/distinfo
+++ b/x11-fm/mtoolsfm/distinfo
@@ -1 +1 @@
-MD5 (mfm-1.5.tar.gz) = fe3297c55fee68a1ba1508e46913bca0
+MD5 (MToolsFM-1.6.tar.gz) = c1e3de428ad0df77b7c82cb844a03641
diff --git a/x11-fm/mtoolsfm/pkg-plist b/x11-fm/mtoolsfm/pkg-plist
index 02e3c5c3a772..ccbb993edc25 100644
--- a/x11-fm/mtoolsfm/pkg-plist
+++ b/x11-fm/mtoolsfm/pkg-plist
@@ -1 +1 @@
-bin/mfm
+bin/mtoolsfm