- Update to 1.9.5

PR:		122504
Submitted by:	Ports Fury

6 files changed, 26 insertions, 96 deletions

diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 38f9c7992622..46db1990793e 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -6,39 +6,34 @@
 #
 
 PORTNAME=	mtoolsfm
-PORTVERSION=	1.9.3
-PORTREVISION=	4
+PORTVERSION=	1.9.5
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
-DISTNAME=	MToolsFM-${PORTVERSION:R}-${PORTVERSION:E}
+MASTER_SITES=	SF
+DISTNAME=	MToolsFM-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical frontend to mtools
 
 RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
 
-USE_GNOME=	gtk12
+USE_GNOME=	gnomehack gnometarget gtk12
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-conffile="${PREFIX}/etc/mtoolsfm.conf"
 
 MAN1=		mtoolsfm.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|MToolsFM|mtoolsfm|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/MToolsFM.1
+	@${REINPLACE_CMD} -e 's|MToolsFM|mtoolsfm|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|MToolsFM|mtoolsfm|g'
-.for file in src/mtoolsfm.h po/de.po po/fr.po
-	@${MV} -f ${WRKSRC}/${file} ${WRKSRC}/${file}.preedit
-	@${CAT} ${WRKSRC}/${file}.preedit | \
-		${TR} '\264' '\047' > ${WRKSRC}/${file}
-.endfor
-
-pre-build:
-	@${LN} -sf ${WRKSRC}/MToolsFM.1 ${WRKSRC}/mtoolsfm.1
+	@cd ${WRKSRC} && ${SED} -e \
+		's|MToolsFM|mtoolsfm|g ; \
+		 s| /etc| ${PREFIX}/etc|g ; \
+		 s|/usr/X11R6/bin|${PREFIX}/bin|g ; \
+		 s|/usr/bin|${LOCALBASE}/bin|g ; \
+		 s|^/etc|${PREFIX}/etc|g' < MToolsFM.1 > mtoolsfm.1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/mtoolsfm/distinfo b/x11-fm/mtoolsfm/distinfo
index 71fa9e4ba7ac..8b76134c7f39 100644
--- a/x11-fm/mtoolsfm/distinfo
+++ b/x11-fm/mtoolsfm/distinfo
@@ -1,3 +1,3 @@
-MD5 (MToolsFM-1.9-3.tar.gz) = 5ce76261ad969209c86b28e49924fc43
-SHA256 (MToolsFM-1.9-3.tar.gz) = 665f575d86247779a384a2098057730821d80ed3059b6ed3fa1bc409ba733cfe
-SIZE (MToolsFM-1.9-3.tar.gz) = 177388
+MD5 (MToolsFM-1.9.5.tar.gz) = 034a74b4babad20023a59a31d2c933ce
+SHA256 (MToolsFM-1.9.5.tar.gz) = ca0025cbb491375ca279b1c821521bb6d8bb9affd4782dd9038ca961fba616bd
+SIZE (MToolsFM-1.9.5.tar.gz) = 437683
diff --git a/x11-fm/mtoolsfm/files/patch-aa b/x11-fm/mtoolsfm/files/patch-aa
deleted file mode 100644
index c28cb1de866f..000000000000
--- a/x11-fm/mtoolsfm/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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.
diff --git a/x11-fm/mtoolsfm/files/patch-ab b/x11-fm/mtoolsfm/files/patch-ab
deleted file mode 100644
index 85a7889b2f8e..000000000000
--- a/x11-fm/mtoolsfm/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- po/fr.po.orig	Tue Aug 21 16:31:41 2001
-+++ po/fr.po	Mon Apr 22 20:41:07 2002
-@@ -778,9 +778,6 @@
- msgid "/Options/Text mode for copying"
- msgstr "/Options/Utiliser le mode texte pour la copie"
- 
--msgid "/Options/Text mode for copying"
--msgstr "/Options/Separator"
--
- #: src/mtoolsfm.c:2817 src/mtoolsfm.c:2833
- msgid "/Options/Configure MToolsFM ..."
- msgstr "/Options/Configurer MToolsFM ..."
diff --git a/x11-fm/mtoolsfm/pkg-descr b/x11-fm/mtoolsfm/pkg-descr
index f51d90f24702..f056504377af 100644
--- a/x11-fm/mtoolsfm/pkg-descr
+++ b/x11-fm/mtoolsfm/pkg-descr
@@ -3,4 +3,4 @@ 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/MToolsFM/
+WWW: http://mtoolsfm.sourceforge.net/
diff --git a/x11-fm/mtoolsfm/pkg-plist b/x11-fm/mtoolsfm/pkg-plist
index 0095dabbc905..c3a10e888182 100644
--- a/x11-fm/mtoolsfm/pkg-plist
+++ b/x11-fm/mtoolsfm/pkg-plist
@@ -1,3 +1,12 @@
 bin/mtoolsfm
 share/locale/de/LC_MESSAGES/mtoolsfm.mo
+share/locale/en@boldquot/LC_MESSAGES/mtoolsfm.mo
+share/locale/en@quot/LC_MESSAGES/mtoolsfm.mo
 share/locale/fr/LC_MESSAGES/mtoolsfm.mo
+share/locale/pt_BR/LC_MESSAGES/mtoolsfm.mo
+share/locale/pt_PT/LC_MESSAGES/mtoolsfm.mo
+share/locale/ru/LC_MESSAGES/mtoolsfm.mo
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot