From owner-svn-ports-head@freebsd.org Sun Oct 16 18:46:15 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93F38C1461C; Sun, 16 Oct 2016 18:46:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4754615AC; Sun, 16 Oct 2016 18:46:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9GIkE6c016594; Sun, 16 Oct 2016 18:46:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9GIkEU8016592; Sun, 16 Oct 2016 18:46:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610161846.u9GIkEU8016592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 16 Oct 2016 18:46:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424080 - in head/shells/zsh: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Oct 2016 18:46:15 -0000 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 +