- upgrade to 4.1.55

- always build internal editor
- sync with /usr/ports/x11-fm/gnomemc
- take maintainership

18 files changed, 288 insertions, 670 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 67f13b2ff58d..1b8e54704574 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,47 +6,33 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.5.54
-PORTREVISION=	3
+PORTVERSION=	4.5.55
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/mc
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
-.if defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-.elif defined(WITH_SLANG)
-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.endif
 
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS=	--with-slang --without-gnome --with-edit
-.else
-CONFIGURE_ARGS=	--with-ncurses --without-gnome --without-edit
-.endif
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
-
-MAN1=		midc.1 mcedit.1
-MAN8=		mcserv.8
-
-pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(libdir\)/mc|\$\(datadir\)/mc|g'
-
-.if defined(WITH_SLANG)
-PLIST=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
-	@${ECHO_CMD} bin/mcedit >> ${PLIST}
-.endif
+CONFIGURE_ARGS=	--with-ncurses --without-gnome
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+MAN1=		mc.1 mcedit.1
+
+post-patch:
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/mc|\$\(datadir\)/mc|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
+post-install:
+	@${LN} -sf mc ${PREFIX}/bin/midc
 
 .include <bsd.port.mk>
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 6fcebadbbc72..67a007a6ca39 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.54.tar.gz) = 46bd6d7e25fc3f509c5d8d063fa701eb
+MD5 (mc-4.5.55.tar.gz) = bb670d48589f26f00b7fce8d25f66bd6
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index 910b9596d2f5..ddf766c5a2e3 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,43 +1,14 @@
---- configure.orig	Mon Apr 16 11:40:15 2001
-+++ configure	Fri Apr 20 12:22:48 2001
-@@ -10060,3 +10060,3 @@
-   ac_save_LIBS="$LIBS"
--LIBS="-lslang  $LIBS"
-+LIBS="-lslang -ltermcap $LIBS"
- cat > conftest.$ac_ext <<EOF
-@@ -10301,3 +10301,3 @@
- 
--	    LSLANG="-lslang"
-+	    LSLANG="-lslang -ltermcap"
- 	    screen_manager="SLang (system-installed library)"
-@@ -10749,3 +10749,3 @@
- 	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-- 	    LIBS="$LIBS -lncurses"
-+ 	    LIBS="$LIBS -lncurses -lmytinfo"
- 	    CPPFLAGS="$CPPFLAGS "
-@@ -10766,3 +10766,3 @@
- 	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
-- 	    LIBS="$LIBS -lncurses"
-+ 	    LIBS="$LIBS -lncurses -lmytinfo"
- 	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-@@ -11043,3 +11043,3 @@
- 
--	    LSLANG="-lslang"
-+	    LSLANG="-lslang -ltermcap"
- 	    screen_manager="SLang (system-installed library)"
-@@ -11551,3 +11551,3 @@
- 
--doc/mc.1 doc/mcedit.1 doc/mcserv.8
-+doc/mc.1 doc/mcserv.8
- 
-@@ -11834,6 +11834,6 @@
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
-+# case "$ac_given_INSTALL" in
-+# [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+# esac
- 
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-aa,v 1.12 2002-08-05 21:26:26 fjoe Exp $
+
+--- configure.orig	Fri Aug 24 11:05:06 2001
++++ configure	Tue Sep 11 18:16:08 2001
+@@ -2552,6 +2552,8 @@
+   echo "$as_me:2552: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
++CPPLAGS="$save_CPPFLAGS"
++CFLAGS="$CFLAGS -I${LOCALBASE}/include"
+ rm -f conftest*
+ 
+ echo "$as_me:2557: checking for minix/config.h" >&5
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index ccdfe76515dd..9e8d31de0963 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,7 +1,14 @@
---- vfs/Make-mc.in.orig	Wed Apr 11 07:07:50 2001
-+++ vfs/Make-mc.in	Fri Apr 20 12:24:23 2001
-@@ -233,3 +233,3 @@
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
--	$(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv
-+	$(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-ab,v 1.12 2002-08-05 21:26:26 fjoe Exp $
+
+--- vfs/Make-mc.in.orig	Wed Aug  1 19:15:22 2001
++++ vfs/Make-mc.in	Tue Sep 11 18:20:08 2001
+@@ -18,7 +18,7 @@
+ DEFS     = $(XDEFS)
+ LIBS     = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
+ INSTALL  = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ AR = @AR@
  
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index 37203a444a75..7a8c41ee98ac 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,14 +1,27 @@
---- Make.common.in.orig	Sun Oct  8 18:58:39 2000
-+++ Make.common.in	Fri Apr 20 12:26:51 2001
-@@ -18,5 +18,6 @@
- bindir     = @bindir@
-+sbindir    = $(exec_prefix)/sbin
- sysconfdir = @sysconfdir@
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-ac,v 1.10 2002-08-05 21:26:26 fjoe Exp $
+
+--- Make.common.in.orig	Fri Jul 20 18:22:50 2001
++++ Make.common.in	Fri Dec 14 11:04:04 2001
+@@ -13,10 +13,10 @@
  datadir    = @datadir@
--libdir	   = @libdir@
-+libdir	   = @datadir@
+ libdir	   = @libdir@
  mandir     = @mandir@
-@@ -60,2 +61,3 @@
- XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. \
-+	-DSBINDIR=\""$(sbindir)/"\" \
- 	-DBINDIR=\""$(bindir)/"\" \
+-mclibdir   = $(libdir)/mc
++mclibdir   = $(datadir)/mc
+ suppbindir = $(mclibdir)/bin
+ confdir    = $(sysconfdir)
+-localedir  = $(datadir)/locale
++localedir  = $(prefix)/share/locale
+ man1dir    = $(mandir)/man1
+ manext     = 1
+ man8dir    = $(mandir)/man8
+@@ -38,7 +38,7 @@
+ # No way, to make make happy (except GNU), we cannot use := to append
+ # something to these, so that's why there is a leading _
+ XCFLAGS = @CFLAGS@
+-XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
++XCPPFLAGS = -I$(mcsrcdir) -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
+ XLDFLAGS = @LDFLAGS@
+ XDEFS = @DEFS@
+ XLIBS = @LIBS@
diff --git a/misc/mc/files/patch-ad b/misc/mc/files/patch-ad
new file mode 100644
index 000000000000..694c000fe771
--- /dev/null
+++ b/misc/mc/files/patch-ad
@@ -0,0 +1,11 @@
+--- gnome/gtools.c.orig	Tue Feb 16 01:29:19 1999
++++ gnome/gtools.c	Fri Feb 19 01:43:53 1999
+@@ -13,7 +13,7 @@
+ #undef HAVE_LIBGPM
+ #include "mouse.h"
+ #include "key.h"
+-#include "myslang.h"
++#include "tty.h"
+ #include "widget.h"
+ #include "wtools.h"
+ #include "dialog.h"
diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index 8cafe243f5fc..c87a4ec5e68f 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,81 +1,25 @@
---- Makefile.in.orig	Sun Mar 18 12:20:52 2001
-+++ Makefile.in	Wed Mar 28 18:16:22 2001
-@@ -159,3 +159,3 @@
- 
--SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons 	idl syntax intl doc-gnome po pc
-+SUBDIRS = vfs lib doc gtkedit edit src gnome new_icons syntax intl po
- 
-@@ -174,3 +174,3 @@
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-af,v 1.18 2002-08-05 21:26:26 fjoe Exp $
+
+--- Makefile.in.orig	Fri Aug 24 11:05:06 2001
++++ Makefile.in	Tue Sep 11 18:25:56 2001
+@@ -155,8 +155,8 @@
+ smbfs = @smbfs@
+ undelfs_o = @undelfs_o@
+ 
+-SUBDIRS = intl po vfs slang edit src lib doc syntax pc \
+-	gtkedit gnome new_icons idl doc-gnome
++SUBDIRS = intl po vfs edit src lib doc syntax pc \
++	gtkedit gnome new_icons idl
+ 
+ 
+ ACLOCAL_AMFLAGS = -I macros
+@@ -181,7 +181,7 @@
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  Make.common mc.spec mcfn_install
-+CONFIG_CLEAN_FILES =  Make.common mc.spec
- DATA =  $(noinst_DATA)
---- doc/Makefile.in.orig	Mon Apr 16 11:53:07 2001
-+++ doc/Makefile.in	Fri Apr 20 13:41:42 2001
-@@ -159,3 +159,3 @@
- 
--man_MANS = mc.1 mcedit.1 mcserv.8
-+man_MANS = midc.1 mcedit.1 mcserv.8
- 
-@@ -185,2 +185,5 @@
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+midc.1:	mc.1
-+	cp mc.1 midc.1
- 
---- lib/Makefile.in.orig	Mon Apr 16 11:53:06 2001
-+++ lib/Makefile.in	Fri Apr 20 13:48:32 2001
-@@ -161,4 +161,2 @@
- desktopdir = $(mclibdir)/desktop-scripts
--suppbindir = $(mclibdir)/bin
--tidir = $(mclibdir)/term
- confdir = $(sysconfdir)
-@@ -176,5 +174,3 @@
- conf_DATA = mc.global
--suppbin_SCRIPTS = mc.csh mc.sh
- desktop_DATA = startup.links README.desktop
--ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
- 
-@@ -188,6 +184,5 @@
- CONFIG_CLEAN_FILES =  mc.ext mc.sh mc.csh
--SCRIPTS =  $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
-+SCRIPTS =  $(noinst_SCRIPTS)
- 
--DATA =  $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
--$(ti_DATA)
-+DATA =  $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
- 
-@@ -340,4 +335,4 @@
- 
--install-data-am: install-suppbinSCRIPTS install-confDATA \
--		install-desktopDATA install-mclibDATA install-tiDATA
-+install-data-am: install-confDATA \
-+		install-desktopDATA install-mclibDATA
- install-data: install-data-am
-@@ -356,5 +351,4 @@
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(suppbindir) $(DESTDIR)$(confdir) \
--		$(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir) \
--		$(DESTDIR)$(tidir)
-+	$(mkinstalldirs)  $(DESTDIR)$(confdir) \
-+		$(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir)
- 
---- src/Makefile.in.orig	Wed Apr 11 07:07:47 2001
-+++ src/Makefile.in	Thu May 17 12:29:24 2001
-@@ -121,6 +121,5 @@
- 	$(mkinstalldirs) $(DESTDIR)$(mclibdir)
--	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)mc
-+	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)midc
- 	$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
- 	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/mc.hlp 
--	$(MAKE) install_mcview
- 	$(MAKE) install_@MCEDIT@
-@@ -134,6 +133,6 @@
- install_mcview:
--	cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcview && $(LN_S) mc mcview
-+	cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcview && $(LN_S) midc mcview
- 
- install_mcedit:
--	cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) mc mcedit
-+	cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) midc mcedit
+ CONFIG_CLEAN_FILES = Make.common mc.spec gnome/Makefile gnome/mc.keys.in \
+ 	src/Makefile slang/Makefile edit/Makefile gtkedit/Makefile \
+-	mcfn_install intl/Makefile
++	intl/Makefile
+ DIST_SOURCES =
+ DATA = $(noinst_DATA)
  
diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag
index 4c00a62b71d4..4b0bf6e49594 100644
--- a/misc/mc/files/patch-ag
+++ b/misc/mc/files/patch-ag
@@ -1,473 +1,28 @@
 --- lib/mc.ext.in.orig	Sat Mar  3 16:33:22 2001
-+++ lib/mc.ext.in	Fri Apr 20 13:11:02 2001
-@@ -167,6 +167,6 @@
- shell/.c
--	Open=%var{EDITOR:vi} %f
-+	Open=%var{EDITOR:vi} '%d/%p'
- 	View=%view{ascii}
--	Compile=%var{CC:cc} -O -c %f
--	Link=%var{CC:cc} -O -o %d/`basename %f .c` %f
-+	Compile=%var{CC:cc} -O -c '%d/%p'
-+	Link=%var{CC:cc} -O -o %d/`basename '%d/%p' .c` '%d/%p'
- 
-@@ -174,6 +174,6 @@
- shell/.f
--	Open=%var{EDITOR:vi} %f
-+	Open=%var{EDITOR:vi} '%d/%p'
- 	View=%view{ascii}
--	Compile=f77 -O -c %f
--	Compile and Link=f77 -O %f
-+	Compile=f77 -O -c '%d/%p'
-+	Compile and Link=f77 -O '%d/%p'
- 	
-@@ -181,3 +181,3 @@
- shell/.h
--	Open=%var{EDITOR:vi} %f
-+	Open=%var{EDITOR:vi} '%d/%p'
- 
-@@ -185,6 +185,6 @@
- shell/.o
--	#Open=%var{PAGER:more} %f
--	Link=%var{CC:cc} -O %f
--	Display object file symbols=%view{ascii} nm %f
--	Disassemble=%view{ascii} objdump -d -r %f
-+	#Open=%var{PAGER:more} '%d/%p'
-+	Link=%var{CC:cc} -O '%d/%p'
-+	Display object file symbols=%view{ascii} nm '%d/%p'
-+	Disassemble=%view{ascii} objdump -d -r '%d/%p'
- 
-@@ -192,5 +192,5 @@
- shell/.s
--	Open=%var{EDITOR:vi} %f
--	Assemble=%var{CC:cc} -O -c %f
--	Link=%var{CC:cc} -O -o %d/`basename %f .s` %f
-+	Open=%var{EDITOR:vi} '%d/%p'
-+	Assemble=%var{CC:cc} -O -c '%d/%p'
-+	Link=%var{CC:cc} -O -o %d/`basename '%d/%p' .s` '%d/%p'
- 
-@@ -198,6 +198,6 @@
- regex/\.(C|cc)$
--	Open=%var{EDITOR:vi} %f
-+	Open=%var{EDITOR:vi} '%d/%p'
- 	View=%view{ascii}
--	Compile=c++ -O -c %f
--	Link=c++ -O -o %d/`basename %f .c` %f
-+	Compile=c++ -O -c '%d/%p'
-+	Link=c++ -O -o %d/`basename '%d/%p' .c` '%d/%p'
- 
-@@ -214,4 +214,4 @@
- regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|n)|\.man)$
--	Open=nroff @TROFFASCII@ @MANDOC@ %f | %var{PAGER:more}
--	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ %f
-+	Open=nroff @TROFFASCII@ @MANDOC@ '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ '%d/%p'
- 
-@@ -219,4 +219,4 @@
- shell/.me
--	Open=nroff @TROFFASCII@ -me %f | %var{PAGER:more}
--	View=%view{ascii,nroff} nroff @TROFFASCII@ -me %f
-+	Open=nroff @TROFFASCII@ -me '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii,nroff} nroff @TROFFASCII@ -me '%d/%p'
- 
-@@ -224,4 +224,4 @@
- shell/.ms
--	Open=nroff @TROFFASCII@ -ms %f | %var{PAGER:more}
--	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f
-+	Open=nroff @TROFFASCII@ -ms '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms '%d/%p'
- 
-@@ -229,12 +229,12 @@
- regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
--	Open=gzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
--	View=%view{ascii,nroff} gzip -dc %f | nroff @TROFFASCII@ @MANDOC@
-+	Open=gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-+	View=%view{ascii,nroff} gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
- 
- regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
--	Open=bzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
--	View=%view{ascii,nroff} bzip -dc %f | nroff @TROFFASCII@ @MANDOC@
-+	Open=bzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-+	View=%view{ascii,nroff} bzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
- 
- regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$
--	Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
--	View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@
-+	Open=bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-+	View=%view{ascii,nroff} bzip2 -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
- 
-@@ -276,3 +276,3 @@
- shell/.xbm
--	Open=bitmap %f
-+	Open=bitmap '%d/%p'
- 
-@@ -280,10 +280,10 @@
- 	Include=image-options
--	View=sxpm %f
-+	View=sxpm '%d/%p'
- 
++++ lib/mc.ext.in	Wed Mar 28 19:08:24 2001
+@@ -283,3 +283,3 @@
  include/image-options
 -	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi
