Various patches (mainly shared library revision changes) for those

ports that depend on GNOME and need to change for 1.4

17 files changed, 605 insertions, 395 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 15eac6e6c350..ed8e6a8f2d8e 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.5.51
+PORTVERSION=	4.5.54
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/mc
@@ -31,11 +31,15 @@ CONFIGURE_ARGS=	--with-slang --without-gnome --with-edit
 CONFIGURE_ARGS=	--with-ncurses --without-gnome --without-edit
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
-MAN1=		midc.1
+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:
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index e787c0ca94cf..6fcebadbbc72 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.51.tar.gz) = c604292554887e9e6baba0828081b963
+MD5 (mc-4.5.54.tar.gz) = 46bd6d7e25fc3f509c5d8d063fa701eb
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index 23448d9ce38b..910b9596d2f5 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,163 +1,43 @@
---- configure.orig	Mon Dec  6 15:49:54 1999
-+++ configure	Wed Jan  5 23:31:22 2000
-@@ -3383,15 +3383,15 @@
- fi
- 
-         
--	USE_INCLUDED_LIBINTL=yes
-+#	USE_INCLUDED_LIBINTL=yes
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
-         DATADIRNAME=share
--	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+	INTLDEPS='-lintl'
- 	INTLLIBS=$INTLDEPS
- 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
--        nls_cv_header_intl=intl/libintl.h
--        nls_cv_header_libgt=intl/libgettext.h
-+#        nls_cv_header_intl=intl/libintl.h
-+#        nls_cv_header_libgt=intl/libgettext.h
-       fi
- 
-             if test "$XGETTEXT" != ":"; then
-@@ -10049,7 +10049,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+--- 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
- #line 10055 "configure"
- #include "confdefs.h"
-@@ -10290,7 +10290,7 @@
- #define HAVE_SYSTEM_SLANG 1
- EOF
+@@ -10301,3 +10301,3 @@
  
 -	    LSLANG="-lslang"
 +	    LSLANG="-lslang -ltermcap"
  	    screen_manager="SLang (system-installed library)"
