summaryrefslogtreecommitdiff
path: root/source/a/tcsh
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/tcsh')
-rwxr-xr-xsource/a/tcsh/tcsh.SlackBuild7
-rw-r--r--source/a/tcsh/tcsh.sh.hist.diff11
2 files changed, 2 insertions, 16 deletions
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index eeee6f18..5bbf788a 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=tcsh
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -69,9 +69,6 @@ cd ${PKGNAM}-$VERSION || exit 1
# built-in color ls:
zcat $CWD/${PKGNAM}.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
-# Fix history merging:
-zcat $CWD/tcsh.sh.hist.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/a/tcsh/tcsh.sh.hist.diff b/source/a/tcsh/tcsh.sh.hist.diff
deleted file mode 100644
index efd5a953..00000000
--- a/source/a/tcsh/tcsh.sh.hist.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sh.hist.c.orig 2019-12-04 11:51:54.000000000 -0600
-+++ ./sh.hist.c 2020-03-18 14:14:31.488245707 -0500
-@@ -1292,7 +1292,7 @@
- #endif
- }
- getexit(osetexit);
-- if (setexit())
-+ if (!setexit())
- loadhist(fname, 1);
- resexit(osetexit);
- }