[148553] trunk/dports/sysutils/bash-completion
raimue at macports.org
raimue at macports.org
Wed May 11 05:46:27 PDT 2016
Revision: 148553
https://trac.macports.org/changeset/148553
Author: raimue at macports.org
Date: 2016-05-11 05:46:27 -0700 (Wed, 11 May 2016)
Log Message:
-----------
sysutils/bash-completion:
Update to version 2.3, closes #51348
Modified Paths:
--------------
trunk/dports/sysutils/bash-completion/Portfile
trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff
trunk/dports/sysutils/bash-completion/files/patch-remove-pkgutil.diff
trunk/dports/sysutils/bash-completion/files/patch-vpnc.diff
Removed Paths:
-------------
trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff
trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff
trunk/dports/sysutils/bash-completion/files/patch-make.diff
trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff
Modified: trunk/dports/sysutils/bash-completion/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion/Portfile 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/Portfile 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,12 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup github 1.0
-name bash-completion
-conflicts bash-completion-devel
+github.setup scop bash-completion 2.3
epoch 1
-version 2.1
-revision 10
+conflicts bash-completion-devel
categories sysutils
platforms darwin
supported_archs noarch
@@ -17,20 +16,15 @@
Programmable completion library for bash. This port requires bash >=4.1 and \
is meant to be used together with the bash port.
-homepage http://bash-completion.alioth.debian.org/
-master_sites http://bash-completion.alioth.debian.org/files/
-checksums md5 4e2a9f11a4042a38ee79ddcd048e8b9e \
- rmd160 5e019214ee2c7788ef7d80179e30594047b23a37 \
- sha256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f
-use_bzip2 yes
+github.tarball_from releases
+use_xz yes
+checksums rmd160 0b0eb97dae3ec94edd96c3e0af981f106d3d0a23 \
+ sha256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9
+
depends_run port:bash
patchfiles patch-vpnc.diff \
- patch-make.diff \
- patch-_known_hosts_real.diff \
- patch-compat-dont-return.diff \
- patch-words-bad-array-subscript.diff \
patch-fix-quote-readline-by-ref.diff \
patch-perldoc-pod.diff \
patch-remove-pkgutil.diff
@@ -73,10 +67,6 @@
"
}
-livecheck.type regex
-livecheck.url ${homepage}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-
subport bash-completion-devel {
epoch 0
conflicts bash-completion
Deleted: trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-_known_hosts_real.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,12 +0,0 @@
-Upstream: http://alioth.debian.org/tracker/index.php?func=detail&aid=314393&group_id=100114&atid=413095
---- bash_completion
-+++ bash_completion
-@@ -1533,7 +1533,7 @@ _known_hosts_real()
-
- # append any available aliases from config files
- if [[ ${#config[@]} -gt 0 && -n "$aliases" ]]; then
-- local hosts=$( sed -ne 's/^[ \t]*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['"$'\t '"']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
-+ local hosts=$( sed -ne 's/^['$'\t '']*[Hh][Oo][Ss][Tt]\([Nn][Aa][Mm][Ee]\)\{0,1\}['$'\t '']\{1,\}\([^#*?]*\)\(#.*\)\{0,1\}$/\2/p' "${config[@]}" )
- COMPREPLY+=( $( compgen -P "$prefix$user" \
- -S "$suffix" -W "$hosts" -- "$cur" ) )
- fi
Deleted: trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-compat-dont-return.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,25 +0,0 @@
-From: Ville Skyttä <ville.skytta at iki.fi>
-Subject: don't return from sourced script
-Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=867282a
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741657
-Forwarded: not-needed
-
----
- bash_completion.sh.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- bash_completion.sh.in
-+++ bash_completion.sh.in
-@@ -1,5 +1,5 @@
- # Check for interactive bash and that we haven't already been sourced.
--[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
-+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-
- # Check for recent enough version of bash.
- bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-@@ -12,3 +12,5 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4
- fi
- fi
- unset bash bmajor bminor
-+
-+fi
Modified: trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-fix-quote-readline-by-ref.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -15,7 +15,7 @@
--- bash_completion
+++ bash_completion
-@@ -536,13 +536,24 @@ __ltrim_colon_completions()
+@@ -537,13 +537,24 @@ __ltrim_colon_completions()
# @param $2 Name of variable to return result to
_quote_readline_by_ref()
{
Deleted: trunk/dports/sysutils/bash-completion/files/patch-make.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-make.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-make.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,98 +0,0 @@
-Upstream: https://alioth.debian.org/tracker/?func=detail&atid=413095&aid=314345&group_id=100114
---- completions/make
-+++ completions/make
-@@ -20,9 +20,9 @@ function _make_target_extract_script()
- fi
-
- cat <<EOF
-- /^# Make data base/,/^# Files/d # skip until files section
-- /^# Not a target/,/^$/ d # skip not target blocks
-- /^${prefix_pat}/,/^$/! d # skip anything user dont want
-+ /^# Make data base/,/^# Files/d; # skip until files section
-+ /^# Not a target/,/^$/ d; # skip not target blocks
-+ /^${prefix_pat}/,/^$/! d; # skip anything user dont want
-
- # The stuff above here describes lines that are not
- # explicit targets or not targets other than special ones
-@@ -30,41 +30,42 @@ function _make_target_extract_script()
- # should be output.
-
- /^# File is an intermediate prerequisite/ {
-- s/^.*$//;x # unhold target
-- d # delete line
-+ s/^.*$//;x; # unhold target
-+ d; # delete line
- }
-
- /^$/ { # end of target block
-- x # unhold target
-- /^$/d # dont print blanks
-- s,^(.{${dirname_len}})(.{${#basename}}[^:/]*/?)[^:]*:.*$,${output},p
-- d # hide any bugs
-+ x; # unhold target
-+ /^$/d; # dont print blanks
-+ s|^\(.\{${dirname_len}\}\)\(.\{${#basename}\}[^:/]*/\{0,1\}\)[^:]*:.*$|${output}|p;
-+ d; # hide any bugs
- }
-
-- /^[^#\t:%]+:/ { # found target block
--
-- /^\.PHONY:/ d # special target
-- /^\.SUFFIXES:/ d # special target
-- /^\.DEFAULT:/ d # special target
-- /^\.PRECIOUS:/ d # special target
-- /^\.INTERMEDIATE:/ d # special target
-- /^\.SECONDARY:/ d # special target
-- /^\.SECONDEXPANSION:/ d # special target
-- /^\.DELETE_ON_ERROR:/ d # special target
-- /^\.IGNORE:/ d # special target
-- /^\.LOW_RESOLUTION_TIME:/ d # special target
-- /^\.SILENT:/ d # special target
-- /^\.EXPORT_ALL_VARIABLES:/ d # special target
-- /^\.NOTPARALLEL:/ d # special target
-- /^\.ONESHELL:/ d # special target
-- /^\.POSIX:/ d # special target
-- /^\.NOEXPORT:/ d # special target
-- /^\.MAKE:/ d # special target
--
-- /^[^a-zA-Z0-9]/ d # convention for hidden tgt
--
-- h # hold target
-- d # delete line
-+ # This pattern includes a literal tab character as \t is not a portable
-+ # representation and fails with BSD sed
-+ /^[^# :%]\{1,\}:/ { # found target block
-+ /^\.PHONY:/ d; # special target
-+ /^\.SUFFIXES:/ d; # special target
-+ /^\.DEFAULT:/ d; # special target
-+ /^\.PRECIOUS:/ d; # special target
-+ /^\.INTERMEDIATE:/ d; # special target
-+ /^\.SECONDARY:/ d; # special target
-+ /^\.SECONDEXPANSION:/ d; # special target
-+ /^\.DELETE_ON_ERROR:/ d; # special target
-+ /^\.IGNORE:/ d; # special target
-+ /^\.LOW_RESOLUTION_TIME:/ d; # special target
-+ /^\.SILENT:/ d; # special target
-+ /^\.EXPORT_ALL_VARIABLES:/ d; # special target
-+ /^\.NOTPARALLEL:/ d; # special target
-+ /^\.ONESHELL:/ d; # special target
-+ /^\.POSIX:/ d; # special target
-+ /^\.NOEXPORT:/ d; # special target
-+ /^\.MAKE:/ d; # special target
-+
-+ /^[^a-zA-Z0-9]/ d; # convention for hidden tgt
-+
-+ h; # hold target
-+ d; # delete line
- }
-
- EOF
-@@ -144,7 +145,7 @@ _make()
- local reset=$( set +o | grep -F posix ); set +o posix # for <(...)
- COMPREPLY=( $( LC_ALL=C \
- make -npq "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-- sed -nrf <(_make_target_extract_script $mode "$cur") ) )
-+ sed -nf <(_make_target_extract_script $mode "$cur") ) )
- $reset
-
- if [[ $mode != -d ]]; then
Modified: trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-perldoc-pod.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -10,7 +10,7 @@
--- helpers/perl
+++ helpers/perl
-@@ -23,8 +23,8 @@ sub print_modules_real {
+@@ -24,8 +24,8 @@ sub print_modules_real {
chdir($dir) or return;
# print each file
Modified: trunk/dports/sysutils/bash-completion/files/patch-remove-pkgutil.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-remove-pkgutil.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-remove-pkgutil.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,7 +1,7 @@
pkgutil completions are for Solaris CSW, let's avoid confusion with pkgutil on OS X
---- completions/Makefile.in.orig 2015-06-10 18:36:56.000000000 +0200
-+++ completions/Makefile.in 2015-06-10 18:37:07.000000000 +0200
-@@ -421,7 +421,6 @@
+--- completions/Makefile.am.orig
++++ completions/Makefile.am
+@@ -268,7 +268,6 @@ bashcomp_DATA = 2to3 \
pkgadd \
pkgrm \
pkgtool \
Modified: trunk/dports/sysutils/bash-completion/files/patch-vpnc.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-vpnc.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-vpnc.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,8 +1,8 @@
---- completions/vpnc.orig 2012-04-14 12:02:34.000000000 +0200
-+++ completions/vpnc 2012-04-14 12:09:45.000000000 +0200
-@@ -32,7 +32,7 @@
- --pid-file --local-port --udp-port --disable-natt \
- --non-inter' -- "$cur" ) )
+--- completions/vpnc.orig
++++ completions/vpnc
+@@ -54,7 +54,7 @@ _vpnc()
+ COMPREPLY=( $( compgen -W '$( _parse_help "$1" --long-help )' \
+ -- "$cur" ) )
else
- COMPREPLY=( $( compgen -W '$( command ls /etc/vpnc )' -- "$cur" ) )
+ COMPREPLY=( $( compgen -W '$( command ls @@PREFIX@@/etc/vpnc )' -- "$cur" ) )
Deleted: trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff
===================================================================
--- trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff 2016-05-11 11:16:41 UTC (rev 148552)
+++ trunk/dports/sysutils/bash-completion/files/patch-words-bad-array-subscript.diff 2016-05-11 12:46:27 UTC (rev 148553)
@@ -1,22 +0,0 @@
-From: Barry Warsaw <barry at python.org>
-Subject: Fix bash: words: bad array subscript
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741479
-Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Forwarded: yes, <20140312212729.17788.38099.reportbug at samba4.Chuck.local>
-
----
- bash_completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash_completion
-+++ bash_completion
-@@ -718,7 +718,7 @@ _init_completion()
- fi
- done
-
-- [[ $cword -eq 0 ]] && return 1
-+ [[ $cword -le 0 ]] && return 1
- prev=${words[cword-1]}
-
- [[ ${split-} ]] && _split_longopt && split=true
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160511/fa907fb1/attachment-0001.html>
More information about the macports-changes
mailing list