diff options
Diffstat (limited to 'source/ap/zsh')
| -rw-r--r-- | source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff | 26 | ||||
| -rwxr-xr-x | source/ap/zsh/zsh.SlackBuild | 34 | ||||
| -rw-r--r-- | source/ap/zsh/zsh.regex.oh.bah.diff | 12 |
3 files changed, 40 insertions, 32 deletions
diff --git a/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff b/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff deleted file mode 100644 index a30665a0e..000000000 --- a/source/ap/zsh/zsh-4.3.10-add_new_pkg_completion.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur zsh-4.3.10.old/Completion/Linux/Command/_pkgtool zsh-4.3.10/Completion/Linux/Command/_pkgtool ---- zsh-4.3.10.old/Completion/Linux/Command/_pkgtool 2005-06-24 10:15:27.000000000 -0400 -+++ zsh-4.3.10/Completion/Linux/Command/_pkgtool 2009-07-07 20:39:01.000000000 -0400 -@@ -12,7 +12,7 @@ - "-ask[always ask on package installation regardless of package's priority]" \ - '-priority[provide a priority for the entire package list to use]:priority list:(ADD REC OPT SKP)' \ - '-tagfile[specify a different file to use for package priorities]:tagfile:_files -/' \ -- '*:package file:_files -g "*.tgz(-.)"' -+ '*:package file:_files -g "*.t[gblx]z(-.)"' - ;; - - removepkg) -@@ -29,11 +29,11 @@ - '--install-new[install new packages in addition to upgrading existing ones]' \ - '--reinstall[upgrade even when the same version is already installed]' \ - '--verbose[show all the gory details of the upgrade]' \ -- '*:package file:_files -g "*.tgz(-.)"' -+ '*:package file:_files -g "*.t[gblx]z(-.)"' - ;; - - explodepkg) -- _wanted file expl 'package file' _files -g '*.tgz(-.)' -+ _wanted file expl 'package file' _files -g '*.t[gblx]z(-.)' - ;; - - makepkg) diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild index 2a874fbf3..dc6dcf2a4 100755 --- a/source/ap/zsh/zsh.SlackBuild +++ b/source/ap/zsh/zsh.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.3.10 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=zsh +VERSION=${VERSION:-$(echo ${PKGNAM}-4.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -34,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -54,8 +68,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Add t[blx]z to the zsh tab completion stuff -zcat $CWD/zsh-4.3.10-add_new_pkg_completion.diff.gz | patch -p1 || exit 1 +# fix regex crash: +zcat $CWD/zsh.regex.oh.bah.diff.gz | patch -p0 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -81,6 +95,14 @@ mkdir -p $PKG/usr/doc/zsh-$VERSION/html-docs cp -a INSTALL LICENCE META-FAQ README $PKG/usr/doc/zsh-$VERSION cp -a Doc/*.html $PKG/usr/doc/zsh-$VERSION/html-docs +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/usr/info cp -a Doc/*info* $PKG/usr/info diff --git a/source/ap/zsh/zsh.regex.oh.bah.diff b/source/ap/zsh/zsh.regex.oh.bah.diff new file mode 100644 index 000000000..15e3d5b43 --- /dev/null +++ b/source/ap/zsh/zsh.regex.oh.bah.diff @@ -0,0 +1,12 @@ +--- ./Src/text.c.orig 2010-09-14 09:46:26.000000000 -0500 ++++ ./Src/text.c 2011-03-19 18:50:22.270001467 -0500 +@@ -785,8 +785,7 @@ + taddstr(" "); + taddstr(ecgetstr(state, EC_NODUP, NULL)); + if (ctype == COND_STREQ || +- ctype == COND_STRNEQ || +- ctype == COND_REGEX) ++ ctype == COND_STRNEQ) + state->pc++; + } else { + /* Unary test: `-f foo' etc. */ |