Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Jan 2013 06:38:17 +0000 (UTC)
From:      Max Khon <fjoe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310999 - in head/misc/mc: . files
Message-ID:  <201301260638.r0Q6cH0D090810@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fjoe
Date: Sat Jan 26 06:38:17 2013
New Revision: 310999
URL: http://svnweb.freebsd.org/changeset/ports/310999

Log:
  - Update to 4.8.1.7
  - Fix from upstream for https://www.midnight-commander.org/ticket/2754
  (can't run mceedit without file name as parameter)
  
  Submitted by:	Herbert J. Skuhra

Added:
  head/misc/mc/files/patch-mc-editor   (contents, props changed)
Modified:
  head/misc/mc/Makefile
  head/misc/mc/distinfo
  head/misc/mc/pkg-plist

Modified: head/misc/mc/Makefile
==============================================================================
--- head/misc/mc/Makefile	Sat Jan 26 04:19:03 2013	(r310998)
+++ head/misc/mc/Makefile	Sat Jan 26 06:38:17 2013	(r310999)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.8.1.6
+PORTVERSION=	4.8.1.7
 PORTREVISION=	0
 CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \

Modified: head/misc/mc/distinfo
==============================================================================
--- head/misc/mc/distinfo	Sat Jan 26 04:19:03 2013	(r310998)
+++ head/misc/mc/distinfo	Sat Jan 26 06:38:17 2013	(r310999)
@@ -1,2 +1,2 @@
-SHA256 (mc-4.8.1.6.tar.xz) = 34545890b12c499654878a683c87724459292961d0b1c32eceee3adee5a408e4
-SIZE (mc-4.8.1.6.tar.xz) = 2097020
+SHA256 (mc-4.8.1.7.tar.xz) = ea5340c35735e374eed9b92268e80a12121a8fdf21ec249fef095fe2522faf9c
+SIZE (mc-4.8.1.7.tar.xz) = 2049316

Added: head/misc/mc/files/patch-mc-editor
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mc/files/patch-mc-editor	Sat Jan 26 06:38:17 2013	(r310999)
@@ -0,0 +1,46 @@
+Index: src/filemanager/ext.c
+===================================================================
+--- src/filemanager/ext.c	(revision 05d220a9c6f31134373e4326608a6d7e9cbb20f1)
++++ src/filemanager/ext.c	(revision 529a7ba24c9da9fdb1df939ff0fe35c6d27e65df)
+@@ -637,4 +637,7 @@
+     int have_type = 0;          /* Flag used by regex_check_type() */
+ 
++    if (filename_vpath == NULL)
++        return 0;
++
+     /* Check for the special View:%d parameter */
+     if (strncmp (action, "View:", 5) == 0)
+Index: src/filemanager/midnight.c
+===================================================================
+--- src/filemanager/midnight.c	(revision 308237aa11bf34450340574131a9894a1892e997)
++++ src/filemanager/midnight.c	(revision 529a7ba24c9da9fdb1df939ff0fe35c6d27e65df)
+@@ -952,9 +952,11 @@
+     case MC_RUN_EDITOR:
+         {
+-            vfs_path_t *param_vpath;
+-
+-            param_vpath = vfs_path_from_str (mc_run_param0);
+-            ret = edit_file (param_vpath, mc_args__edit_start_line);
+-            vfs_path_free (param_vpath);
++            vfs_path_t *vpath = NULL;
++
++            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
++                vpath = vfs_path_from_str (mc_run_param0);
++
++            ret = edit_file (vpath, mc_args__edit_start_line);
++            vfs_path_free (vpath);
+         }
+         break;
+@@ -962,7 +964,9 @@
+     case MC_RUN_VIEWER:
+         {
+-            vfs_path_t *vpath;
+-
+-            vpath = prepend_cwd_on_local (mc_run_param0);
++            vfs_path_t *vpath = NULL;
++
++            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
++                vpath = prepend_cwd_on_local (mc_run_param0);
++
+             view_file (vpath, 0, 1);
+             vfs_path_free (vpath);

Modified: head/misc/mc/pkg-plist
==============================================================================
--- head/misc/mc/pkg-plist	Sat Jan 26 04:19:03 2013	(r310998)
+++ head/misc/mc/pkg-plist	Sat Jan 26 06:38:17 2013	(r310999)
@@ -81,10 +81,12 @@ libexec/mc/mc.sh
 %%NLS%%share/locale/es/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fi_FI/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mc.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301260638.r0Q6cH0D090810>