<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/4acfd686dc1e88befaf288c549d7e895e1b13347">https://github.com/macports/macports-base/commit/4acfd686dc1e88befaf288c549d7e895e1b13347</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4acfd686dc1e88befaf288c549d7e895e1b13347
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 17 10:52:39 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> Always use subversion port for svn fetch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60854
</span>---
configure | 55 ----------------------------------------
configure.ac | 2 --
src/port1.0/port_autoconf.tcl.in | 1 -
src/port1.0/portfetch.tcl | 21 +++------------
4 files changed, 3 insertions(+), 76 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 aa1dd0e9..a86f8938 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;'>@@ -729,7 +729,6 @@ XAR
</span> UNZIP
TAR
SWIG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SVN
</span> SED
SANDBOX_EXEC
RSYNC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -852,7 +851,6 @@ with_open
</span> with_openssl
with_rsync
with_sed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-with_svn
</span> with_swig
with_tar
with_xar
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1528,7 +1526,6 @@ Optional Packages:
</span> --with-openssl=PATH path to alternate openssl command
--with-rsync=PATH path to alternate rsync command
--with-sed=PATH path to alternate sed command
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-svn=PATH path to alternate svn command
</span> --with-swig=PATH path to alternate swig command
--with-tar=PATH path to alternate tar command
--with-xar=PATH path to alternate xar command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4084,13 +4081,6 @@ then :
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check whether --with-svn was given.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test ${with_svn+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- withval=$with_svn; SVN=$withval
</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> # Check whether --with-swig was given.
if test ${with_swig+y}
then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5813,51 +5803,6 @@ printf "%s\n" "no" >&6; }
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Extract the first word of "svn", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set dummy svn; ac_word=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf %s "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test ${ac_cv_path_SVN+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $SVN in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_SVN="$SVN" # 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;'>- case $as_dir in #(((
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '') as_dir=./ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) as_dir=$as_dir/ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</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_SVN="$as_dir$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$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;'>-SVN=$ac_cv_path_SVN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -n "$SVN"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SVN" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "$SVN" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "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> # Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
<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 2bbb765e..f5b23b4e 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;'>@@ -128,7 +128,6 @@ MP_TOOL_PATH(OPEN, [open])
</span> MP_TOOL_PATH(OPENSSL, [openssl])
MP_TOOL_PATH(RSYNC, [rsync])
MP_TOOL_PATH(SED, [sed])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MP_TOOL_PATH(SVN, [svn])
</span> MP_TOOL_PATH(SWIG, [swig])
MP_TOOL_PATH(TAR, [tar])
MP_TOOL_PATH(XAR, [xar])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +171,6 @@ AC_PATH_PROG(RMDIR, [rmdir], [])
</span> AC_PATH_PROG(RSYNC, [rsync], [])
AC_PATH_PROG(SANDBOX_EXEC, [sandbox-exec], [], [/usr/bin])
AC_PATH_PROG(SED, [sed])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_PATH_PROG(SVN, [svn], [])
</span> AC_PATH_PROG(SWIG, [swig], [])
AC_PATH_PROG(TAR, [tar])
AC_PATH_PROG(UNZIP, [unzip])
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/port_autoconf.tcl.in b/src/port1.0/port_autoconf.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 039ac641..713a5a9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/port_autoconf.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/port_autoconf.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,6 @@ namespace eval portutil::autoconf {
</span> variable find_path "@FIND@"
variable bzr_path "@BZR@"
variable cvs_path "@CVS@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variable svn_path "@SVN@"
</span> variable git_path "@GIT@"
variable hg_path "@HG@"
variable gzip_path "@GZIP_BIN@"
<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 a1b6bc5d..b942c749 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;'>@@ -85,12 +85,12 @@ default cvs.pre_args {-z9 -f -d ${cvs.root}}
</span> default cvs.args ""
default cvs.post_args {${cvs.module}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default svn.cmd {[portfetch::find_svn_path]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default svn.cmd {${prefix_frozen}/bin/svn}
</span> default svn.dir {${workpath}}
default svn.method {export}
default svn.revision ""
default svn.env {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default svn.pre_args "--non-interactive --trust-server-cert"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default svn.pre_args --non-interactive
</span> default svn.args ""
default svn.post_args ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,12 +187,7 @@ proc portfetch::set_fetch_type {option action args} {
</span> depends_fetch-append bin:cvs:cvs
}
svn {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Oldest macOS version whose svn can validate GitHub's SSL certificate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 16 || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append bin:svn:subversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append port:subversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch-append port:subversion
</span> }
git {
# Oldest macOS version whose git can validate GitHub's SSL certificate.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,16 +204,6 @@ proc portfetch::set_fetch_type {option action args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portfetch::find_svn_path {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix_frozen os.platform os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Oldest macOS version whose svn can validate GitHub's SSL certificate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 16 || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [findBinary svn $portutil::autoconf::svn_path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix_frozen}/bin/svn
</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> proc portfetch::find_git_path {args} {
global prefix_frozen os.platform os.major
# Oldest macOS version whose git can validate GitHub's SSL certificate.
</pre><pre style='margin:0'>
</pre>