Updated mc to 4.6.1.

Changes:

- many small bug fixes
- improved syntax highlighting files for the internal editor
- security fix for the urar virtual file system
- updated German and Italian translations

4 files changed, 11 insertions, 26 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 09e1cf6499e..3473eb6ffdd 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.58 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2005/08/04 10:12:06 rillig Exp $
 
-DISTNAME=	mc-4.6.1-pre4
-PKGNAME=	mc-4.6.1rc4.1
+DISTNAME=	mc-4.6.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://pavelsh.pp.ru/mc/
-#MASTER_SITES=	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
-#		${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
+MASTER_SITES=	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
+		${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
 
 MAINTAINER=	pavel.arnost@clnet.cz
 HOMEPAGE=	http://www.ibiblio.org/mc/
 COMMENT=	User-friendly file manager and visual shell
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 
 # see options.mk for an explanation of these options
diff --git a/sysutils/mc/PLIST.mcedit b/sysutils/mc/PLIST.mcedit
index 557273a1961..dd7724a3638 100644
--- a/sysutils/mc/PLIST.mcedit
+++ b/sysutils/mc/PLIST.mcedit
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.mcedit,v 1.3 2005/03/22 15:29:53 wiz Exp $
+@comment $NetBSD: PLIST.mcedit,v 1.4 2005/08/04 10:12:06 rillig Exp $
 bin/mcedit
 share/mc/syntax/Syntax
 share/mc/syntax/ada95.syntax
@@ -12,11 +12,13 @@ share/mc/syntax/dos.syntax
 share/mc/syntax/eiffel.syntax
 share/mc/syntax/fortran.syntax
 share/mc/syntax/html.syntax
+share/mc/syntax/idl.syntax
 share/mc/syntax/java.syntax
 share/mc/syntax/js.syntax
 share/mc/syntax/latex.syntax
 share/mc/syntax/lisp.syntax
 share/mc/syntax/lsm.syntax
+share/mc/syntax/lua.syntax
 share/mc/syntax/m4.syntax
 share/mc/syntax/mail.syntax
 share/mc/syntax/makefile.syntax
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
index 3b665f22f68..21a89993cc8 100644
--- a/sysutils/mc/distinfo
+++ b/sysutils/mc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2005/06/23 17:10:28 wiz Exp $
+$NetBSD: distinfo,v 1.15 2005/08/04 10:12:06 rillig Exp $
 
-SHA1 (mc-4.6.1-pre4.tar.gz) = 2e2246c6aeb781254e6df396a668a709dc709e92
-RMD160 (mc-4.6.1-pre4.tar.gz) = e900a6c4dca0ba315b5af2cae70c98d82c451c63
-Size (mc-4.6.1-pre4.tar.gz) = 3924348 bytes
-SHA1 (patch-ab) = 7f6ace2493bc2e453f570153073183a289fbd153
+SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
+RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
+Size (mc-4.6.1.tar.gz) = 3928370 bytes
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
deleted file mode 100644
index f455ca224c4..00000000000
--- a/sysutils/mc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2005/01/15 21:14:27 wiz Exp $
-
---- configure.orig	2003-12-24 18:14:58.000000000 +0100
-+++ configure
-@@ -9633,7 +9633,7 @@ _ACEOF
- 
- 
- if test "x$USE_INCLUDED_LIBINTL" = xyes; then
--    CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"
-+    :
- fi
- 
- ALL_DOC_LINGUAS="es hu it pl ru sr"