Ticket #62311: portfetch-fix-svn.patch

File portfetch-fix-svn.patch, 1.2 KB (added by kencu (Ken), 4 years ago)

  • src/port1.0/portfetch.tcl 

    From 73f3f8d43fd28f37ab2b0497a5e73ecee1b98eed Mon Sep 17 00:00:00 2001
From: Ken Cunningham <ken.cunningham.webuse@gmail.com>
Date: Sun, 3 Jan 2021 08:59:02 -0800
Subject: [PATCH] portfetch: require MacPorts svn on >= Catalina

there is a /usr/bin/svn on Catalina, but it is
only a small forwarding binary and is non-functional

closes: https://trac.macports.org/ticket/61981
---
 src/port1.0/portfetch.tcl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
index 5ae89bd5a..bab4c4e25 100644
    a b proc portfetch::set_fetch_type {option action args} { 
    188188            }
    189189            svn {
    190190                # Sierra is the first macOS version whose svn supports modern TLS cipher suites.
    191                 if {${os.major} >= 16 || ${os.platform} ne "darwin"} {
     191                # Catalina's svn exists but is non-functional and hands off to another svn
     192                if {(${os.major} >= 16 && ${os.major} <= 18) || ${os.platform} ne "darwin"} {
    192193                    depends_fetch-append bin:svn:subversion
    193194                } else {
    194195                    depends_fetch-append port:subversion