svn commit: r424080 - in head/shells/zsh: . files
Baptiste Daroussin
bapt at FreeBSD.org
Sun Oct 16 18:46:15 UTC 2016
Author: bapt
Date: Sun Oct 16 18:46:14 2016
New Revision: 424080
URL: https://svnweb.freebsd.org/changeset/ports/424080
Log:
Fix make and gmake completion
Submitted by: Daniel Shahaf (on zsh mailing list)
Reported by: Guilherme Salazar (on zsh mailing list)
Added:
head/shells/zsh/files/patch-Completion_Unix_Command___make (contents, props changed)
Modified:
head/shells/zsh/Makefile
Modified: head/shells/zsh/Makefile
==============================================================================
--- head/shells/zsh/Makefile Sun Oct 16 18:46:10 2016 (r424079)
+++ head/shells/zsh/Makefile Sun Oct 16 18:46:14 2016 (r424080)
@@ -3,7 +3,7 @@
PORTNAME= zsh
DISTVERSION= 5.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= shells
MASTER_SITES= http://www.zsh.org/pub/ \
SF \
Added: head/shells/zsh/files/patch-Completion_Unix_Command___make
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/shells/zsh/files/patch-Completion_Unix_Command___make Sun Oct 16 18:46:14 2016 (r424080)
@@ -0,0 +1,31 @@
+--- Completion/Unix/Command/_make.orig 2016-10-16 18:41:19 UTC
++++ Completion/Unix/Command/_make
+@@ -262,17 +262,20 @@ _make() {
+
+ if [[ -n "$file" ]]
+ then
+- if [[ $is_gnu == gnu ]] && zstyle -t ":completion:${curcontext}:targets" call-command
++ if [[ $is_gnu == gnu ]]
+ then
+- _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null)
++ if zstyle -t ":completion:${curcontext}:targets" call-command; then
++ _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null)
++ else
++ _make-parseMakefile $PWD < $file
++ fi
+ else
+- case "$OSTYPE" in
+- freebsd*)
+- _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp -f "$file" .PHONY 2> /dev/null)
+- ;;
+- *)
++ if [[ $OSTYPE == (freebsd|dragonfly|netbsd)* || /$words[1] == */bmake* ]]; then
++ TARGETS+=(${=${(f)"$(_call_program targets "$words[1]" -s -f "$file" -V.ALLTARGETS 2> /dev/null)"}})
++ _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsdg1Fstdout -f "$file" .PHONY 2> /dev/null)
++ else
+ _make-parseMakefile $PWD < $file
+- esac
++ fi
+ fi
+ fi
+
More information about the svn-ports-head
mailing list