From 549c62ffd8930399f8c65e3d8b64fcb4e634f193 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 13 Feb 2008 10:20:56 +0000
Subject: Fixed the annoying message that mc "Cannot change into directory"
 when its name has underscores in it. It only works with bash>=2.05, but that
 should be no problem for pkgsrc.

---
 sysutils/mc/Makefile         |  4 ++--
 sysutils/mc/distinfo         |  3 ++-
 sysutils/mc/patches/patch-su | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/mc/patches/patch-su

(limited to 'sysutils/mc')

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 0f1a8abf60b..f219ca485c9 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2007/02/15 10:00:08 rillig Exp $
+# $NetBSD: Makefile,v 1.71 2008/02/13 10:20:56 rillig Exp $
 
 DISTNAME=	mc-4.6.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
 		${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
index 21a89993cc8..d6ba4c08ad7 100644
--- a/sysutils/mc/distinfo
+++ b/sysutils/mc/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2005/08/04 10:12:06 rillig Exp $
+$NetBSD: distinfo,v 1.16 2008/02/13 10:20:57 rillig Exp $
 
 SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
 RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
 Size (mc-4.6.1.tar.gz) = 3928370 bytes
+SHA1 (patch-su) = adad37f777fd2db905108fbd8d1b1a139cf1352a
diff --git a/sysutils/mc/patches/patch-su b/sysutils/mc/patches/patch-su
new file mode 100644
index 00000000000..f306a508d92
--- /dev/null
+++ b/sysutils/mc/patches/patch-su
@@ -0,0 +1,18 @@
+$NetBSD: patch-su,v 1.1 2008/02/13 10:20:57 rillig Exp $
+
+Old bash versions required octal characters with 3 digits, newer
+versions (>= 2.05) require 4 digits.
+
+--- src/subshell.c.orig	2007-08-14 14:25:55.000000000 +0200
++++ src/subshell.c	2007-08-14 14:37:39.000000000 +0200
+@@ -728,8 +728,8 @@ subshell_name_quote (const char *s)
+ 	    if (isalpha ((unsigned char) *s)) {
+ 		*d++ = (unsigned char) *s;
+ 	    } else {
+-		sprintf (d, "\\%03o", (unsigned char) *s);
+-		d += 4;
++		sprintf (d, "\\%04o", (unsigned char) *s);
++		d += 5;
+ 	    }
+ 	}
+     } else {
-- 
cgit v1.2.3