diff options
Diffstat (limited to 'shells/zsh/patches')
| -rw-r--r-- | shells/zsh/patches/patch-Completion_Unix_Command__du | 14 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Completion_Unix_Command__sort | 18 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_builtin.c | 15 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Test_B03print.ztst | 24 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ac | 199 |
5 files changed, 0 insertions, 270 deletions
diff --git a/shells/zsh/patches/patch-Completion_Unix_Command__du b/shells/zsh/patches/patch-Completion_Unix_Command__du deleted file mode 100644 index 0b6134150a2..00000000000 --- a/shells/zsh/patches/patch-Completion_Unix_Command__du +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-Completion_Unix_Command__du,v 1.1 2015/07/26 22:04:13 snj Exp $ - -Unbreak filename completion on non-GNU du binaries like NetBSD's. -Upstreadm commit 806f73a0b3d3959d5af12ce97e0258b4d4fe7d76 - ---- Completion/Unix/Command/_du.orig 2015-07-26 14:39:36.000000000 -0700 -+++ Completion/Unix/Command/_du 2015-07-26 14:39:17.000000000 -0700 -@@ -74,5 +74,5 @@ else - do - [[ $OSTYPE = $~pattern ]] && args+=( $arg ) - done -- _arguments -s -A "-*" $args -+ _arguments -s -A "-*" $args '*:file:_files' - fi diff --git a/shells/zsh/patches/patch-Completion_Unix_Command__sort b/shells/zsh/patches/patch-Completion_Unix_Command__sort deleted file mode 100644 index f8132692d2d..00000000000 --- a/shells/zsh/patches/patch-Completion_Unix_Command__sort +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-Completion_Unix_Command__sort,v 1.1 2015/07/26 22:04:13 snj Exp $ - -Add missing ]. Fixes NetBSD and DragonFly completion of the sort -command. Without this, you get: -"_arguments:comparguments:312: invalid option definition: (-s)-S[don't -use stable sort" - ---- Completion/Unix/Command/_sort.orig 2015-07-26 14:58:06.000000000 -0700 -+++ Completion/Unix/Command/_sort 2015-07-26 14:58:16.000000000 -0700 -@@ -55,7 +55,7 @@ case $variant in - netbsd*|dragonfly*) - args+=( - "${ordering}-l[sort by string length of field]" -- "(-s)-S[don't use stable sort" -+ "(-s)-S[don't use stable sort]" - ) - ;| - openbsd*) diff --git a/shells/zsh/patches/patch-Src_builtin.c b/shells/zsh/patches/patch-Src_builtin.c deleted file mode 100644 index b175c89f2fc..00000000000 --- a/shells/zsh/patches/patch-Src_builtin.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Src_builtin.c,v 1.1 2015/06/13 12:57:28 ryoon Exp $ - -https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/ - ---- Src/builtin.c.orig 2015-05-31 15:39:40.000000000 +0000 -+++ Src/builtin.c -@@ -4461,7 +4461,7 @@ bin_print(char *name, char **args, Optio - lleft -= chars; - ptr += chars; - } -- if (width > 0 && flags[2]) width = -width; -+ if (width > 0 && flags[3]) width = -width; - if (width > 0 && lchars < width) - count += fprintf(fout, "%*c", width - lchars, ' '); - count += fwrite(b, 1, lbytes, fout); diff --git a/shells/zsh/patches/patch-Test_B03print.ztst b/shells/zsh/patches/patch-Test_B03print.ztst deleted file mode 100644 index f8afd4d8e02..00000000000 --- a/shells/zsh/patches/patch-Test_B03print.ztst +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-Test_B03print.ztst,v 1.1 2015/06/13 12:57:28 ryoon Exp $ - -https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/ - ---- Test/B03print.ztst.orig 2014-12-13 23:55:54.000000000 +0000 -+++ Test/B03print.ztst -@@ -169,11 +169,15 @@ - 0:%n count zeroed on format reuse - >1 - --# this may fill spec string with '%0+- #*.*lld\0' - 13 characters -- printf '%1$0+- #-08.5dx\n' 123 -+# this may fill spec string with '%0'+- #*.*lld\0' - 14 characters -+ printf '%1$0'"'+- #-08.5dx\n" 123 - 0:maximal length format specification - >+00123 x - -+ printf "x:%-20s:y\n" fubar -+0:left-justification of string -+>x:fubar :y -+ - printf '%*smorning\n' -5 good - 0:negative width specified - >good morning diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac deleted file mode 100644 index 717e80dc48f..00000000000 --- a/shells/zsh/patches/patch-ac +++ /dev/null @@ -1,199 +0,0 @@ -$NetBSD: patch-ac,v 1.31 2015/03/19 12:34:37 jperkin Exp $ - -First chunk: -Don't use _POSIX_C_SOURCE on SunOS with c99. - -Next chunks: -Use a compile test, not a run test, for whether various rlimit values -are equivalent. A compile test is sufficient because zsh uses these -values in switch cases, so they must be compile-time, if not -preprocessor-time, constants. - -Last-but-one chunk: -Make this package build on Interix. Patches provided by Hiramatsu -Yoshifumi in PR pkg/25946. - -Last chunk: -Use -shared instead of -G on SunOS. -Fixes 64-bit package. - ---- configure.orig 2014-09-23 18:56:57.000000000 +0000 -+++ configure -@@ -7645,7 +7645,9 @@ if ${zsh_cv_type_sigset_t+:} false; then - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#ifndef __sun - #define _POSIX_C_SOURCE 200809L -+#endif - #include <sys/types.h> - #include <signal.h> - int -@@ -10233,9 +10235,6 @@ $as_echo_n "checking if RLIMIT_VMEM and - if ${zsh_cv_rlimit_vmem_is_rss+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- zsh_cv_rlimit_vmem_is_rss=no --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -10244,43 +10243,33 @@ else - #include <sys/time.h> - #endif - #include <sys/resource.h> --int main() -+int -+main () - { --int ret = 1; --#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS) --if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0; --#endif --return ret; -+static char x[(RLIMIT_VMEM == RLIMIT_RSS)? 1 : -1] -+ ; -+ return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO"; then : - zsh_cv_rlimit_vmem_is_rss=yes - else - zsh_cv_rlimit_vmem_is_rss=no - fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_rss" >&5 - $as_echo "$zsh_cv_rlimit_vmem_is_rss" >&6; } -- - if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then - $as_echo "#define RLIMIT_VMEM_IS_RSS 1" >>confdefs.h - - fi - -- -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_VMEM and RLIMIT_AS are the same" >&5 - $as_echo_n "checking if RLIMIT_VMEM and RLIMIT_AS are the same... " >&6; } - if ${zsh_cv_rlimit_vmem_is_as+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- zsh_cv_rlimit_vmem_is_as=no --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -10289,43 +10278,33 @@ else - #include <sys/time.h> - #endif - #include <sys/resource.h> --int main() -+int -+main () - { --int ret = 1; --#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS) --if (RLIMIT_AS == RLIMIT_VMEM) ret = 0; --#endif --return ret; -+static char x[(RLIMIT_VMEM == RLIMIT_AS)? 1 : -1] -+ ; -+ return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO"; then : - zsh_cv_rlimit_vmem_is_as=yes - else - zsh_cv_rlimit_vmem_is_as=no - fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_as" >&5 - $as_echo "$zsh_cv_rlimit_vmem_is_as" >&6; } -- - if test x$zsh_cv_rlimit_vmem_is_as = xyes; then - $as_echo "#define RLIMIT_VMEM_IS_AS 1" >>confdefs.h - - fi - -- -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_RSS and RLIMIT_AS are the same" >&5 - $as_echo_n "checking if RLIMIT_RSS and RLIMIT_AS are the same... " >&6; } - if ${zsh_cv_rlimit_rss_is_as+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- zsh_cv_rlimit_rss_is_as=no --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -10334,28 +10313,23 @@ else - #include <sys/time.h> - #endif - #include <sys/resource.h> --int main() -+int -+main () - { --int ret = 1; --#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS) --if (RLIMIT_AS == RLIMIT_RSS) ret = 0; --#endif --return ret; -+static char x[(RLIMIT_RSS == RLIMIT_AS)? 1 : -1] -+ ; -+ return 0; - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO"; then : - zsh_cv_rlimit_rss_is_as=yes - else - zsh_cv_rlimit_rss_is_as=no - fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_rss_is_as" >&5 - $as_echo "$zsh_cv_rlimit_rss_is_as" >&6; } -- - if test x$zsh_cv_rlimit_rss_is_as = xyes; then - $as_echo "#define RLIMIT_RSS_IS_AS 1" >>confdefs.h - -@@ -11852,6 +11826,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } - DLLD="${DLLD=$CC}" - DLLDARG="" - ;; -+ *interix*) -+ DLLD="${DLLD=$CC}" -+ DLLDARG="" -+ ;; - * ) - DLLD="${DLLD=ld}" - DLLDARG="" -@@ -11881,7 +11859,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; } - sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; - sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; - aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;; -- solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;; -+ solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; - darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; - beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;; - openbsd*) |