- 	    echo "$ac_t""Using system installed SLang library" 1>&6
- 	    rm -f slang/slang.h
-@@ -10736,13 +10736,13 @@
-     
-     if $search_ncurses
-     then
--        if test -f /usr/include/ncurses.h
-+        if test -f /usr/local/include/ncurses/ncurses.h
- 	then
--	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-- 	    CURSES_LIBS="-lncurses"
--	    CURSES_INCLUDEDIR=""
-+	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
-+ 	    CURSES_LIBS="-L/usr/local/lib -lncurses"
-+	    CURSES_INCLUDEDIR="-I/usr/local/include/ncurses"
- 	    search_ncurses=false
--	    screen_manager="ncurses on /usr/include"
-+	    screen_manager="ncurses on /usr/local/include/ncurses"
-             cat >> confdefs.h <<\EOF
- #define HAS_CURSES 1
- EOF
-@@ -10758,13 +10758,13 @@
-     
-     if $search_ncurses
-     then
--        if test -f /usr/include/ncurses/ncurses.h
-+        if test -f /usr/include/ncurses.h
- 	then
--	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
-- 	    CURSES_LIBS="-lncurses"
--	    CURSES_INCLUDEDIR="-I/usr/include/ncurses"
-+	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-+ 	    CURSES_LIBS="-lncurses -lmytinfo"
-+	    CURSES_INCLUDEDIR=""
- 	    search_ncurses=false
--	    screen_manager="ncurses on /usr/include/ncurses"
-+	    screen_manager="ncurses on /usr/include"
-             cat >> confdefs.h <<\EOF
- #define HAS_CURSES 1
- EOF
-@@ -10780,13 +10780,13 @@
-     
-     if $search_ncurses
-     then
--        if test -f /usr/local/include/ncurses.h
-+        if test -f /usr/include/ncurses/ncurses.h
- 	then
--	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
-- 	    CURSES_LIBS="-L/usr/local/lib -lncurses"
--	    CURSES_INCLUDEDIR="-I/usr/local/include"
-+	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
-+ 	    CURSES_LIBS="-lncurses"
-+	    CURSES_INCLUDEDIR="-I/usr/include/ncurses"
- 	    search_ncurses=false
--	    screen_manager="ncurses on /usr/local"
-+	    screen_manager="ncurses on /usr/include/ncurses"
-             cat >> confdefs.h <<\EOF
- #define HAS_CURSES 1
- EOF
-@@ -10802,13 +10802,13 @@
-     
-     if $search_ncurses
-     then
--        if test -f /usr/local/include/ncurses/ncurses.h
-+        if test -f /usr/local/include/ncurses.h
- 	then
--	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
-- 	    CURSES_LIBS="-L/usr/local/lib -L/usr/local/lib/ncurses -lncurses"
--	    CURSES_INCLUDEDIR="-I/usr/local/include/ncurses"
-+	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
-+ 	    CURSES_LIBS="-L/usr/local/lib -lncurses"
-+	    CURSES_INCLUDEDIR="-I/usr/local/include"
- 	    search_ncurses=false
--	    screen_manager="ncurses on /usr/local/include/ncurses"
-+	    screen_manager="ncurses on /usr/local"
-             cat >> confdefs.h <<\EOF
- #define HAS_CURSES 1
- EOF
-@@ -10867,6 +10867,8 @@
- 	fi
-     fi
- 
-+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
-+LIBS="$LIBS $CURSES_LIBS"
- 
-                 if $search_ncurses 
-     then
-@@ -11071,7 +11073,7 @@
- #define HAVE_SYSTEM_SLANG 1
- EOF
+@@ -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)"
- 	    echo "$ac_t""Using system installed SLang library" 1>&6
- 	    rm -f slang/slang.h
-@@ -11688,7 +11690,7 @@
- vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha 
- vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+@@ -11551,3 +11551,3 @@
  
 -doc/mc.1 doc/mcedit.1 doc/mcserv.8
 +doc/mc.1 doc/mcserv.8
  
- intl/Makefile po/Makefile.in
-  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-@@ -11932,7 +11934,7 @@
- vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha 
- vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
- 
--doc/mc.1 doc/mcedit.1 doc/mcserv.8
-+doc/mc.1 doc/mcserv.8
+@@ -11834,6 +11834,6 @@
  
- intl/Makefile po/Makefile.in
- "}
-@@ -12237,10 +12239,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
 -  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
+-  [/$]*) 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
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index 1b276df3f7bb..ccdfe76515dd 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,36 +1,7 @@
---- vfs/Make-mc.in.orig	Tue Mar 30 08:34:34 1999
-+++ vfs/Make-mc.in	Wed Apr  7 23:37:58 1999
-@@ -13,8 +13,9 @@
- DEFS     = $(XDEFS)
- LIBS     = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
- INSTALL  = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- AR = @AR@
- 
- #
-@@ -185,7 +186,7 @@
- 
- install: @mcserv@ install.extfs
- 	-(if test x@mcserv@ != x; then \
--	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
-+	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
- 	fi)
- 
- install.extfs:
-@@ -194,11 +195,11 @@
- 	          $(DESTDIR)$(extfsdir)/$$I; \
- 	done
- 	for I in $(EXTFS_CONST) ; do \
--	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+	    $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
- 	             $(DESTDIR)$(extfsdir)/$$I; \
- 	done
- 	for I in $(EXTFS_OUT) ; do \
--	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+	    $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
- 	             $(DESTDIR)$(extfsdir)/$$I; \
- 	done
+--- 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
  
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index 88063ea4e492..37203a444a75 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,8 +1,6 @@
---- Make.common.in.orig	Tue Mar 30 08:34:33 1999
-+++ Make.common.in	Wed Apr  7 23:40:05 1999
-@@ -17,9 +17,10 @@
- 
- builddir   = @builddir@
+--- 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@
@@ -10,14 +8,7 @@
 -libdir	   = @libdir@
 +libdir	   = @datadir@
  mandir     = @mandir@