--	View=%view{ascii} identify %f
--	#View=%view{ascii} asciiview %f
--	Set root window to this image=background-properties --setwallpaper %f &
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ElectricEyes %f &); fi
+ 	View=%view{ascii} identify %f
+@@ -287,3 +287,3 @@
+ 	Set root window to this image=background-properties --setwallpaper %f &
 -	Display this file=ee %f &
-+	Open=if [ "$DISPLAY" = "" ]; then zgv '%d/%p'; else (ElectricEyes '%d/%p' &); fi
-+	View=%view{ascii} identify '%d/%p'
-+	#View=%view{ascii} asciiview '%d/%p'
-+	Set root window to this image=background-properties --setwallpaper '%d/%p' &
-+	Display this file=ElectricEyes '%d/%p' &
++	Display this file=ElectricEyes %f &
  
-@@ -293,14 +293,14 @@
- regex/\.(wav|WAV|Wav|snd|SND|Snd|voc|VOC|Voc|au|AU|Au)$
--       Open=play %f
-+       Open=play '%d/%p'
- 
- regex/\.(mod|MOD|Mod|s3m|S3M|S3m|xm|XM|Xm)$
--       Open=mikmod %f
--       #Open=tracker %f
-+       Open=mikmod '%d/%p'
-+       #Open=tracker '%d/%p'
- 
- regex/\.(wav22|WAV22)$
--       Open=vplay -s 22 %f
-+       Open=vplay -s 22 '%d/%p'
- 
- regex/\.(mp3|MP3|Mp3)$
--	Open=mpg123 %f
--	View=%view{ascii} mpg123 -tn1 %f 2>&1|grep -E "^(Title|Album|Comment|MPEG|$)"
-+	Open=mpg123 '%d/%p'
-+	View=%view{ascii} mpg123 -tn1 '%d/%p' 2>&1|grep -E "^(Title|Album|Comment|MPEG|$)"
- 
-@@ -310,15 +310,15 @@
- regex/\.(mpe?g|MPE?G|Mpe?g)$
--	Open=mtvp %f 2>/dev/null&
--	#Open=mtv %f 2>/dev/null&
--	#Open=gtv %f 2>/dev/null&
--	#Open=plaympeg %f 2>/dev/null&
--	#Open=mpeg_play %f &
--	#Open(big)=mpeg_play -dither 2x2 %f &
--	#Open(gray)=mpeg_play -dither gray %f &
-+	Open=mtvp '%d/%p' 2>/dev/null&
-+	#Open=mtv '%d/%p' 2>/dev/null&
-+	#Open=gtv '%d/%p' 2>/dev/null&
-+	#Open=plaympeg '%d/%p' 2>/dev/null&
-+	#Open=mpeg_play '%d/%p' &
-+	#Open(big)=mpeg_play -dither 2x2 '%d/%p' &
-+	#Open(gray)=mpeg_play -dither gray '%d/%p' &
- 
- regex/\.(avi|AVI|Avi|mov|MOV|Mov)$
--	Open=xanim %f 2>/dev/null&
-+	Open=xanim '%d/%p' 2>/dev/null&
- 
- regex/\.(rm|RM|Rm|ram|RAM|Ram)$
--	Open=realplay %f&
-+	Open=realplay '%d/%p'&
- 
-@@ -329,5 +329,5 @@
+@@ -329,3 +329,3 @@
  type/PostScript
 -	Open=gv %f&
