[SM-Commit] GIT changes to master grimoire by Eric Sandall (86b3cd85f0db109e5541d3c2720d5b5badcf7b78)

Eric Sandall scm at mail.sourcemage.org
Wed Jun 28 19:54:11 EDT 2006


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 shell-term-fm/tcsh/DETAILS                             |    6 ++---
 shell-term-fm/tcsh/HISTORY                             |    7 ++++++
 shell-term-fm/tcsh/PRE_BUILD                           |    3 ++
 shell-term-fm/tcsh/tcsh-6.14.00-debian-dircolors.patch |   19 +++++++++++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

New commits:
commit 86b3cd85f0db109e5541d3c2720d5b5badcf7b78
Merge: ee3b73c6df44aefbccd3b85219b3ff0798d15613 541b9b33997d069cfdb97f45aad55a6d0b43f86b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit ee3b73c6df44aefbccd3b85219b3ff0798d15613
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

        * DETAILS: Updated PATCHLEVEL=1
        * PRE_BUILD: Apply tcsh-6.14.00-debian-dircolors.patch
        * tcsh-6.14.00-debian-dircolors.patch: Copied from
          http://ftp.riken.go.jp/pub/Linux/gentoo/app-shells/tcsh/files/
          to fix this bug: http://www.cygwin.com/ml/cygwin/2006-01/msg00767.html

diff --git a/shell-term-fm/tcsh/DETAILS b/shell-term-fm/tcsh/DETAILS
index 09e67f3..0d3009e 100755
--- a/shell-term-fm/tcsh/DETAILS
+++ b/shell-term-fm/tcsh/DETAILS
@@ -6,12 +6,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[1]=ftp://ftp.gw.com/pub/unix/tcsh/$SOURCE
    SOURCE_URL[2]=ftp://ftp.funet.fi/pub/unix/shells/tcsh/$SOURCE
      SOURCE_HASH=sha512:8ce70edc456b309f2e27f05bbf49a6b9c1a994a7578a7faa31265746c3810b11bea07490b99a98b9188dce05b8ced4807a459e5d8e351b4bb9f5fb5256250c7b
-         ENTERED=20011106
-         UPDATED=20050713
       LICENSE[0]=BSD
-      BUILD_API=2
+      PATCHLEVEL=1
+       BUILD_API=2
         WEB_SITE=http://www.tcsh.org
         KEYWORDS="console"
+         ENTERED=20011106
            SHORT="Advanced C Shell"
 cat << EOF
 Tcsh is an enhanced but completely compatible version of the Berkeley 
diff --git a/shell-term-fm/tcsh/HISTORY b/shell-term-fm/tcsh/HISTORY
index bcbb36f..fcacabb 100644
--- a/shell-term-fm/tcsh/HISTORY
+++ b/shell-term-fm/tcsh/HISTORY
@@ -1,3 +1,10 @@
+2006-06-28 Eric Sandall <eric at sandall.us>
+	* DETAILS: Updated PATCHLEVEL=1
+	* PRE_BUILD: Apply tcsh-6.14.00-debian-dircolors.patch
+	* tcsh-6.14.00-debian-dircolors.patch: Copied from
+	  http://ftp.riken.go.jp/pub/Linux/gentoo/app-shells/tcsh/files/
+	  to fix this bug: http://www.cygwin.com/ml/cygwin/2006-01/msg00767.html
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/shell-term-fm/tcsh/PRE_BUILD b/shell-term-fm/tcsh/PRE_BUILD
new file mode 100755
index 0000000..53cf377
--- /dev/null
+++ b/shell-term-fm/tcsh/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build                                             &&
+patch  $SOURCE_DIRECTORY/tw.color.c                           \
+       $SCRIPT_DIRECTORY/tcsh-6.14.00-debian-dircolors.patch
diff --git a/shell-term-fm/tcsh/tcsh-6.14.00-debian-dircolors.patch b/shell-term-fm/tcsh/tcsh-6.14.00-debian-dircolors.patch
new file mode 100644
index 0000000..194d478
--- /dev/null
+++ b/shell-term-fm/tcsh/tcsh-6.14.00-debian-dircolors.patch
@@ -0,0 +1,19 @@
+--- tcsh-6.14.00/tw.color.c
++++ tcsh-6.14.00/tw.color.c
+@@ -235,13 +235,10 @@
+ 		    if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
+ 			(Char)variables[i].variable[1] == (v[1] & CHAR))
+ 			break;
+-		if (i < nvariables) {
+-		    v += 3;
++		v += 3;
++		if (i < nvariables)
+ 		    getstring(&c, &v, &variables[i].color, ':');
+-		    continue;
+-		}
+-		else
+-		    stderror(ERR_BADCOLORVAR, v[0], v[1]);
++		continue;
+ 	    }
+ 	    break;
+ 	}



More information about the SM-Commit mailing list