- gnomeicondir = @gnomeicondir@
- xv_bindir  = @xv_bindir@
-@@ -64,7 +65,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 = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
-+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
- XLDFLAGS = @LDFLAGS@
- XDEFS = @DEFS@
- XLIBS = @LIBS@
+@@ -60,2 +61,3 @@
+ XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. \
++	-DSBINDIR=\""$(sbindir)/"\" \
+ 	-DBINDIR=\""$(bindir)/"\" \
diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index 741b641b2220..460d021f2e9b 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,95 +1,72 @@
---- Makefile.in.orig	Wed May 10 17:58:00 2000
-+++ Makefile.in	Tue May 16 15:45:21 2000
-@@ -5,14 +5,15 @@
- @MCFGR@@MCF@
+--- Makefile.in.orig	Sun Mar 18 12:20:52 2001
++++ Makefile.in	Wed Mar 28 18:16:22 2001
+@@ -159,3 +159,3 @@
  
- foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
--unixdirs=intl $(codedirs) doc-gnome @POSUB@
-+codedirs=vfs lib doc slang gtkedit edit src syntax
-+unixdirs=intl $(codedirs) @POSUB@
- alldirs=$(unixdirs) $(foreigndirs) 
- subdirs=$(alldirs)
+-SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons 	idl syntax intl doc-gnome po pc
++SUBDIRS = vfs lib doc gtkedit src gnome new_icons syntax intl po
  
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -174,3 +174,3 @@
+ 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 @@
  
- DISTMAIN =	configure configure.in NEWS README INSTALL INSTALL.FAST \
- 		Makefile.in FAQ COPYING create_vcs install-sh \
-@@ -45,7 +46,7 @@
- install: installdirs
- 	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
--	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-+	$(INSTALL_SCRIPT) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
- 	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
- 	@echo "Please verify that the configuration values are correctly"
- 	@echo "set in the mc.ext file in $(mclibdir)"
-@@ -57,9 +58,8 @@
- installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
+-man_MANS = mc.1 mcedit.1 mcserv.8
++man_MANS = midc.1 mcedit.1 mcserv.8
  
- mcfninstall:
- 	-/bin/sh ./mcfn_install
---- src/Makefile.in.orig	Wed May 10 17:58:02 2000
-+++ src/Makefile.in	Tue May 16 15:45:43 2000
-@@ -130,7 +130,7 @@
- 	-$(RMF) $(srcdir)/Makefile
+@@ -185,2 +185,5 @@
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++midc.1:	mc.1
++	cp mc.1 midc.1
  
- install: mc mcmfmt @saver@
--	$(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)/$(libprefix)mc.hlp 
+--- 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
  
---- doc/Makefile.in.orig	Wed May 10 17:58:01 2000
-+++ doc/Makefile.in	Tue May 16 15:47:12 2000
-@@ -17,7 +17,7 @@
- install:
- 	$(MKINSTALLDIRS) $(DESTDIR)/$(man1dir)
- 	$(MKINSTALLDIRS) $(DESTDIR)/$(man8dir)
--	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext)
-+	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)midc.$(manext)
- 	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
- 	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
+@@ -188,6 +184,5 @@
+ CONFIG_CLEAN_FILES =  mc.ext mc.sh mc.csh
+-SCRIPTS =  $(noinst_SCRIPTS) $(suppbin_SCRIPTS)
++SCRIPTS =  $(noinst_SCRIPTS)
  
---- lib/Makefile.in.orig	Wed May 10 17:58:01 2000
-+++ lib/Makefile.in	Tue May 16 15:48:15 2000
-@@ -12,8 +12,8 @@
- # Distribution variables
- #
+-DATA =  $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA) \
+-$(ti_DATA)
++DATA =  $(conf_DATA) $(desktop_DATA) $(mclib_DATA) $(noinst_DATA)
  
