From owner-svn-ports-all@freebsd.org Sat Feb 11 05:23:20 2017 Return-Path: Delivered-To: svn-ports-all@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 E5B28CDA581; Sat, 11 Feb 2017 05:23:20 +0000 (UTC) (envelope-from asomers@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 A689EB6E; Sat, 11 Feb 2017 05:23:20 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1B5NJf6071246; Sat, 11 Feb 2017 05:23:19 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1B5NJMT071244; Sat, 11 Feb 2017 05:23:19 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201702110523.v1B5NJMT071244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 11 Feb 2017 05:23:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433836 - in head/shells/fish: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2017 05:23:21 -0000 Author: asomers (src committer) Date: Sat Feb 11 05:23:19 2017 New Revision: 433836 URL: https://svnweb.freebsd.org/changeset/ports/433836 Log: shells/fish: fix completions for python Eliminate errors during command completion for python, python2, and python3 if the /usr/local/bin/python symlink does not exist. Additionally, even if the symlink does exist, the completions will be wrong for the non-default interpreter. So I'm simply deleting the problematic completions altogether. I opened an upstream bug for the latter issue. https://github.com/fish-shell/fish-shell/issues/3840 While I'm here, delete an extraneous patch file for DOCS=off PR: 216987 Reported by: Keren Sky Approved by: brd (ports, implicit) Added: head/shells/fish/files/patch-share_completions_python.fish (contents, props changed) Deleted: head/shells/fish/files/extra-patch-Makefile.in Modified: head/shells/fish/Makefile Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sat Feb 11 04:56:57 2017 (r433835) +++ head/shells/fish/Makefile Sat Feb 11 05:23:19 2017 (r433836) @@ -3,7 +3,7 @@ PORTNAME= fish PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ @@ -28,8 +28,6 @@ NLS_USES= gettext NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes NLS_CONFIGURE_OFF= --without-gettext -DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile.in - post-patch: @${REINPLACE_CMD} -e \ '/^all:/s|user_doc|| ; \ Added: head/shells/fish/files/patch-share_completions_python.fish ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fish/files/patch-share_completions_python.fish Sat Feb 11 05:23:19 2017 (r433836) @@ -0,0 +1,18 @@ +--- share/completions/python.fish.orig 2017-02-11 04:56:23 UTC ++++ share/completions/python.fish +@@ -16,15 +16,3 @@ complete -c python -s W -x --description + complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd' + complete -c python -a "(__fish_complete_suffix .py)" + complete -c python -a '-' -d 'Read program from stdin' +- +-switch (python -V 2>&1 | string replace -r '^.*\s([23])..*' '$1')[1] +- case 2 +- complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix' +- complete -c python -s t --description "Warn on mixed tabs and spaces" +- complete -c python -s Q -x -a "old new warn warnall" --description "Division control" +- case 3 +- complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup' +- complete -c python -s X -x -d 'Set implementation-specific option' +- complete -c python -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str' +- complete -c python -o bb -d 'Issue errors' +-end