9 files changed, 63 insertions, 289 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 878b61d70f64..3cde1a5314e4 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.6.2
+PORTVERSION=	4.7.0pre4
 CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file/managers/mc
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/pre/-pre/}
 
 PATCH_SITES=	${MASTER_SITES}
 
@@ -21,22 +22,13 @@ CONFLICTS=	mc-light-4*
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 
-USE_GETTEXT=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
-.if defined(WITH_GLIB12) || defined(MINIMAL)
-USE_GNOME=	glib12
-.else
 USE_GNOME=	glib20
-.endif
 USE_PERL5=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:19 autoconf:262 automake:19
-ACLOCAL_ARGS=	-I m4
-AUTOMAKE_ARGS=	-c -a
 
-OPTIONS=	UTF8		"Build with UTF8 support" on \
-		SLANG		"Build with SLang library" on \
+OPTIONS=	SLANG		"Build with SLang library" on \
 		ICONV		"Build with iconv recoding" on \
 		NLS		"Build with NLS support" on \
 		EDIT		"Build with internal editor" on \
@@ -52,9 +44,10 @@ CONFIGURE_ARGS+=--with-samba --with-configdir=${LOCALBASE}/etc \
 .endif
 
 .if defined(WITH_ICONV) || !(defined(WITHOUT_ICONV) || defined(MINIMAL))
-CONFIGURE_ARGS+=--enable-charset --with-libiconv-prefix=${LOCALBASE}
+USE_ICONV=	yes
 PLIST_SUB=	CHARSETS=""
 .else
+CONFIGURE_ARGS+=--disable-charset
 PLIST_SUB=	CHARSETS="@comment "
 .endif
 
@@ -62,7 +55,7 @@ PLIST_SUB=	CHARSETS="@comment "
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
+USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 _MANLANG=	es hu it pl ru sr
 .endif
@@ -80,19 +73,9 @@ PLIST_SUB+=	EDITOR="@comment "
 PLIST_SUB+=	EDITOR=""
 .endif
 
-.if ${ARCH} == "alpha"
-#
-# something is wrong with slang on alpha: mc enters an infinite loop
-# when calling has_colors() during terminal init (colors.c:250)
-WITHOUT_SLANG=	yes
-.endif
-
 .if defined(WITH_UTF8)
-PATCHFILES=	${DISTNAME}-utf8.patch.gz
-PATCH_DIST_STRIP=	-p1
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 CONFIGURE_ARGS+=--with-screen=slang
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
 .elif !defined(WITH_SLANG) && (defined(WITHOUT_SLANG) || defined(MINIMAL))
 CONFIGURE_ARGS+=--with-screen=ncurses
 .else
@@ -110,15 +93,8 @@ _MANPAGES+=	${_MAN1:S%^%${MAN1PREFIX}/man/${lang}/man1/%}
 .endfor
 
 post-patch:
