diff options
Diffstat (limited to 'misc/mc/files')
-rw-r--r-- | misc/mc/files/patch-aa | 65 | ||||
-rw-r--r-- | misc/mc/files/patch-ab | 14 | ||||
-rw-r--r-- | misc/mc/files/patch-ac | 27 | ||||
-rw-r--r-- | misc/mc/files/patch-ad | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-af | 25 | ||||
-rw-r--r-- | misc/mc/files/patch-ag | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-ai | 10 | ||||
-rw-r--r-- | misc/mc/files/patch-aj | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-ak | 14 | ||||
-rw-r--r-- | misc/mc/files/patch-gnome::Makefile.in | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-gnome::gdesktop.c | 14 | ||||
-rw-r--r-- | misc/mc/files/patch-gnome::glayout.c | 18 | ||||
-rw-r--r-- | misc/mc/files/patch-gtkedit::syntax.c | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-lib::Makefile.in | 56 | ||||
-rw-r--r-- | misc/mc/files/patch-lib::mc.ext.in | 34 | ||||
-rw-r--r-- | misc/mc/files/patch-lib::mc.lib | 36 | ||||
-rw-r--r-- | misc/mc/files/patch-src::Makefile.in | 11 | ||||
-rw-r--r-- | misc/mc/files/patch-src::slint.c | 14 | ||||
-rw-r--r-- | misc/mc/files/patch-src::subshell.c | 10 | ||||
-rw-r--r-- | misc/mc/files/patch-src::treestore.h | 14 |
20 files changed, 16 insertions, 401 deletions
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa deleted file mode 100644 index 6b2a244e8f08..000000000000 --- a/misc/mc/files/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ ---- configure.orig Fri Aug 24 15:05:06 2001 -+++ configure Mon Aug 26 22:26:15 2002 -@@ -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 -@@ -11904,7 +11906,7 @@ - if test $use_vfs = yes - then - LIBVFS="libvfs-mc.a" -- LVFS="-lvfs-mc" -+ LVFS="../vfs/libvfs-mc.a" - MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)" - echo "$as_me:11909: result: Using the VFS switch code" >&5 - echo "${ECHO_T}Using the VFS switch code" >&6 -@@ -12971,7 +12973,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lslang $LIBS" -+LIBS="-lslang -ltermcap $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 12976 "configure" - #include "confdefs.h" -@@ -13251,7 +13253,7 @@ - #define HAVE_SYSTEM_SLANG 1 - EOF - -- LSLANG="-lslang" -+ LSLANG="-lslang -ltermcap" - screen_manager="SLang (system-installed library)" - echo "$as_me:13256: result: Using system installed SLang library" >&5 - echo "${ECHO_T}Using system installed SLang library" >&6 -@@ -13489,7 +13491,7 @@ - - LIBEDIT_A="libedit.a" - MCEDIT="mcedit" -- LEDIT="-ledit" -+ LEDIT="../edit/libedit.a" - EDIT_msg="yes" - echo "$as_me:13494: result: will call internal editor" >&5 - echo "${ECHO_T}will call internal editor" >&6 -@@ -13505,7 +13507,7 @@ - - LIBEDIT_A="libedit.a" - MCEDIT="mcedit" -- LEDIT="-ledit" -+ LEDIT="../edit/libedit.a" - EDIT_msg="yes" - echo "$as_me:13510: result: will call internal editor" >&5 - echo "${ECHO_T}will call internal editor" >&6 -@@ -14223,7 +14225,7 @@ - #define HAVE_SYSTEM_SLANG 1 - EOF - -- LSLANG="-lslang" -+ LSLANG="-lslang -ltermcap" - screen_manager="SLang (system-installed library)" - echo "$as_me:14228: result: Using system installed SLang library" >&5 - echo "${ECHO_T}Using system installed SLang library" >&6 diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab deleted file mode 100644 index 9e8d31de0963..000000000000 --- a/misc/mc/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ - -$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 deleted file mode 100644 index 7a8c41ee98ac..000000000000 --- a/misc/mc/files/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ - -$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@ - mandir = @mandir@ --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 deleted file mode 100644 index 694c000fe771..000000000000 --- a/misc/mc/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index c87a4ec5e68f..000000000000 --- a/misc/mc/files/patch-af +++ /dev/null @@ -1,25 +0,0 @@ - -$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 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 deleted file mode 100644 index 2e999f6f1c44..000000000000 --- a/misc/mc/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 805fc55bb9ab..000000000000 --- a/misc/mc/files/patch-ai +++ /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-aj b/misc/mc/files/patch-aj deleted file mode 100644 index cd20a6ef9302..000000000000 --- a/misc/mc/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index ec3b5bf8560e..000000000000 --- a/misc/mc/files/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ - -$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-gnome::Makefile.in b/misc/mc/files/patch-gnome::Makefile.in deleted file mode 100644 index 0fc63d352ef6..000000000000 --- a/misc/mc/files/patch-gnome::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/Makefile.in.orig Sun Aug 11 18:29:17 2002 -+++ gnome/Makefile.in Sun Aug 11 18:30:01 2002 -@@ -9,7 +9,7 @@ - - corbadir = $(sysconfdir)/CORBA/servers - desktopdir = $(mclibdir)/desktop-scripts --gnewdir = $(prefix)/share/mc/templates -+gnewdir = $(mclibdir)/templates - gnomeicondir = @gnomeicondir@ - icondir = $(datadir)/pixmaps/mc - diff --git a/misc/mc/files/patch-gnome::gdesktop.c b/misc/mc/files/patch-gnome::gdesktop.c deleted file mode 100644 index 01cce97d1ec0..000000000000 --- a/misc/mc/files/patch-gnome::gdesktop.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome/gdesktop.c.orig Sun Aug 11 18:35:31 2002 -+++ gnome/gdesktop.c Sun Aug 11 18:37:59 2002 -@@ -3036,9 +3036,9 @@ - strip_tearoff_menu_item (desktop_arrange_icons_items); - i = strip_tearoff_menu_item (gnome_panel_new_menu); - shell = gnome_panel_new_menu[0].widget->parent; -- file = gnome_unconditional_datadir_file ("mc/templates"); -+ file = gnome_unconditional_datadir_file ("gnome/mc/templates"); - i = create_new_menu_from (file, shell, i); -- file2 = gnome_datadir_file ("mc/templates"); -+ file2 = gnome_datadir_file ("gnome/mc/templates"); - if (file2 != NULL){ - if (strcmp (file, file2) != 0) - create_new_menu_from (file2, shell, i); diff --git a/misc/mc/files/patch-gnome::glayout.c b/misc/mc/files/patch-gnome::glayout.c deleted file mode 100644 index 0a8dc746cf41..000000000000 --- a/misc/mc/files/patch-gnome::glayout.c +++ /dev/null @@ -1,18 +0,0 @@ ---- gnome/glayout.c.orig Sun Aug 11 18:35:37 2002 -+++ gnome/glayout.c Sun Aug 11 18:37:47 2002 -@@ -625,13 +625,13 @@ - - shell = gnome_panel_new_menu[0].widget->parent; - -- file = gnome_unconditional_datadir_file ("mc/templates"); -+ file = gnome_unconditional_datadir_file ("gnome/mc/templates"); - - child_list = gtk_container_children (GTK_CONTAINER (shell)); - pos = g_list_length (child_list); - pos = create_new_menu_from (file, shell, pos); - -- file2 = gnome_datadir_file ("mc/templates"); -+ file2 = gnome_datadir_file ("gnome/mc/templates"); - if (file2 != NULL){ - if (strcmp (file, file2) != 0) - create_new_menu_from (file2, shell, pos); diff --git a/misc/mc/files/patch-gtkedit::syntax.c b/misc/mc/files/patch-gtkedit::syntax.c deleted file mode 100644 index 11d416637703..000000000000 --- a/misc/mc/files/patch-gtkedit::syntax.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gtkedit/syntax.c.orig Sun Sep 29 16:55:01 2002 -+++ gtkedit/syntax.c Sun Sep 29 16:55:06 2002 -@@ -1211,7 +1211,7 @@ - "file ..\\*\\\\.lsm$ LSM\\sFile", - "include lsm.syntax", - "", --"file ..\\*\\\\.sh$ Shell\\sScript ^#!\\s\\*/.\\*/(k|ba||pdk|z)sh", -+"file ..\\*\\\\.sh$ Shell\\sScript ^#!\\s\\*/.\\*/([a-z]?|ba|pdk)sh", - "include sh.syntax", - "", - "file ..\\*\\\\.(pl|PL|pm|PM])$ Perl\\sProgram ^#!\\s\\*/.\\*/perl", diff --git a/misc/mc/files/patch-lib::Makefile.in b/misc/mc/files/patch-lib::Makefile.in deleted file mode 100644 index 387edd01941c..000000000000 --- a/misc/mc/files/patch-lib::Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ - -$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.ext.in b/misc/mc/files/patch-lib::mc.ext.in deleted file mode 100644 index 06b517e57ab1..000000000000 --- a/misc/mc/files/patch-lib::mc.ext.in +++ /dev/null @@ -1,34 +0,0 @@ ---- lib/mc.ext.in.orig Tue Aug 14 10:27:12 2001 -+++ lib/mc.ext.in Sun Aug 11 17:05:06 2002 -@@ -237,11 +237,11 @@ - View=sxpm %f - - 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 & -- Display this file=ee %f & -+ Display this file=ElectricEyes %f & - - - ### Sound files ### -@@ -283,7 +283,7 @@ - - # Postscript - type/^PostScript -- Open=gv %f& -+ Open=ggv %f& - View=%view{ascii} ps2ascii %f - View with GhostView=gv %f - -@@ -389,7 +389,7 @@ - # Open=%cd %p#utar - View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf - - Extract=bzip -dc %f 2>/dev/null | tar xf - --regex/\.tar\.bz2$ -+regex/\.t(ar\.bz2|bz)$ - Open=%cd %p#utar - View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - - Extract=bzip2 -dc %f 2>/dev/null | tar xf - diff --git a/misc/mc/files/patch-lib::mc.lib b/misc/mc/files/patch-lib::mc.lib deleted file mode 100644 index 48465ac408bf..000000000000 --- a/misc/mc/files/patch-lib::mc.lib +++ /dev/null @@ -1,36 +0,0 @@ ---- 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::Makefile.in b/misc/mc/files/patch-src::Makefile.in new file mode 100644 index 000000000000..8379a8f5d5b2 --- /dev/null +++ b/misc/mc/files/patch-src::Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Mon Feb 10 02:00:05 2003 ++++ src/Makefile.in Mon Feb 10 02:00:19 2003 +@@ -700,7 +700,7 @@ + + install-data-am: + +-install-exec-am: install-binPROGRAMS install-pkglibPROGRAMS ++install-exec-am: install-binPROGRAMS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + diff --git a/misc/mc/files/patch-src::slint.c b/misc/mc/files/patch-src::slint.c deleted file mode 100644 index 60798c5b2977..000000000000 --- a/misc/mc/files/patch-src::slint.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/slint.c.orig Fri Jan 24 08:13:03 2003 -+++ src/slint.c Fri Jan 24 08:13:44 2003 -@@ -434,6 +434,11 @@ - "console", - #endif - "linux", -+#ifdef __FreeBSD__ -+ "cons25", -+ "cons25r", -+ "xterm", -+#endif - "xterm-color", - "color-xterm", - "dtterm", diff --git a/misc/mc/files/patch-src::subshell.c b/misc/mc/files/patch-src::subshell.c index a1af27f4e718..3ebf5db70356 100644 --- a/misc/mc/files/patch-src::subshell.c +++ b/misc/mc/files/patch-src::subshell.c @@ -1,6 +1,6 @@ ---- src/subshell.c.orig Mon Oct 21 01:43:29 2002 -+++ src/subshell.c Mon Oct 21 02:37:56 2002 -@@ -852,6 +852,8 @@ +--- src/subshell.c.orig Sat Jan 25 03:37:28 2003 ++++ src/subshell.c Mon Feb 10 01:10:59 2003 +@@ -806,6 +806,8 @@ /* If it actually changed the directory it returns true */ void do_subshell_chdir (const char *directory, int do_update, int reset_prompt) { @@ -9,7 +9,7 @@ if (!(subshell_state == INACTIVE && strcmp (subshell_cwd, cpanel->cwd))){ /* We have to repaint the subshell prompt if we read it from * the main program. Please note that in the code after this -@@ -878,7 +880,12 @@ +@@ -838,7 +840,12 @@ subshell_state = RUNNING_COMMAND; feed_subshell (QUIETLY, FALSE); @@ -20,6 +20,6 @@ + && (subshell_type != TCSH || + realpath (subshell_cwd, buf) == NULL || + strcmp (cpanel->cwd, buf))) - fprintf (stderr, _("Warning: Couldn't change to %s.\n"), cpanel->cwd); + fprintf (stderr, _("Warning: Cannot change to %s.\n"), cpanel->cwd); if (reset_prompt) diff --git a/misc/mc/files/patch-src::treestore.h b/misc/mc/files/patch-src::treestore.h deleted file mode 100644 index 4d33854591fb..000000000000 --- a/misc/mc/files/patch-src::treestore.h +++ /dev/null @@ -1,14 +0,0 @@ - -$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 |