Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2016 21:30:43 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r407181 - in branches/2016Q1/shells/bash-completion: . files
Message-ID:  <201601242130.u0OLUhhQ014920@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sun Jan 24 21:30:43 2016
New Revision: 407181
URL: https://svnweb.freebsd.org/changeset/ports/407181

Log:
  MFH: r407168
  
  Stop installing the reptyr completion.
  
  Import an upstream commit that installs the reptyr completion as _reptyr to
  avoid conflicts with the version that reptyr itself has started shipping.
  
  It is required for bash-completion not to conflict with sysutils/reptyr.
  
  PR:		206541
  Approved by:	adamw (maintainer)
  
  Approved by:	ports-secteam (delphij)

Added:
  branches/2016Q1/shells/bash-completion/files/patch-reptyr
     - copied unchanged from r407168, head/shells/bash-completion/files/patch-reptyr
Modified:
  branches/2016Q1/shells/bash-completion/Makefile
  branches/2016Q1/shells/bash-completion/pkg-plist
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/shells/bash-completion/Makefile
==============================================================================
--- branches/2016Q1/shells/bash-completion/Makefile	Sun Jan 24 20:50:49 2016	(r407180)
+++ branches/2016Q1/shells/bash-completion/Makefile	Sun Jan 24 21:30:43 2016	(r407181)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bash-completion
 PORTVERSION=	2.1
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://bash-completion.alioth.debian.org/files/

Copied: branches/2016Q1/shells/bash-completion/files/patch-reptyr (from r407168, head/shells/bash-completion/files/patch-reptyr)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/shells/bash-completion/files/patch-reptyr	Sun Jan 24 21:30:43 2016	(r407181, copy of r407168, head/shells/bash-completion/files/patch-reptyr)
@@ -0,0 +1,84 @@
+From 6a4ad49fa53cc92d3bd23b5b4db0b3318f2ef136 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Tue, 3 Feb 2015 07:55:22 +0200
+Subject: reptyr: Rename file to _reptyr to avoid conflict with upstreamed
+ completion
+
+https://github.com/nelhage/reptyr/pull/53
+---
+ completions/Makefile.am |  2 +-
+ completions/_reptyr     | 26 ++++++++++++++++++++++++++
+ completions/reptyr      | 23 -----------------------
+ 3 files changed, 27 insertions(+), 24 deletions(-)
+ create mode 100644 completions/_reptyr
+ delete mode 100644 completions/reptyr
+
+--- completions/Makefile.am
++++ completions/Makefile.am
+@@ -303,7 +303,7 @@ bashcomp_DATA = 2to3 \
+ 		_renice \
+ 		_repomanage \
+ 		reportbug \
+-		reptyr \
++		_reptyr \
+ 		resolvconf \
+ 		rfkill \
+ 		ri \
+--- /dev/null
++++ completions/_reptyr
+@@ -0,0 +1,26 @@
++# bash completion for reptyr(1)                            -*- shell-script -*-
++
++# Use of this file is deprecated.  Upstream completion is available in
++# reptyr > 0.6.2, use that instead.
++
++_reptyr()
++{
++    local cur prev words cword
++    _init_completion || return
++
++    case $prev in
++        -l)
++            return 0
++            ;;
++    esac
++
++    if [[ $cur == -* ]]; then
++        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
++        return 0
++    fi
++
++    [[ $prev != +([0-9]) ]] && _pids
++} &&
++complete -F _reptyr reptyr
++
++# ex: ts=4 sw=4 et filetype=sh
+--- completions/reptyr
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# bash completion for reptyr(1)                            -*- shell-script -*-
+-
+-_reptyr()
+-{
+-    local cur prev words cword
+-    _init_completion || return
+-
+-    case $prev in
+-        -l)
+-            return 0
+-            ;;
+-    esac
+-
+-    if [[ $cur == -* ]]; then
+-        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+-        return 0
+-    fi
+-
+-    [[ $prev != +([0-9]) ]] && _pids
+-} &&
+-complete -F _reptyr reptyr
+-
+-# ex: ts=4 sw=4 et filetype=sh
+-- 
+cgit v0.11.2
+

Modified: branches/2016Q1/shells/bash-completion/pkg-plist
==============================================================================
--- branches/2016Q1/shells/bash-completion/pkg-plist	Sun Jan 24 20:50:49 2016	(r407180)
+++ branches/2016Q1/shells/bash-completion/pkg-plist	Sun Jan 24 21:30:43 2016	(r407181)
@@ -1,6 +1,7 @@
 libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/bash_completion
 %%DATADIR%%/bash_completion.sh
+%%DATADIR%%/completions/_reptyr
 %%DATADIR%%/completions/a2x
 %%DATADIR%%/completions/abook
 %%DATADIR%%/completions/aclocal
@@ -426,7 +427,6 @@ libdata/pkgconfig/bash-completion.pc
 %%DATADIR%%/completions/renice
 %%DATADIR%%/completions/reportbug
 %%DATADIR%%/completions/repquota
-%%DATADIR%%/completions/reptyr
 %%DATADIR%%/completions/resolvconf
 %%DATADIR%%/completions/rfcomm
 %%DATADIR%%/completions/rfkill



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601242130.u0OLUhhQ014920>