-.if !defined(WITH_NLS) && (defined(WITHOUT_NLS) || defined(MINIMAL))
-	@${REINPLACE_CMD} -e '/^LIBFILES_ADD +=/,/[^\\]$$/ s/^/#/'\
-		${WRKSRC}/lib/Makefile.am
-.endif
-	@${REINPLACE_CMD} -e 's|/usr/bin/zip|${LOCALBASE}/bin/zip|' \
-		-e 's|/usr/bin/unzip|${LOCALBASE}/bin/unzip|' \
-		${WRKSRC}/configure
-
-post-install:
-	@${LN} -sf mc ${PREFIX}/bin/midc
+#	@${REINPLACE_CMD} -e 's|/usr/bin/zip|${LOCALBASE}/bin/zip|' \
+#		-e 's|/usr/bin/unzip|${LOCALBASE}/bin/unzip|' \
+#		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 947f46889f25..c5161aac6711 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,6 +1,3 @@
-MD5 (mc-4.6.2.tar.gz) = ec92966f4d0c8b50c344fe901859ae2a
-SHA256 (mc-4.6.2.tar.gz) = d34c913e7fff4ea61cf8640b10f9118829cc5359045a1821b6510f3c8b1be26e
-SIZE (mc-4.6.2.tar.gz) = 3442912
-MD5 (mc-4.6.2-utf8.patch.gz) = 9753f1d340c7e3f6f73242afcf12edd2
-SHA256 (mc-4.6.2-utf8.patch.gz) = 8ce42552efcef32ca72bed87ca9f1438179a0ea2682f7d6b4d4975b11ec9bdf4
-SIZE (mc-4.6.2-utf8.patch.gz) = 51164
+MD5 (mc-4.7.0-pre4.tar.bz2) = 7bdc0ac4fe57c19a6bf2fd3e8894a073
+SHA256 (mc-4.7.0-pre4.tar.bz2) = ea3cec8e82e83a887524e2d10e9c490cd1b1fa6c97e3ab49c4faa87960c3f069
+SIZE (mc-4.7.0-pre4.tar.bz2) = 2836464
diff --git a/misc/mc/files/patch-lib_Makefile.am b/misc/mc/files/patch-lib_Makefile.am
deleted file mode 100644
index d6d1938aba54..000000000000
--- a/misc/mc/files/patch-lib_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Makefile.am.orig
-+++ lib/Makefile.am
-@@ -7,10 +7,10 @@
- endif
- 
- LIBFILES_OUT = mc.ext
--LIBFILES_CONST = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
--	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk		\
--	mc.hint.zh mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc	\
--	edit.spell.rc
-+LIBFILES_CONST = mc.hint mc.lib mc.menu cedit.menu edit.indent.rc edit.spell.rc
-+LIBFILES_ADD += mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it \
-+	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk \
-+	mc.hint.zh mc.menu.sr
- 
- noinst_DATA = README.xterm mcserv.init mcserv.pamd xterm.ad
- 
diff --git a/misc/mc/files/patch-mc-wrapper b/misc/mc/files/patch-mc-wrapper
index 8387ca01c7e5..bad58d1cfbe7 100644
--- a/misc/mc/files/patch-mc-wrapper
+++ b/misc/mc/files/patch-mc-wrapper
@@ -1,5 +1,5 @@
---- lib/mc-wrapper.csh.in.orig	Wed Nov  6 00:46:12 2002
-+++ lib/mc-wrapper.csh.in	Tue Jun 15 03:16:29 2004
+--- contrib/mc-wrapper.csh.in.orig	Wed Nov  6 00:46:12 2002
++++ contrib/mc-wrapper.csh.in	Tue Jun 15 03:16:29 2004
 @@ -14,5 +14,5 @@
  	unsetenv MC_PWD
  endif
@@ -7,8 +7,8 @@
 -rm -f "$MC_PWD_FILE"
 +/bin/rm -f "$MC_PWD_FILE"
  unsetenv MC_PWD_FILE
---- lib/mc-wrapper.sh.in.orig	Wed Nov  6 00:46:12 2002
-+++ lib/mc-wrapper.sh.in	Tue Jun 15 03:16:29 2004
+--- contrib/mc-wrapper.sh.in.orig	Wed Nov  6 00:46:12 2002
++++ contrib/mc-wrapper.sh.in	Tue Jun 15 03:16:29 2004
 @@ -9,5 +9,5 @@
  	unset MC_PWD
  fi
