diff -ruNd x11-fm/gnomemc/patches/patch-ba x11-fm/gnomemc/patches/patch-ba --- x11-fm/gnomemc/patches/patch-ba Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-ba Sat Nov 27 06:19:35 1999 @@ -0,0 +1,15 @@ +--- src/ext.h.orig Thu May 6 04:58:06 1999 ++++ src/ext.h Sat Nov 27 06:07:38 1999 +@@ -14,10 +14,10 @@ + # define MC_LIB_EXT "mc.ext" + #else + # ifdef HAVE_GNOME +-# define MC_USER_EXT ".mc/gnome.ext" ++# define MC_USER_EXT ".desk/mc/gnome.ext" + # define MC_LIB_EXT "mc-gnome.ext" + # else +-# define MC_USER_EXT ".mc/bindings" ++# define MC_USER_EXT ".desk/mc/bindings" + # define MC_LIB_EXT "mc.ext" + # endif + #endif diff -ruNd x11-fm/gnomemc/patches/patch-bb x11-fm/gnomemc/patches/patch-bb --- x11-fm/gnomemc/patches/patch-bb Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bb Sat Nov 27 06:20:05 1999 @@ -0,0 +1,43 @@ +--- src/main.c.orig Thu May 6 04:58:06 1999 ++++ src/main.c Sat Nov 27 06:10:33 1999 +@@ -352,7 +352,7 @@ + /* mc_home: The home of MC */ + char *mc_home; + +-/* if on, it displays the information that files have been moved to ~/.mc */ ++/* if on, it displays the information that files have been moved to ~/.desk/mc */ + int show_change_notice = 0; + + char cmd_buf [512]; +@@ -2857,11 +2857,11 @@ + + /* + * The compatibility_move_mc_files routine is intended to +- * move all of the hidden .mc files into a private ~/.mc ++ * move all of the hidden .mc files into a private ~/.desk/mc + * directory in the home directory, to avoid cluttering the users. + * + * Previous versions of the program had all of their files in +- * the $HOME, we are now putting them in $HOME/.mc ++ * the $HOME, we are now putting them in $HOME/.desk/mc + */ + #ifdef OS2_NT + # define compatibility_move_mc_files() +@@ -2912,7 +2912,7 @@ + static void + compatibility_move_mc_files (void) + { +- char *mc_dir = concat_dir_and_file (home_dir, ".mc"); ++ char *mc_dir = concat_dir_and_file (home_dir, ".desk/mc"); + + do_compatibility_move (mc_dir); + g_free (mc_dir); +@@ -3092,7 +3092,7 @@ + if (show_change_notice){ + message (1, _(" Notice "), + _(" The Midnight Commander configuration files \n" +- " are now stored in the ~/.mc directory, the \n" ++ " are now stored in the ~/.desk/mc directory, the \n" + " files have been moved now\n")); + } + diff -ruNd x11-fm/gnomemc/patches/patch-bc x11-fm/gnomemc/patches/patch-bc --- x11-fm/gnomemc/patches/patch-bc Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bc Sat Nov 27 06:20:22 1999 @@ -0,0 +1,11 @@ +--- src/main.h.orig Thu May 6 04:58:06 1999 ++++ src/main.h Sat Nov 27 06:11:36 1999 +@@ -188,7 +188,7 @@ + #ifdef OS2_NT + # define MC_BASE "" + #else +-# define MC_BASE "/.mc/" ++# define MC_BASE "/.desk/mc/" + #endif + #endif + diff -ruNd x11-fm/gnomemc/patches/patch-bd x11-fm/gnomemc/patches/patch-bd --- x11-fm/gnomemc/patches/patch-bd Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bd Sat Nov 27 06:20:43 1999 @@ -0,0 +1,12 @@ +--- src/setup.h.orig Thu May 6 04:58:06 1999 ++++ src/setup.h Sat Nov 27 06:12:34 1999 +@@ -32,7 +32,7 @@ + # define PROFILE_NAME "mc.ini" + # define HOTLIST_FILENAME "mc.hot" + #else +-# define PROFILE_NAME ".mc/ini" +-# define HOTLIST_FILENAME ".mc/hotlist" ++# define PROFILE_NAME ".desk/mc/ini" ++# define HOTLIST_FILENAME ".desk/mc/hotlist" + #endif + #endif diff -ruNd x11-fm/gnomemc/patches/patch-be x11-fm/gnomemc/patches/patch-be --- x11-fm/gnomemc/patches/patch-be Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-be Sat Nov 27 06:21:00 1999 @@ -0,0 +1,28 @@ +--- src/subshell.c.orig Thu May 6 04:58:07 1999 ++++ src/subshell.c Sat Nov 27 06:13:40 1999 +@@ -398,7 +398,7 @@ + switch (subshell_type) + { + case BASH: +- init_file = ".mc/bashrc"; ++ init_file = ".desk/mc/bashrc"; + if (access (init_file, R_OK) == -1) + init_file = ".bashrc"; + +@@ -406,13 +406,13 @@ + putenv ("HISTCONTROL=ignorespace"); + + /* Allow alternative readline settings for MC */ +- if (access (".mc/inputrc", R_OK) == 0) +- putenv ("INPUTRC=.mc/inputrc"); ++ if (access (".desk/mc/inputrc", R_OK) == 0) ++ putenv ("INPUTRC=.desk/mc/inputrc"); + + break; + + case TCSH: +- init_file = ".mc/tcshrc"; ++ init_file = ".desk/mc/tcshrc"; + if (access (init_file, R_OK) == -1) + init_file += 3; + break; diff -ruNd x11-fm/gnomemc/patches/patch-bf x11-fm/gnomemc/patches/patch-bf --- x11-fm/gnomemc/patches/patch-bf Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bf Sat Nov 27 06:22:22 1999 @@ -0,0 +1,20 @@ +--- src/tree.c.orig Thu May 6 04:58:07 1999 ++++ src/tree.c Sat Nov 27 06:14:33 1999 +@@ -173,7 +173,7 @@ + tree->selected_ptr = NULL; + } + +-/* Loads the .mc.tree file */ ++/* Loads the .desk/mc.tree file */ + void load_tree (WTree *tree) + { + tree_store_load (); +@@ -182,7 +182,7 @@ + tree_chdir (tree, home_dir); + } + +-/* Save the .mc.tree file */ ++/* Save the .desk/mc.tree file */ + void save_tree (WTree *tree) + { + int error; diff -ruNd x11-fm/gnomemc/patches/patch-bg x11-fm/gnomemc/patches/patch-bg --- x11-fm/gnomemc/patches/patch-bg Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bg Sat Nov 27 06:22:42 1999 @@ -0,0 +1,13 @@ +--- src/treestore.h.orig Thu May 6 04:58:06 1999 ++++ src/treestore.h Sat Nov 27 06:15:30 1999 +@@ -7,8 +7,8 @@ + # define MC_TREE "mcn.tre" + # define MC_TREE_TMP "mcn.tr~" + #else +-# define MC_TREE ".mc/Tree" +-# define MC_TREE_TMP ".mc/Tree.tmp" ++# define MC_TREE ".desk/mc/Tree" ++# define MC_TREE_TMP ".desk/mc/Tree.tmp" + #endif + + typedef struct tree_entry { diff -ruNd x11-fm/gnomemc/patches/patch-bh x11-fm/gnomemc/patches/patch-bh --- x11-fm/gnomemc/patches/patch-bh Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bh Sat Nov 27 06:23:01 1999 @@ -0,0 +1,11 @@ +--- src/user.h.orig Thu May 6 04:58:06 1999 ++++ src/user.h Sat Nov 27 06:16:42 1999 +@@ -16,7 +16,7 @@ + #else + # define MC_GLOBAL_MENU "mc.menu" + # define MC_LOCAL_MENU ".mc.menu" +-# define MC_HOME_MENU ".mc/menu" ++# define MC_HOME_MENU ".desk/mc/menu" + # define MC_HINT "mc.hint" + #endif + diff -ruNd x11-fm/gnomemc/patches/patch-bi x11-fm/gnomemc/patches/patch-bi --- x11-fm/gnomemc/patches/patch-bi Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bi Sat Nov 27 06:23:34 1999 @@ -0,0 +1,11 @@ +--- src/widget.c.orig Thu May 6 04:58:07 1999 ++++ src/widget.c Sat Nov 27 06:17:35 1999 +@@ -885,7 +885,7 @@ + This loads and saves the history of an input line to and from the + widget. It is called with the widgets tk name on creation of the + widget, and returns the Hist list. It stores histories in the file +- ~/.mc/history in using the profile code. ++ ~/.desk/mc/history in using the profile code. + + If def_text is passed as INPUT_LAST_TEXT (to the input_new() + function) then input_new assigns the default text to be the last text diff -ruNd x11-fm/gnomemc/patches/patch-bj x11-fm/gnomemc/patches/patch-bj --- x11-fm/gnomemc/patches/patch-bj Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bj Sat Nov 27 06:23:43 1999 @@ -0,0 +1,11 @@ +--- src/widget.h.orig Thu May 6 04:58:06 1999 ++++ src/widget.h Sat Nov 27 06:18:19 1999 +@@ -90,7 +90,7 @@ + + /* For history load-save functions */ + #define INPUT_LAST_TEXT ((char *) 2) +-#define HISTORY_FILE_NAME ".mc/history" ++#define HISTORY_FILE_NAME ".desk/mc/history" + + typedef struct { + Widget widget; diff -ruNd x11-fm/gnomemc/patches/patch-bk x11-fm/gnomemc/patches/patch-bk --- x11-fm/gnomemc/patches/patch-bk Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bk Sat Nov 27 08:00:46 1999 @@ -0,0 +1,73 @@ +--- src/text.c.orig Thu May 6 04:58:07 1999 ++++ src/text.c Sat Nov 27 07:59:35 1999 +@@ -20,38 +20,38 @@ + #include "cons.saver.h" + + char *default_edition_colors = +-"normal=lightgray,blue:" +-"selected=black,cyan:" +-"marked=yellow,blue:" +-"markselect=yellow,cyan:" +-"errors=white,red:" +-"menu=white,cyan:" +-"reverse=black,lightgray:" +-"dnormal=black,lightgray:" +-"dfocus=black,cyan:" +-"dhotnormal=yellow,lightgray:" +-"dhotfocus=yellow,cyan:" +-"viewunderline=brightred,blue:" +-"menuhot=yellow,cyan:" +-"menusel=white,black:" +-"menuhotsel=yellow,black:" +-"helpnormal=black,lightgray:" +-"helpitalic=red,lightgray:" +-"helpbold=blue,lightgray:" +-"helplink=black,cyan:" +-"helpslink=yellow,blue:" +-"gauge=white,black:" +-"input=black,cyan:" +-"directory=white,blue:" +-"executable=brightgreen,blue:" +-"link=lightgray,blue:" +-"stalledlink=brightred,blue:" +-"device=brightmagenta,blue:" +-"core=red,blue:" +-"special=black,blue:" +-"editnormal=lightgray,blue:" +-"editbold=yellow,blue:" +-"editmarked=black,cyan"; ++"normal=brown,black:" ++"selected=yellow,brown:" ++"marked=white,black:" ++"markselect=white,brown:" ++"errors=yellow,red:" ++"menu=brown,black:" ++"reverse=black,red:" ++"dnormal=brown,black:" ++"dfocus=yellow,brown:" ++"dhotnormal=yellow,black:" ++"dhotfocus=white,brown:" ++"viewunderline=yellow,black:" ++"menuhot=yellow,black:" ++"menusel=yellow,brown:" ++"menuhotsel=white,brown:" ++"helpnormal=brown,black:" ++"helpitalic=green,black:" ++"helpbold=yellow,black:" ++"helplink=brightred,black:" ++"helpslink=white,brown:" ++"gauge=blue,black:" ++"input=white,brown:" ++"directory=brown,black:" ++"executable=brown,black:" ++"link=brown,black:" ++"stalledlink=brightblue,black:" ++"device=brown,black:" ++"core=brown,black:" ++"special=brown,black:" ++"editnormal=brown,black:" ++"editbold=yellow,black:" ++"editmarked=white,brown"; + + void + edition_post_exec (void) diff -ruNd x11-fm/gnomemc/patches/patch-bl x11-fm/gnomemc/patches/patch-bl --- x11-fm/gnomemc/patches/patch-bl Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bl Tue Mar 28 03:45:06 2000 @@ -0,0 +1,11 @@ +--- vfs/extfs/ulha.in.orig Thu May 6 04:58:04 1999 ++++ vfs/extfs/ulha.in Sat Nov 27 08:07:13 1999 +@@ -48,7 +48,7 @@ + + # Define a directory to create a temporary file for when + # running a command to be run from the archive +-TMPDIR=/tmp/mc-cmd.$$ ++TMPDIR=/${HOME}/.desk/tmp/mc-cmd.$$ + # Temporary file within the directory + TMPCMD=$TMPDIR/run + diff -ruNd x11-fm/gnomemc/patches/patch-bm x11-fm/gnomemc/patches/patch-bm --- x11-fm/gnomemc/patches/patch-bm Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bm Sat Nov 27 08:12:23 1999 @@ -0,0 +1,11 @@ +--- vfs/extfs/urar.in.orig Thu May 6 04:58:04 1999 ++++ vfs/extfs/urar.in Sat Nov 27 08:05:56 1999 +@@ -5,7 +5,7 @@ + # Updated by christian.gennerat@alcatel.fr 1999 + # beta version 2.0 + # +-DRAR=/usr/bin ++DRAR=/usr/local/bin + RAR=$DRAR/rar + UNRAR=$DRAR/unrar # Prefer unrar (freeware) + # diff -ruNd x11-fm/gnomemc/patches/patch-bn x11-fm/gnomemc/patches/patch-bn --- x11-fm/gnomemc/patches/patch-bn Thu Jan 1 03:00:00 1970 +++ x11-fm/gnomemc/patches/patch-bn Sat Nov 27 08:12:43 1999 @@ -0,0 +1,11 @@ +--- vfs/extfs/uzip.in.orig Thu May 6 04:58:04 1999 ++++ vfs/extfs/uzip.in Sat Nov 27 08:05:12 1999 +@@ -7,7 +7,7 @@ + # + # + +-DZIP=/usr/bin ++DZIP=/usr/local/bin + XZIP="$DZIP/zip -g" + XUNZIP="$DZIP/unzip" + XZIPINFO="$DZIP/unzip -Z"