--	View=%view{ascii} ps2ascii %f
--	View with GhostView=gv %f
-+	Open=gv '%d/%p'&
-+	View=%view{ascii} ps2ascii '%d/%p'
-+	View with GhostView=gv '%d/%p'
- 
-@@ -335,6 +335,6 @@
- type/PDF
--	Open=xpdf %f&
--	#Open=acroread %f&
--	#Open=ghostview %f&
--	View=%view{ascii} pdftotext %f -
-+	Open=xpdf '%d/%p'&
-+	#Open=acroread '%d/%p'&
-+	#Open=ghostview '%d/%p'&
-+	View=%view{ascii} pdftotext '%d/%p' -
- 
-@@ -343,14 +343,14 @@
- 	#Open=if echo "%d/%p" | grep ^ftp; then $viewer %d/%p; else $viewer file:%p; fi
--	Open=if [ x$DISPLAY = x ]; then lynx -force_html %f; else (@X11_WWW@ %f &); fi
--	View=%view{ascii} lynx -dump -force_html %f; 
--	Run with AppletViewer=appletviewer %f
--	View with @X11_WWW@=@X11_WWW@ file://%f
-+	Open=if [ x$DISPLAY = x ]; then lynx -force_html '%d/%p'; else (@X11_WWW@ '%d/%p' &); fi
-+	View=%view{ascii} lynx -dump -force_html '%d/%p'; 
-+	Run with AppletViewer=appletviewer '%d/%p'
-+	View with @X11_WWW@=@X11_WWW@ file://'%d/%p'
- 
- # Microsoft Word Document
--regex/\.([Dd]oc|DOC)$
--	#View=%view{ascii} catdoc -w %f
--	View=%view{ascii} word2x -f text %f -
--type/Microsoft Word Document
--	#View=%view{ascii} catdoc -w %f
--	View=%view{ascii} word2x -f text %f -
-+# regex/\.([Dd]oc|DOC)$
-+# 	#View=%view{ascii} catdoc -w '%d/%p'
-+# 	View=%view{ascii} word2x -f text '%d/%p' -
-+# type/Microsoft Word Document
-+# 	#View=%view{ascii} catdoc -w '%d/%p'
-+# 	View=%view{ascii} word2x -f text '%d/%p' -
-  
-@@ -358,3 +358,3 @@
- type/FrameMaker
--	Open=fmclient -f %f
-+	Open=fmclient -f '%d/%p'
- 
-@@ -362,5 +362,5 @@
- regex/\.([Dd]vi|DVI)$
--	Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
--	View=%view{ascii} dvi2tty %f
--	Convert file to Postscript=dvips %f
-+	Open=if [ x$DISPLAY = x ]; then dvisvga '%d/%p'; else (xdvi '%d/%p' &); fi
-+	View=%view{ascii} dvi2tty '%d/%p'
-+	Convert file to Postscript=dvips '%d/%p'
- 
-@@ -368,5 +368,5 @@
- regex/\.([Tt]ex|TEX|TeX)$
--	Open=%var{EDITOR:vi} %f
--	TeX this file=tex %f
--	LaTeX this file=latex %f
-+	Open=%var{EDITOR:vi} '%d/%p'
-+	TeX this file=tex '%d/%p'
-+	LaTeX this file=latex '%d/%p'
- 
-@@ -376,8 +376,8 @@
- shell/^RMAIL$
--	Start Emacs on this RMAIL file=emacs %f
--	Open=emacs %f
-+	Start Emacs on this RMAIL file=emacs '%d/%p'
-+	Open=emacs '%d/%p'
- 
- type/mail
--	Open=elm -f %f
--	View=%view{ascii} mcmfmt < %f
-+	Open=elm -f '%d/%p'
-+	View=%view{ascii} mcmfmt < '%d/%p'
- 
-@@ -388,3 +388,3 @@
- regex/[Mm]akefile
--	Open=make -f %f %{Enter parameters}
-+	Open=make -f '%d/%p' %{Enter parameters}
- 
-@@ -396,8 +396,8 @@
- type/executable
--	Open=./%f
-+	Open=./'%d/%p'
- 	View=%view
--	Drop=%f %q
--	Execute in XTerm=xterm -e %f &
--	View Required Libraries=%view{ascii} ldd %f
--	Strip binary=strip %f
-+	Drop='%d/%p' %q
-+	Execute in XTerm=xterm -e '%d/%p' &
-+	View Required Libraries=%view{ascii} ldd '%d/%p'
-+	Strip binary=strip '%d/%p'
- 
-@@ -405,4 +405,4 @@
- regex/\.(dbf|DBF)$
--       Open=%view{ascii} dbview %f
--       View=%view{ascii} dbview -b %f
-+       Open=%view{ascii} dbview '%d/%p'
-+       View=%view{ascii} dbview -b '%d/%p'
- 
-@@ -410,3 +410,3 @@
- regex/\.(rexx)|(rex)|(cmd)$
--       Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
-+       Open=rexx '%d/%p' %{Enter parameters};echo "Press ENTER";read y
- 
-@@ -418,12 +418,12 @@
- 	Open=%cd %p#utar
--	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
--	Extract=gzip -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} gzip -dc '%d/%p' 2>/dev/null | tar tvvf -
-+	Extract=gzip -dc '%d/%p' 2>/dev/null | tar xf -
- regex/\.tar\.bz$
- 	# Open=%cd %p#utar
--	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
--	Extract=bzip -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} bzip -dc '%d/%p' 2>/dev/null | tar tvvf -
-+	Extract=bzip -dc '%d/%p' 2>/dev/null | tar xf -
- regex/\.tar\.bz2$
- 	Open=%cd %p#utar
--	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
--	Extract=bzip2 -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} bzip2 -dc '%d/%p' 2>/dev/null | tar tvvf -
-+	Extract=bzip2 -dc '%d/%p' 2>/dev/null | tar xf -
- 
-@@ -432,4 +432,4 @@
- 	# Open=%cd %p#utar
--	View=%view{ascii} freeze -dc %f 2>/dev/null | tar tvvf -
--	Extract=freeze -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} freeze -dc '%d/%p' 2>/dev/null | tar tvvf -
-+	Extract=freeze -dc '%d/%p' 2>/dev/null | tar xf -
- 
-@@ -438,4 +438,4 @@
- 	Open=%cd %p#utar
--	View=%view{ascii} tar tvvf %f
--	Extract=tar xf %f
-+	View=%view{ascii} tar tvvf '%d/%p'
-+	Extract=tar xf '%d/%p'
- 
-@@ -444,6 +444,6 @@
- 	Open=%cd %p#uzip
--	View=%view{ascii} unzip -v %f
--	Extract=unzip %f
--	Extract (with flags)=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I %f; fi
--	Unzip=unzip %f '*'
-+	View=%view{ascii} unzip -v '%d/%p'
-+	Extract=unzip '%d/%p'
-+	Extract (with flags)=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I '%d/%p'; fi
-+	Unzip=unzip '%d/%p' '*'
- 
-@@ -452,4 +452,4 @@
- 	Open=%cd %p#uzoo
--	View=%view{ascii} zoo l %f
--	Extract=zoo x %f '*'
-+	View=%view{ascii} zoo l '%d/%p'
-+	Extract=zoo x '%d/%p' '*'
- 	
-@@ -458,5 +458,5 @@
- 	Open=%cd %p#ulha
--	View=%view{ascii} lharc l %f
--	Extract=lharc x %f '*'
--	Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi
-+	View=%view{ascii} lharc l '%d/%p'
-+	Extract=lharc x '%d/%p' '*'
-+	Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I '%d/%p'; fi
- 
-@@ -465,5 +465,5 @@
- 	Open=%cd %p#uarj
--	View=%view{ascii} unarj l %f
--	Extract=unarj x %f '*'
--	Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi
-+	View=%view{ascii} unarj l '%d/%p'
-+	Extract=unarj x '%d/%p' '*'
-+	Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I '%d/%p'; fi
- 
-@@ -472,5 +472,5 @@
- 	Open=%cd %p#uha
--	View=%view{ascii} ha lf %f
--	Extract=ha xy %f '*'
--	Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi
-+	View=%view{ascii} ha lf '%d/%p'
-+	Extract=ha xy '%d/%p' '*'
-+	Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I '%d/%p'; fi
- 
-@@ -479,5 +479,5 @@
- 	Open=%cd %p#urar
--	View=%view{ascii} rar v -c- %f
--	Extract=rar x -c- %f '*'
--	Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi
-+	View=%view{ascii} rar v -c- '%d/%p'
-+	Extract=rar x -c- '%d/%p' '*'
-+	Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I '%d/%p'; fi
- 
-@@ -486,12 +486,12 @@
- 	Open=%cd %d/%p#ucpio/
--	View=%view{ascii} compress -dc '%f' | cpio -ictv
--	Extract=compress -dc '%f' | cpio -ic
-+	View=%view{ascii} compress -dc '%d/%p' | cpio -ictv
-+	Extract=compress -dc '%d/%p' | cpio -ic
- shell/.cpio.gz
- 	Open=%cd %d/%p#ucpio/
--	View=%view{ascii} gzip -dc '%f' | cpio -ictv
--	Extract=gzip -dc '%f' | cpio -ic
-+	View=%view{ascii} gzip -dc '%d/%p' | cpio -ictv
-+	Extract=gzip -dc '%d/%p' | cpio -ic
- shell/.cpio
- 	Open=%cd %d/%p#ucpio/
--	View=%view{ascii} cat '%f' | cpio -ictv
--	Extract=cat '%f' | cpio -ic
-+	View=%view{ascii} cat '%d/%p' | cpio -ictv
-+	Extract=cat '%d/%p' | cpio -ic
- 
-@@ -499,6 +499,6 @@
- type/gzip
--	Open=gzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} gzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
--	Uncompress=gunzip %f
-+	Open=gzip -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} gzip -dc '%d/%p' 2>/dev/null
-+	Edit=I=`date +%%s`; export I; gzip -cd '%d/%p' >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > '%d/%p'; rm -f /tmp/gzed.$I
-+	Uncompress=gunzip '%d/%p'
- 
-@@ -506,6 +506,6 @@
- type/bzip2
--	Open=bzip2 -dc %f | %var{PAGER:more}
--	View=%view{ascii} bzip2 -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; bzip2 -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
--	Uncompress=bunzip2 %f
-+	Open=bzip2 -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} bzip2 -dc '%d/%p' 2>/dev/null
-+	Edit=I=`date +%%s`; export I; bzip2 -cd '%d/%p' >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > '%d/%p'; rm -f /tmp/bzed.$I
-+	Uncompress=bunzip2 '%d/%p'
- 
-@@ -513,6 +513,6 @@
- type/bzip
--	Open=bzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} bzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; bzip -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
--	Uncompress=bunzip %f
-+	Open=bzip -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} bzip -dc '%d/%p' 2>/dev/null
-+	Edit=I=`date +%%s`; export I; bzip -cd '%d/%p' >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > '%d/%p'; rm -f /tmp/bzed.$I
-+	Uncompress=bunzip '%d/%p'
- 
-@@ -520,5 +520,5 @@
- type/compress
--	Open=gzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} gzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
-+	Open=gzip -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} gzip -dc '%d/%p' 2>/dev/null
-+	Edit=I=`date +%%s`; export I; gzip -cd '%d/%p' >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > '%d/%p'; rm -f /tmp/gzed.$I
- 
-@@ -527,4 +527,4 @@
- 	Open=%cd %p#uar
--	#Open=%view{ascii} ar tv %f
--	View=%view{ascii} nm %f
-+	#Open=%view{ascii} ar tv '%d/%p'
-+	View=%view{ascii} nm '%d/%p'
- 
-@@ -540,3 +540,3 @@
- 	Open=%cd %p#lslR
--	View=%view{ascii} gunzip -c %f
-+	View=%view{ascii} gunzip -c '%d/%p'
- 
-@@ -554,5 +554,5 @@
- 	Open=%cd %p#rpm
--	Install this RPM=rpm -i %f
--	Rebuild this RPM=rpm --rebuild %f
--	Check signature=rpm --checksig %f
-+	Install this RPM=rpm -i '%d/%p'
-+	Rebuild this RPM=rpm --rebuild '%d/%p'
-+	Check signature=rpm --checksig '%d/%p'
- 
-@@ -561,5 +561,5 @@
- 	Open=%cd %p#rpm
--	Install this RPM=rpm -i %f
--	Upgrade this RPM=rpm -U %f
--	Check signature=rpm --checksig %f
-+	Install this RPM=rpm -i '%d/%p'
-+	Upgrade this RPM=rpm -U '%d/%p'
-+	Check signature=rpm --checksig '%d/%p'
- 
-@@ -568,3 +568,3 @@
- 	Open=%cd %p#deb
--	View=%view{ascii} dpkg-deb -c %f
-+	View=%view{ascii} dpkg-deb -c '%d/%p'
- 
---- lib/mc.csh.in.orig	Sat Oct  9 15:08:10 1999
-+++ lib/mc.csh.in	Sat Oct  9 15:08:28 1999
-@@ -1,2 +1,2 @@
--alias mc 'setenv MC `@prefix@/bin/mc -P \!*`; cd $MC; unsetenv MC'
-+alias mc 'setenv MC `@prefix@/bin/midc -P \!*`; cd $MC; unsetenv MC'
- 
---- lib/mc.sh.in.orig	Fri Apr 20 13:13:33 2001
-+++ lib/mc.sh.in	Fri Apr 20 13:14:28 2001
-@@ -5,3 +5,3 @@
- 	MC=$HOME/.mc/tmp/mc-$$
--	@prefix@/bin/mc -P "$@" > "$MC"
-+	@prefix@/bin/midc -P "$@" > "$MC"
- 	cd "`cat $MC`"
++	Open=ggv %f&
+ 	View=%view{ascii} ps2ascii %f
+--- gnome/mc.keys.in.in.orig	Tue Feb 16 01:29:18 1999
++++ gnome/mc.keys.in.in	Fri Feb 19 01:47:31 1999
+@@ -96,7 +96,7 @@
+ 	icon-filename=@icondir@/tex.xpm
+ 
+ application/postscript:
+-	open=gv %f
++	open=ggv %f
+ 	icon-filename=@icondir@/gnome-application-postscript.png
+ 
+ application/x-object-file:
diff --git a/misc/mc/files/patch-ai b/misc/mc/files/patch-ai
index d18927146f8e..805fc55bb9ab 100644
--- a/misc/mc/files/patch-ai
+++ b/misc/mc/files/patch-ai
@@ -1,10 +1,10 @@
---- vfs/extfs/uzip.orig	Wed Mar  7 18:34:21 2001
-+++ vfs/extfs/uzip	Fri Apr 20 12:42:02 2001
-@@ -17,5 +17,5 @@
- # Location of the zip program
--my $app_zip = '/usr/bin/zip';
-+my $app_zip = '/usr/local/bin/zip';
- # Location of the unzip program
--my $app_unzip = '/usr/bin/unzip';
-+my $app_unzip = '/usr/local/bin/unzip';
- # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
+--- vfs/ftpfs.c.orig	Sat Mar 18 07:43:43 2000
++++ vfs/ftpfs.c	Mon Mar 20 10:32:18 2000
+@@ -57,6 +57,7 @@
+ /* Namespace pollution: horrible */
+ 
+ #include <netdb.h>		/* struct hostent */
++#include <sys/types.h>
+ #include <sys/socket.h>		/* AF_INET */
+ #include <netinet/in.h>		/* struct in_addr */
+ #ifdef HAVE_SETSOCKOPT
diff --git a/misc/mc/files/patch-aj b/misc/mc/files/patch-aj
new file mode 100644
index 000000000000..cd20a6ef9302
--- /dev/null
+++ b/misc/mc/files/patch-aj
@@ -0,0 +1,11 @@
+--- gnome/gnome-open-dialog.c.orig	Mon May 29 16:56:28 2000
++++ gnome/gnome-open-dialog.c	Wed May 31 12:30:36 2000
+@@ -359,7 +359,7 @@
+         gtk_clist_set_column_auto_resize (GTK_CLIST (retval), 0, TRUE);
+ 
+ 	/* set up the apps */
+-	prefix = gnome_unconditional_datadir_file ("gnome/apps");
++	prefix = gnome_unconditional_datadir_file ("apps");
+ 	node = read_directory (prefix);
+ 	gnome_open_dialog_generate_tree_helper (GTK_CTREE (retval), NULL, node);
+ 	gtk_ctree_expand_recursive (GTK_CTREE (retval), NULL);
diff --git a/misc/mc/files/patch-ak b/misc/mc/files/patch-ak
new file mode 100644
index 000000000000..ec3b5bf8560e
--- /dev/null
+++ b/misc/mc/files/patch-ak
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-ak,v 1.1 2002-08-05 21:26:26 fjoe Exp $
+
+--- idl/Makefile.in.orig	Fri Aug 24 11:05:07 2001
++++ idl/Makefile.in	Tue Sep 11 18:32:49 2001
+@@ -157,7 +157,7 @@
+ 
+ IDLFILES = FileManager.idl
+ 
+-@GNOME_TRUE@idldir = $(prefix)/share/idl
++@GNOME_TRUE@idldir = $(datadir)/idl
+ 
+ @GNOME_TRUE@idl_DATA = $(IDLFILES)
+ 
diff --git a/misc/mc/files/patch-am b/misc/mc/files/patch-am
deleted file mode 100644
index 805fc55bb9ab..000000000000
--- a/misc/mc/files/patch-am
+++ /dev/null
@@ -1,10 +0,0 @@
---- vfs/ftpfs.c.orig	Sat Mar 18 07:43:43 2000
-+++ vfs/ftpfs.c	Mon Mar 20 10:32:18 2000
-@@ -57,6 +57,7 @@
- /* Namespace pollution: horrible */
- 
- #include <netdb.h>		/* struct hostent */
-+#include <sys/types.h>
- #include <sys/socket.h>		/* AF_INET */
- #include <netinet/in.h>		/* struct in_addr */
- #ifdef HAVE_SETSOCKOPT
diff --git a/misc/mc/files/patch-an b/misc/mc/files/patch-an
deleted file mode 100644
index 585017fe3f0e..000000000000
--- a/misc/mc/files/patch-an
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/main.c.orig	Wed Apr 11 07:07:49 2001
-+++ src/main.c	Fri Apr 20 12:39:44 2001
-@@ -1361,3 +1361,3 @@
- #ifdef USE_INTERNAL_EDIT
--    {' ',  N_("Menu edi&Tor edit"),		'T', edit_user_menu_cmd}
-+/* XXX: only appears in gtkedit    {' ',  N_("Menu edi&Tor edit"),		'T', edit_user_menu_cmd} */
- #endif /* USE_INTERNAL_EDIT */
diff --git a/misc/mc/files/patch-lib::Makefile.in b/misc/mc/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..387edd01941c
--- /dev/null
+++ b/misc/mc/files/patch-lib::Makefile.in
@@ -0,0 +1,56 @@
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-lib::Makefile.in,v 1.1 2002-08-05 21:26:26 fjoe Exp $
+
+--- lib/Makefile.in.orig	Fri Aug 24 11:05:07 2001
++++ lib/Makefile.in	Tue Sep 11 18:29:09 2001
+@@ -156,8 +156,6 @@
+ undelfs_o = @undelfs_o@
+ 
+ mclibdir = $(libdir)/mc
+-suppbindir = $(mclibdir)/bin
+-tidir = $(mclibdir)/term
+ confdir = $(sysconfdir)
+ 
+ @CHARSET_TRUE@LIBFILES_ADD = mc.charsets
+@@ -181,8 +179,6 @@
+ noinst_SCRIPTS = tdiff
+ 
+ conf_DATA = mc.global
+-suppbin_SCRIPTS = mc.csh mc.sh
+-ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
+ 
+ DESKTOP_FILES = startup.links README.desktop
+ @GNOME_TRUE@desktopdir = $(mclibdir)/desktop-scripts
+@@ -205,11 +201,10 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = mc.ext mc.sh mc.csh
+-SCRIPTS = $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
++SCRIPTS = $(noinst_SCRIPTS)
+ 
+ DIST_SOURCES =
+-DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
+-	$(ti_DATA)
++DATA = $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
+ 
+ DIST_COMMON = Makefile.am Makefile.in mc.csh.in mc.ext.in mc.sh.in
+ all: all-am
+@@ -348,7 +343,7 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ 
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(suppbindir) $(DESTDIR)$(confdir) $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir) $(DESTDIR)$(tidir)
++	$(mkinstalldirs) $(DESTDIR)$(confdir) $(DESTDIR)$(desktopdir) $(DESTDIR)$(mclibdir)
+ 
+ install: install-am
+ install-exec: install-exec-am
+@@ -389,8 +384,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-confDATA install-desktopDATA install-mclibDATA \
+-	install-suppbinSCRIPTS install-tiDATA
++install-data-am: install-confDATA install-desktopDATA install-mclibDATA
+ 
+ install-exec-am:
+ 
diff --git a/misc/mc/files/patch-lib::mc.lib b/misc/mc/files/patch-lib::mc.lib
new file mode 100644
index 000000000000..48465ac408bf
--- /dev/null
+++ b/misc/mc/files/patch-lib::mc.lib
@@ -0,0 +1,36 @@
+--- lib/mc.lib.orig	Tue Aug  6 03:57:05 2002
++++ lib/mc.lib	Tue Aug  6 03:35:06 2002
+@@ -87,6 +87,16 @@
+ end=\e[8~
+ pgdn=\e[6~
+ pgup=\e[5~
++up=\eOA
++down=\eOB
++left=\eOD
++right=\eOC
++home=\eOH
++end=\eOF
++delete=\e[3~
++kpplus=\eOk
++kpminus=\eOm
++kpasterix=\eOj
+ 
+ [terminal:xterm-color]
+ insert=\e[2~
+@@ -119,6 +129,16 @@
+ end=\e[8~
+ pgdn=\e[6~
+ pgup=\e[5~
++up=\eOA
++down=\eOB
++left=\eOD
++right=\eOC
++home=\eOH
++end=\eOF
++delete=\e[3~
++kpplus=\eOk
++kpminus=\eOm
++kpasterix=\eOj
+ 
+ [terminal:ibmpc3]
+ f11=\e[Y
diff --git a/misc/mc/files/patch-src::treestore.h b/misc/mc/files/patch-src::treestore.h
new file mode 100644
index 000000000000..4d33854591fb
--- /dev/null
+++ b/misc/mc/files/patch-src::treestore.h
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/misc/mc/files/Attic/patch-src::treestore.h,v 1.1 2002-08-05 21:26:26 fjoe Exp $
+
+--- src/treestore.h	2001/12/14 08:39:52	1.1
++++ src/treestore.h	2001/12/14 08:40:21
+@@ -1,6 +1,8 @@
+ #ifndef __TREE_STORE_H
+ #define __TREE_STORE_H
+ 
++#include <glib.h>
++
+ /* Default filenames for the tree */
+ 
+ #ifdef OS2_NT
diff --git a/misc/mc/files/patch-vfs::extfs::uzip b/misc/mc/files/patch-vfs::extfs::uzip
new file mode 100644
index 000000000000..d18927146f8e
--- /dev/null
+++ b/misc/mc/files/patch-vfs::extfs::uzip
@@ -0,0 +1,10 @@
+--- vfs/extfs/uzip.orig	Wed Mar  7 18:34:21 2001
++++ vfs/extfs/uzip	Fri Apr 20 12:42:02 2001
+@@ -17,5 +17,5 @@
+ # Location of the zip program
+-my $app_zip = '/usr/bin/zip';
++my $app_zip = '/usr/local/bin/zip';
+ # Location of the unzip program
+-my $app_unzip = '/usr/bin/unzip';
++my $app_unzip = '/usr/local/bin/unzip';
+ # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 5206eb604288..4aae9411d6a2 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,7 +1,8 @@
 bin/mcmfmt
+bin/mc
+bin/mcedit
 bin/midc
 etc/mc.global
-sbin/mcserv
 share/locale/az/LC_MESSAGES/mc.mo
 share/locale/ca/LC_MESSAGES/mc.mo
 share/locale/cs/LC_MESSAGES/mc.mo
@@ -32,10 +33,11 @@ share/locale/uk/LC_MESSAGES/mc.mo
 share/locale/wa/LC_MESSAGES/mc.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
+share/mc/FAQ
+share/mc/bin/mcfn_install
 share/mc/cedit.menu
-share/mc/desktop-scripts/README.desktop
-share/mc/desktop-scripts/startup.links
 share/mc/edit.indent.rc
+share/mc/edit.spell.rc
 share/mc/extfs/README
 share/mc/extfs/a
 share/mc/extfs/apt
@@ -68,9 +70,13 @@ share/mc/mc.ext
 share/mc/mc.hint
 share/mc/mc.hint.cs
 share/mc/mc.hint.es
+share/mc/mc.hint.hu
 share/mc/mc.hint.it
+share/mc/mc.hint.nl
 share/mc/mc.hint.pl
 share/mc/mc.hint.ru
+share/mc/mc.hint.uk
+share/mc/mc.hint.zh
 share/mc/mc.hlp
 share/mc/mc.hlp.hu
 share/mc/mc.lib
@@ -88,17 +94,18 @@ share/mc/syntax/mail.syntax
 share/mc/syntax/makefile.syntax
 share/mc/syntax/ml.syntax
 share/mc/syntax/nroff.syntax
+share/mc/syntax/octave.syntax
 share/mc/syntax/pascal.syntax
 share/mc/syntax/perl.syntax
+share/mc/syntax/po.syntax
 share/mc/syntax/python.syntax
 share/mc/syntax/sh.syntax
+share/mc/syntax/slang.syntax
 share/mc/syntax/smalltalk.syntax
 share/mc/syntax/swig.syntax
 share/mc/syntax/texinfo.syntax
 share/mc/syntax/unknown.syntax
-@dirrm share/pixmaps/mc
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @dirrm share/mc/syntax
 @dirrm share/mc/extfs
-@dirrm share/mc/desktop-scripts
+@dirrm share/mc/bin
 @dirrm share/mc