<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch vcs-fetch
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d28ec4564f13b59afd439ee3fbf05f9c43a76bb9">https://github.com/macports/macports-base/commit/d28ec4564f13b59afd439ee3fbf05f9c43a76bb9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d28ec4564f13b59afd439ee3fbf05f9c43a76bb9
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Apr 12 16:12:06 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> fetch: Always use ${prefix}/bin/git for gitfetch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See also 784fee88.
</span>---
configure | 41 -----------------------------------------
configure.ac | 1 -
src/port1.0/portfetch.tcl | 14 ++------------
3 files changed, 2 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c2f847..ad622c8 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -724,7 +724,6 @@ GZIP_BIN
</span> GNUTAR
GNUPATCH
GNUMAKE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-GIT
</span> FIND
FILE
DSEDITGROUP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4447,46 +4446,6 @@ $as_echo "no" >&6; }
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Extract the first word of "git", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set dummy git; ac_word=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$as_echo_n "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ${ac_cv_path_GIT+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $GIT in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_GIT="$GIT" # Let the user override the test with a path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -z "$as_dir" && as_dir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GIT=$ac_cv_path_GIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -n "$GIT"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$as_echo "$GIT" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> for ac_prog in gnumake gmake
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index eff4b08..9fde348 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,6 @@ AC_PATH_PROG(DSCL, [dscl], [])
</span> AC_PATH_PROG(DSEDITGROUP, [dseditgroup], [], [$PATH:/usr/sbin])
AC_PATH_PROG(FILE, [file], [])
AC_PATH_PROG(FIND, [find], [])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_PATH_PROG(GIT, [git], [])
</span> AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [])
AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [])
AC_PATH_PROGS(GNUTAR, [gnutar gtar], [])
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b16ed1..73deb9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ default svn.ignore_keywords no
</span> default svn.file {${distname}.${fetch.type}.tar.bz2}
default svn.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default git.cmd {[portfetch::find_git_path]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default git.cmd {${prefix}/bin/git}
</span> default git.url ""
default git.branch ""
default git.file {${distname}.${fetch.type}.tar.bz2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,16 +221,6 @@ proc portfetch::find_svn_path {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portfetch::find_git_path {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mavericks is the first OS X version whose git supports modern TLS cipher suites.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13 || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [findBinary git $portutil::autoconf::git_path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix}/bin/git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set_ui_prefix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -756,7 +746,7 @@ proc portfetch::mirrorable {args} {
</span> # Perform a git fetch
proc portfetch::gitfetch {args} {
global UI_PREFIX portverbose \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distpath workpath worksrcpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distpath workpath worksrcpath prefix \
</span> git.url git.branch git.fetch_submodules git.file git.file_prefix git.cmd \
name distname fetch.type
</pre><pre style='margin:0'>
</pre>