--LIBFILES_IN = mc.ext.in mc-gnome.ext.in
--LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh
-+LIBFILES_IN = mc.ext.in
-+LIBFILES_OUT = mc.ext mc.csh mc.sh
- LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu cedit.menu edit.indent.rc
- SUPPBIN_IN = mc.csh.in mc.sh.in
- SUPPBIN_OUT =  mc.csh mc.sh
-@@ -62,7 +62,7 @@
- 	for I in $(LIBFILES_OUT); \
- 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
- 	for I in $(SUPPBIN_OUT); \
--	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
-+	do $(INSTALL_DATA) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
- 	for I in $(TIFILES); \
- 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
- 	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
---- edit/Makefile.in.orig	Wed May 10 17:58:01 2000
-+++ edit/Makefile.in	Tue May 16 15:48:47 2000
-@@ -58,7 +58,7 @@
+@@ -340,4 +335,4 @@
  
- mcedit:
- 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
--	$(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit
-+	$(LN_S) midc $(DESTDIR)$(bindir)/$(binprefix)mcedit
+-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)
  
- showlibdep:
- 	@echo 'OBJS="$(EDITOBJS)"'
+--- src/Makefile.in.orig	Wed Apr 11 07:07:47 2001
++++ src/Makefile.in	Fri Apr 20 14:03:52 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@
diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag
index e0caedd36247..4c00a62b71d4 100644
--- a/misc/mc/files/patch-ag
+++ b/misc/mc/files/patch-ag
@@ -1,120 +1,473 @@
---- lib/mc.ext.in.orig	Wed May 10 17:58:01 2000
-+++ lib/mc.ext.in	Tue May 16 15:59:31 2000
-@@ -230,26 +230,26 @@
+--- 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'
  
- # Manual page
+@@ -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'
- 	Icon=man.xpm
  
- # Troff with me macros.
+@@ -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'
- 	Icon=man.xpm
  
- # Troff with ms macros.
+@@ -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'
- 	Icon=man.xpm
  
- # Manual page - compressed
+@@ -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@
- 	Icon=man.xpm
  
  regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
-@@ -258,8 +258,8 @@
- 	Icon=man.xpm
+-	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@
- 	Icon=man.xpm
  
- regex/(read\.?me$)|(README)
-@@ -318,11 +318,11 @@
- 	Icon=xpm.xpm
+@@ -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'
  
  include/image-options
 -	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi
-+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ElectricEyes %f &); fi
- 	View=%view{ascii} identify %f
- 	#View=%view{ascii} asciiview %f
- 	Set root window to this image=background-properties --setwallpaper %f &
+-	View=%view{ascii} identify %f
+-	#View=%view{ascii} asciiview %f
+-	Set root window to this image=background-properties --setwallpaper %f &
 -	Display this file=ee %f &
-+	Display this file=ElectricEyes %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' &
+ 
+@@ -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&
  
- ### Sound files ###
-@@ -390,14 +390,14 @@
- 	View with @X11_WWW@=@X11_WWW@ file://%f
+ regex/\.(rm|RM|Rm|ram|RAM|Ram)$
+-	Open=realplay %f&
++	Open=realplay '%d/%p'&
+ 
+@@ -329,5 +329,5 @@
+ 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 -
--	Icon=word.xpm
 -type/Microsoft Word Document
 -	#View=%view{ascii} catdoc -w %f
 -	View=%view{ascii} word2x -f text %f -
--	Icon=word.xpm
 +# regex/\.([Dd]oc|DOC)$
-+# 	#View=%view{ascii} catdoc -w %f
-+# 	View=%view{ascii} word2x -f text %f -
-+# 	Icon=word.xpm
++# 	#View=%view{ascii} catdoc -w '%d/%p'
++# 	View=%view{ascii} word2x -f text '%d/%p' -
 +# type/Microsoft Word Document