diff --git a/misc/mc/files/patch-mhl-types.h b/misc/mc/files/patch-mhl-types.h
deleted file mode 100644
index 31312d83ca58..000000000000
--- a/misc/mc/files/patch-mhl-types.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- mhl/types.h.orig	2009-02-05 12:59:45.000000000 +0600
-+++ mhl/types.h	2009-02-05 13:00:12.000000000 +0600
-@@ -7,10 +7,12 @@
- #ifndef __MHL_TYPES_H
- #define __MHL_TYPES_H
- 
-+#ifndef __bool_true_false_are_defined
- typedef enum 
- {
-     false	= 0,
-     true	= 1
- } bool;
-+#endif
- 
- #endif
diff --git a/misc/mc/files/patch-mhl_string.h b/misc/mc/files/patch-mhl_string.h
deleted file mode 100644
index de8a1361d9f9..000000000000
--- a/misc/mc/files/patch-mhl_string.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-$FreeBSD$
-
---- mhl/string.h.orig
-+++ mhl/string.h
-@@ -7,9 +7,30 @@
- #include <mhl/memory.h>
- 
- #define	mhl_str_dup(str)	((str ? strdup(str) : strdup("")))
--#define mhl_str_ndup(str,len)	((str ? strndup(str,len) : strdup("")))
-+#define mhl_str_ndup(str,len)	((str ? mystrndup(str,len) : strdup("")))
- #define mhl_str_len(str)	((str ? strlen(str) : 0))
- 
-+// XXX Implement strndup for FreeBSD.
-+#ifdef __FreeBSD__
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+static char *
-+mystrndup(const char *str, int len) {
-+    char *ret;
-+
-+    if ((str == NULL || len < 0)) return(NULL);
-+    ret = (char *)malloc(len + 1);
-+    if (ret == NULL) return(NULL);
-+    memcpy(ret, str, len);
-+    ret[len] = '\0';
-+    return(ret);
-+}
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
- static inline char * mhl_str_dup_range(const char * s_start, const char * s_bound)
- {
-     return mhl_str_ndup(s_start, s_bound - s_start);
diff --git a/misc/mc/files/patch-regex b/misc/mc/files/patch-regex
deleted file mode 100644
index 187dc029f421..000000000000
--- a/misc/mc/files/patch-regex
+++ /dev/null
@@ -1,145 +0,0 @@
---- src/cmd.c.orig	2009-02-03 18:49:42.000000000 +0800
-+++ src/cmd.c	2009-02-03 18:50:16.000000000 +0800
-@@ -513,7 +513,7 @@
- 		continue;
- 	}
- 	c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
--			  match_file);
-+			  match_file, 0);
- 	if (c == -1) {
- 	    message (1, MSG_ERROR, _("  Malformed regular expression  "));
- 	    g_free (reg_exp);
---- src/dir.c.orig	2009-02-03 18:51:43.000000000 +0800
-+++ src/dir.c	2009-02-03 18:51:57.000000000 +0800
-@@ -327,7 +327,7 @@
- 	    *stale_link = 1;
-     }
-     if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && filter
--	&& !regexp_match (filter, dp->d_name, match_file))
-+	&& !regexp_match (filter, dp->d_name, match_file, 0))
- 	return 0;
- 
-     /* Need to grow the *list? */
---- src/ext.c.orig	2009-02-03 18:52:36.000000000 +0800
-+++ src/ext.c	2009-02-03 18:53:11.000000000 +0800
-@@ -395,7 +395,7 @@
-     }
- 
-     if (content_string[0]
--	&& regexp_match (ptr, content_string + content_shift, match_regex)) {
-+	&& regexp_match (ptr, content_string + content_shift, match_regex, 0)) {
- 	found = 1;
-     }
- 
-@@ -519,11 +519,11 @@
- 		/* Do not transform shell patterns, you can use shell/ for
- 		 * that
- 		 */
--		if (regexp_match (p, filename, match_regex))
-+		if (regexp_match (p, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "directory/", 10)) {
- 		if (S_ISDIR (mystat.st_mode)
--		    && regexp_match (p + 10, filename, match_regex))
-+		    && regexp_match (p + 10, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "shell/", 6)) {
- 		p += 6;
---- src/find.c.orig	2009-02-03 18:54:16.000000000 +0800
-+++ src/find.c	2009-02-03 18:56:56.000000000 +0800
-@@ -615,6 +615,7 @@
-     struct stat tmp_stat;
-     static int pos;
-     static int subdirs_left = 0;
-+	int cflags = 0;
- 
-     if (!h) { /* someone forces me to close dirp */
- 	if (dirp) {
-@@ -626,6 +627,9 @@
-         dp = 0;
- 	return 1;
-     }
-+
-+	if (case_sensitive == 0)
-+		cflags |= REG_ICASE;
-  do_search_begin:
-     while (!dp){
- 	
-@@ -702,7 +706,7 @@
- 	g_free (tmp_name);
-     }
- 
--    if (regexp_match (find_pattern, dp->d_name, match_file)){
-+    if (regexp_match (find_pattern, dp->d_name, match_file, cflags)){
- 	if (content_pattern) {
- 	    if (search_content (h, directory, dp->d_name)) {
- 		return 1;
---- src/user.c.orig	2009-02-03 18:57:38.000000000 +0800
-+++ src/user.c	2009-02-03 18:58:17.000000000 +0800
-@@ -416,18 +416,18 @@
- 	    break;
- 	case 'f': /* file name pattern */
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file);
-+	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file, 0);
- 	    break;
- 	case 'y': /* syntax pattern */
-             if (edit_widget && edit_widget->syntax_type) {
- 	        p = extract_arg (p, arg, sizeof (arg));
- 	        *condition = panel &&
--                    regexp_match (arg, edit_widget->syntax_type, match_normal);
-+                    regexp_match (arg, edit_widget->syntax_type, match_normal, 0);
- 	    }
-             break;
- 	case 'd':
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->cwd, match_file);
-+	    *condition = panel && regexp_match (arg, panel->cwd, match_file, 0);
- 	    break;
- 	case 't':
- 	    p = extract_arg (p, arg, sizeof (arg));
---- src/util.c.orig	2009-02-03 18:58:31.000000000 +0800
-+++ src/util.c	2009-02-03 19:00:41.000000000 +0800
-@@ -586,25 +586,28 @@
- }
- 
- int
--regexp_match (const char *pattern, const char *string, int match_type)
-+regexp_match (const char *pattern, const char *string, int match_type, int cflags)
- {
-     static regex_t r;
-     static char *old_pattern = NULL;
-     static int old_type;
-+	static int old_cflags;
-     int    rval;
-     char *my_pattern;
- 
--    if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type){
-+    if (!old_pattern || STRCOMP (old_pattern, pattern) ||
-+			old_type != match_type || cflags != old_cflags){
- 	if (old_pattern){
- 	    regfree (&r);
- 	    g_free (old_pattern);
- 	    old_pattern = NULL;
- 	}
- 	my_pattern = convert_pattern (pattern, match_type, 0);
--	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
-+	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS|cflags)) {
- 	    g_free (my_pattern);
- 	    return -1;
- 	}
-+	old_cflags = cflags;
- 	old_pattern = my_pattern;
- 	old_type = match_type;
-     }
---- src/util.h.orig	2009-02-03 19:00:50.000000000 +0800
-+++ src/util.h	2009-02-03 19:01:21.000000000 +0800
-@@ -125,7 +125,7 @@
- 
- extern int easy_patterns;
- char *convert_pattern (const char *pattern, int match_type, int do_group);
--int regexp_match (const char *pattern, const char *string, int match_type);
-+int regexp_match (const char *pattern, const char *string, int match_type, int cflags);
- 
- /* Error pipes */
- void open_error_pipe (void);
diff --git a/misc/mc/files/patch-src-subshell.c b/misc/mc/files/patch-src-subshell.c
deleted file mode 100644
index fb21606c49f5..000000000000
--- a/misc/mc/files/patch-src-subshell.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/subshell.c.orig
-+++ src/subshell.c
-@@ -386,6 +386,8 @@
- 	    subshell_type = ZSH;
- 	else if (strstr (shell, "/tcsh"))
- 	    subshell_type = TCSH;
-+	else if (strstr (shell, "/csh"))
-+	    subshell_type = TCSH;
- 	else if (strstr (shell, "/bash") || getenv ("BASH"))
- 	    subshell_type = BASH;
- 	else {
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 39cfa30a8bfb..2925d2f2f040 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -2,8 +2,27 @@ bin/mc
 %%EDITOR%%bin/mcedit
 bin/mcmfmt
 bin/mcview
-bin/midc
+%%EDITOR%%etc/mc/Syntax
+etc/mc/cedit.menu
+%%EDITOR%%etc/mc/edit.indent.rc
+%%EDITOR%%etc/mc/edit.spell.rc
+etc/mc/extfs/extfs.ini
+etc/mc/extfs/sfs.ini
+etc/mc/filehighlight.ini
+%%CHARSETS%%etc/mc/mc.charsets
+etc/mc/mc.ext
+etc/mc/mc.keymap
+etc/mc/mc.keymap.default
+etc/mc/mc.keymap.emacs
+etc/mc/mc.lib
+etc/mc/mc.menu
+etc/mc/mc.menu.sr
+libexec/mc/mc-wrapper.csh
+libexec/mc/mc-wrapper.sh
+libexec/mc/mc.csh
+libexec/mc/mc.sh
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/be-tarask/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mc.mo
@@ -22,8 +41,8 @@ bin/midc
 %%NLS%%share/locale/lt/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/mn/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/no/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/mc.mo
@@ -40,13 +59,6 @@ bin/midc
 %%NLS%%share/locale/wa/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mc.mo
-%%DATADIR%%/bin/mc-wrapper.csh
-%%DATADIR%%/bin/mc-wrapper.sh
-%%DATADIR%%/bin/mc.csh
-%%DATADIR%%/bin/mc.sh
-%%DATADIR%%/cedit.menu
-%%DATADIR%%/edit.indent.rc
-%%DATADIR%%/edit.spell.rc
 %%DATADIR%%/extfs/README
 %%DATADIR%%/extfs/a
 %%DATADIR%%/extfs/apt
@@ -56,7 +68,6 @@ bin/midc
 %%DATADIR%%/extfs/deba
 %%DATADIR%%/extfs/debd
 %%DATADIR%%/extfs/dpkg
-%%DATADIR%%/extfs/extfs.ini
 %%DATADIR%%/extfs/hp48
 %%DATADIR%%/extfs/iso9660
 %%DATADIR%%/extfs/lslR
@@ -64,19 +75,21 @@ bin/midc
 %%DATADIR%%/extfs/patchfs
 %%DATADIR%%/extfs/rpm
 %%DATADIR%%/extfs/rpms
-%%DATADIR%%/extfs/sfs.ini
+%%DATADIR%%/extfs/srpm
 %%DATADIR%%/extfs/trpm
 %%DATADIR%%/extfs/u7z
+%%DATADIR%%/extfs/uace
 %%DATADIR%%/extfs/ualz
 %%DATADIR%%/extfs/uar
+%%DATADIR%%/extfs/uarc
 %%DATADIR%%/extfs/uarj
+%%DATADIR%%/extfs/uc1541
+%%DATADIR%%/extfs/ucab
 %%DATADIR%%/extfs/uha
 %%DATADIR%%/extfs/ulha
 %%DATADIR%%/extfs/urar
 %%DATADIR%%/extfs/uzip
 %%DATADIR%%/extfs/uzoo
-%%CHARSETS%%%%DATADIR%%/mc.charsets
-%%DATADIR%%/mc.ext
 %%DATADIR%%/mc.hint
 %%NLS%%%%DATADIR%%/mc.hint.cs
 %%NLS%%%%DATADIR%%/mc.hint.es
@@ -95,13 +108,15 @@ bin/midc
 %%NLS%%%%DATADIR%%/mc.hlp.pl
 %%NLS%%%%DATADIR%%/mc.hlp.ru
 %%NLS%%%%DATADIR%%/mc.hlp.sr
-%%DATADIR%%/mc.lib
-%%DATADIR%%/mc.menu
-%%NLS%%%%DATADIR%%/mc.menu.sr
-%%EDITOR%%%%DATADIR%%/syntax/Syntax
+%%DATADIR%%/skins/darkfar.ini
+%%DATADIR%%/skins/default.ini
+%%DATADIR%%/skins/double-lines.ini
+%%DATADIR%%/skins/featured.ini
+%%DATADIR%%/skins/gotar.ini
 %%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
 %%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
 %%EDITOR%%%%DATADIR%%/syntax/assembler.syntax
+%%EDITOR%%%%DATADIR%%/syntax/awk.syntax
 %%EDITOR%%%%DATADIR%%/syntax/c.syntax
 %%EDITOR%%%%DATADIR%%/syntax/changelog.syntax
 %%EDITOR%%%%DATADIR%%/syntax/cs.syntax
@@ -114,8 +129,12 @@ bin/midc
 %%EDITOR%%%%DATADIR%%/syntax/debian-sources-list.syntax
 %%EDITOR%%%%DATADIR%%/syntax/diff.syntax
 %%EDITOR%%%%DATADIR%%/syntax/dos.syntax
+%%EDITOR%%%%DATADIR%%/syntax/ebuild.syntax
 %%EDITOR%%%%DATADIR%%/syntax/eiffel.syntax
+%%EDITOR%%%%DATADIR%%/syntax/erlang.syntax
+%%EDITOR%%%%DATADIR%%/syntax/f90.syntax
 %%EDITOR%%%%DATADIR%%/syntax/fortran.syntax
+%%EDITOR%%%%DATADIR%%/syntax/haskell.syntax
 %%EDITOR%%%%DATADIR%%/syntax/html.syntax
 %%EDITOR%%%%DATADIR%%/syntax/idl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/java.syntax
@@ -128,6 +147,8 @@ bin/midc
 %%EDITOR%%%%DATADIR%%/syntax/mail.syntax
 %%EDITOR%%%%DATADIR%%/syntax/makefile.syntax
 %%EDITOR%%%%DATADIR%%/syntax/ml.syntax
+%%EDITOR%%%%DATADIR%%/syntax/named.syntax
+%%EDITOR%%%%DATADIR%%/syntax/nemerle.syntax
 %%EDITOR%%%%DATADIR%%/syntax/nroff.syntax
 %%EDITOR%%%%DATADIR%%/syntax/octave.syntax
 %%EDITOR%%%%DATADIR%%/syntax/pascal.syntax
@@ -135,6 +156,7 @@ bin/midc
 %%EDITOR%%%%DATADIR%%/syntax/php.syntax
 %%EDITOR%%%%DATADIR%%/syntax/po.syntax
 %%EDITOR%%%%DATADIR%%/syntax/povray.syntax
+%%EDITOR%%%%DATADIR%%/syntax/procmail.syntax
 %%EDITOR%%%%DATADIR%%/syntax/python.syntax
 %%EDITOR%%%%DATADIR%%/syntax/ruby.syntax
 %%EDITOR%%%%DATADIR%%/syntax/sh.syntax
@@ -142,14 +164,18 @@ bin/midc
 %%EDITOR%%%%DATADIR%%/syntax/smalltalk.syntax
 %%EDITOR%%%%DATADIR%%/syntax/spec.syntax
 %%EDITOR%%%%DATADIR%%/syntax/sql.syntax
+%%EDITOR%%%%DATADIR%%/syntax/strace.syntax
 %%EDITOR%%%%DATADIR%%/syntax/swig.syntax
 %%EDITOR%%%%DATADIR%%/syntax/syntax.syntax
 %%EDITOR%%%%DATADIR%%/syntax/tcl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/texinfo.syntax
 %%EDITOR%%%%DATADIR%%/syntax/unknown.syntax
+%%EDITOR%%%%DATADIR%%/syntax/verilog.syntax
+%%EDITOR%%%%DATADIR%%/syntax/vhdl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/xml.syntax
-%%EDITOR%%@dirrm %%DATADIR%%/syntax
+@dirrm %%DATADIR%%/syntax
+@dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/extfs
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%
 @dirrm libexec/mc
+@dirrm etc/mc/extfs
+@dirrm etc/mc