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)
MFH:		2016Q1
This commit is contained in:
Raphael Kubo da Costa 2016-01-24 16:36:21 +00:00
parent c13c92a1a3
commit 7b72d170ba
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=407168
3 changed files with 86 additions and 2 deletions

View file

@ -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/

View file

@ -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

View file

@ -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