-+# 	#View=%view{ascii} catdoc -w %f
-+# 	View=%view{ascii} word2x -f text %f -
-+# 	Icon=word.xpm
++# 	#View=%view{ascii} catdoc -w '%d/%p'
++# 	View=%view{ascii} word2x -f text '%d/%p' -
   
- # Framemaker
+@@ -358,3 +358,3 @@
  type/FrameMaker
-@@ -542,7 +542,7 @@
- shell/.cpio.Z
+-	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
+-	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
- 	Icon=compressed.xpm
  shell/.cpio.gz
  	Open=%cd %d/%p#ucpio/
-@@ -590,7 +590,7 @@
- regex/\.s?a$
+-	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
+-	#Open=%view{ascii} ar tv %f
 -	View=%view{ascii} nm %f
++	#Open=%view{ascii} ar tv '%d/%p'
 +	View=%view{ascii} nm '%d/%p'
- 	Icon=a.xpm
  
- # .so libraries are not manual pages
+@@ -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	Sat Oct  9 15:08:13 1999
-+++ lib/mc.sh.in	Sat Oct  9 15:08:39 1999
-@@ -3,7 +3,7 @@
-         mkdir -p ~/.mc/tmp 2> /dev/null
- 	chmod 700 ~/.mc/tmp
- 	MC=~/.mc/tmp/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`"
- 	rm "$MC"
-         unset MC;
diff --git a/misc/mc/files/patch-ai b/misc/mc/files/patch-ai
index b0147eb27d03..d18927146f8e 100644
--- a/misc/mc/files/patch-ai
+++ b/misc/mc/files/patch-ai
@@ -1,11 +1,10 @@
---- vfs/extfs/uzip.in	Wed Sep 29 16:39:35 1999
-+++ vfs/extfs/uzip.in.new	Fri Dec  3 22:17:45 1999
-@@ -7,7 +7,7 @@
- #
- #
- 
--DZIP=/usr/bin
-+DZIP=@prefix@/bin
- XZIP="$DZIP/zip -g"
- XDZIP="$DZIP/zip -d"
- XUNZIP="$DZIP/unzip"
+--- 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/files/patch-an b/misc/mc/files/patch-an
index 81f0ef766e78..585017fe3f0e 100644
--- a/misc/mc/files/patch-an
+++ b/misc/mc/files/patch-an
@@ -1,20 +1,7 @@
---- src/main.c.orig	Fri May 19 17:15:10 2000
-+++ src/main.c	Mon May 22 11:36:20 2000
-@@ -1348,7 +1348,7 @@
-     { ' ', "", ' ', 0 },
-     { ' ', N_("&Extension file edit"),          'E', ext_cmd },
-     { ' ', N_("&Menu file edit"),               'M', menu_edit_cmd },
--    {' ',  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} */
- };
- 
- /* Must keep in sync with the constants in menu_cmd */
-@@ -3015,7 +3015,7 @@
-     }
-     
-     vfs_init ();
--    edit_init_file();
-+/* XXX: only appears in gtkedit??    edit_init_file(); */
-     
- #ifdef HAVE_X
-     /* NOTE: This call has to be before any our argument handling :) */
+--- 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-ao b/misc/mc/files/patch-ao
deleted file mode 100644
index 94d81f6a0c23..000000000000
--- a/misc/mc/files/patch-ao
+++ /dev/null
@@ -1,10 +0,0 @@
---- syntax/Makefile.in.orig	Fri May 19 17:15:17 2000
-+++ syntax/Makefile.in	Mon May 22 11:38:57 2000
-@@ -43,6 +43,7 @@
- 
- 
- install: Makefile
-+	mkdir -p $(DESTDIR)$(syntaxdir)
- 	for I in $(ALLSYNTAX); \
- 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(syntaxdir)/$$I; done
- 
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 108865006be5..5206eb604288 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -2,6 +2,7 @@ bin/mcmfmt
 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
 share/locale/da/LC_MESSAGES/mc.mo
@@ -15,6 +16,7 @@ share/locale/hu/LC_MESSAGES/mc.mo
 share/locale/it/LC_MESSAGES/mc.mo
 share/locale/ja/LC_MESSAGES/mc.mo
 share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/lv/LC_MESSAGES/mc.mo
 share/locale/nl/LC_MESSAGES/mc.mo
 share/locale/no/LC_MESSAGES/mc.mo
 share/locale/pl/LC_MESSAGES/mc.mo
@@ -24,21 +26,25 @@ share/locale/ru/LC_MESSAGES/mc.mo
 share/locale/sk/LC_MESSAGES/mc.mo
 share/locale/sl/LC_MESSAGES/mc.mo
 share/locale/sv/LC_MESSAGES/mc.mo
+share/locale/ta/LC_MESSAGES/mc.mo
 share/locale/tr/LC_MESSAGES/mc.mo
 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/mc.csh
-share/mc/bin/mc.sh
-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/extfs/README
 share/mc/extfs/a
+share/mc/extfs/apt
+share/mc/extfs/audio
+share/mc/extfs/bpp
 share/mc/extfs/deb
+share/mc/extfs/deba
+share/mc/extfs/debd
+share/mc/extfs/dpkg
 share/mc/extfs/extfs.ini
 share/mc/extfs/ftplist
 share/mc/extfs/hp48
@@ -58,16 +64,17 @@ share/mc/extfs/unarj.diff
 share/mc/extfs/urar
 share/mc/extfs/uzip
 share/mc/extfs/uzoo
-share/mc/mc.csh
 share/mc/mc.ext
 share/mc/mc.hint
 share/mc/mc.hint.cs
 share/mc/mc.hint.es
+share/mc/mc.hint.it
+share/mc/mc.hint.pl
 share/mc/mc.hint.ru
 share/mc/mc.hlp
+share/mc/mc.hlp.hu
 share/mc/mc.lib
 share/mc/mc.menu
-share/mc/mc.sh
 share/mc/syntax/ada95.syntax
 share/mc/syntax/c.syntax
 share/mc/syntax/changelog.syntax
@@ -89,16 +96,9 @@ share/mc/syntax/smalltalk.syntax
 share/mc/syntax/swig.syntax
 share/mc/syntax/texinfo.syntax
 share/mc/syntax/unknown.syntax
-share/mc/term/README.xterm
-share/mc/term/ansi.ti
-share/mc/term/linux.ti
-share/mc/term/vt100.ti
-share/mc/term/xterm.ad
-share/mc/term/xterm.tcap
-share/mc/term/xterm.ti
-@dirrm share/mc/term
+@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
diff --git a/misc/metatheme/Makefile b/misc/metatheme/Makefile
index a0d3dfbc0873..f946e45db3ec 100644
--- a/misc/metatheme/Makefile
+++ b/misc/metatheme/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	metatheme
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	ftp://ftp.helixcode.com/pub/metatheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.8:${PORTSDIR}/www/gtkhtml \
-		gal.4:${PORTSDIR}/x11-toolkits/gal \
+LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
+		gal.6:${PORTSDIR}/x11-toolkits/gal \
 		gnet.0:${PORTSDIR}/net/gnet
 
 USE_X_PREFIX=	yes
diff --git a/misc/metatheme/files/patch-capplet::metatheme-preview.c b/misc/metatheme/files/patch-capplet::metatheme-preview.c
new file mode 100644
index 000000000000..afd6faf170dd
--- /dev/null
+++ b/misc/metatheme/files/patch-capplet::metatheme-preview.c
@@ -0,0 +1,17 @@
+--- capplet/metatheme-preview.c.orig	Fri Nov 10 20:59:14 2000
++++ capplet/metatheme-preview.c	Thu Apr 19 14:23:34 2001
+@@ -195,3 +195,3 @@
+ 		case ARG_HAS_FOCUS:
+-			e_canvas_item_grab_focus (item);
++			e_canvas_item_grab_focus (item, TRUE);
+ 			break;
+@@ -378,3 +378,3 @@
+ 			if (event->button.button == 1)
+-				e_canvas_item_grab_focus (item);
++				e_canvas_item_grab_focus (item, TRUE);
+ 			break;
+@@ -474,3 +474,3 @@
+ 
+-	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview));
++	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview), TRUE);
+ }
diff --git a/misc/metatheme/files/patch-capplet::mtm-reflow-view.c b/misc/metatheme/files/patch-capplet::mtm-reflow-view.c
new file mode 100644
index 000000000000..845e5888200a
--- /dev/null
+++ b/misc/metatheme/files/patch-capplet::mtm-reflow-view.c
@@ -0,0 +1,11 @@
+--- capplet/mtm-reflow-view.c.orig	Fri Nov 10 20:59:14 2000
++++ capplet/mtm-reflow-view.c	Thu Apr 19 14:30:24 2001
+@@ -191,2 +191,3 @@
+ 	GnomeCanvasItem *item;
++	gint position = 0;
+ 
+@@ -208,3 +209,3 @@
+ 
+-	e_reflow_add_item (E_REFLOW (view->priv->reflow), item);
++	e_reflow_add_item (E_REFLOW (view->priv->reflow), item, &position);
+ 	view->priv->previews = g_list_append (view->priv->previews, item);
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index a0d3dfbc0873..f946e45db3ec 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	metatheme
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	ftp://ftp.helixcode.com/pub/metatheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.8:${PORTSDIR}/www/gtkhtml \
-		gal.4:${PORTSDIR}/x11-toolkits/gal \
+LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
+		gal.6:${PORTSDIR}/x11-toolkits/gal \
 		gnet.0:${PORTSDIR}/net/gnet
 
 USE_X_PREFIX=	yes
diff --git a/misc/metatheme2/files/patch-capplet::metatheme-preview.c b/misc/metatheme2/files/patch-capplet::metatheme-preview.c
new file mode 100644
index 000000000000..afd6faf170dd
--- /dev/null
+++ b/misc/metatheme2/files/patch-capplet::metatheme-preview.c
@@ -0,0 +1,17 @@
+--- capplet/metatheme-preview.c.orig	Fri Nov 10 20:59:14 2000
++++ capplet/metatheme-preview.c	Thu Apr 19 14:23:34 2001
+@@ -195,3 +195,3 @@
+ 		case ARG_HAS_FOCUS:
+-			e_canvas_item_grab_focus (item);
++			e_canvas_item_grab_focus (item, TRUE);
+ 			break;
+@@ -378,3 +378,3 @@
+ 			if (event->button.button == 1)
+-				e_canvas_item_grab_focus (item);
++				e_canvas_item_grab_focus (item, TRUE);
+ 			break;
+@@ -474,3 +474,3 @@
+ 
+-	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview));
++	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview), TRUE);
+ }
diff --git a/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c b/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c
new file mode 100644
index 000000000000..845e5888200a
--- /dev/null
+++ b/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c
@@ -0,0 +1,11 @@
+--- capplet/mtm-reflow-view.c.orig	Fri Nov 10 20:59:14 2000
++++ capplet/mtm-reflow-view.c	Thu Apr 19 14:30:24 2001
+@@ -191,2 +191,3 @@
+ 	GnomeCanvasItem *item;
++	gint position = 0;
+ 
+@@ -208,3 +209,3 @@
+ 
+-	e_reflow_add_item (E_REFLOW (view->priv->reflow), item);
++	e_reflow_add_item (E_REFLOW (view->priv->reflow), item, &position);
+ 	view->priv->previews = g_list_append (view->priv->previews, item);