<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/6025b9b419157587b4f96b75b11182d87d5f9bb2">https://github.com/macports/macports-infrastructure/commit/6025b9b419157587b4f96b75b11182d87d5f9bb2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6025b9b port_binary_distributable: remove old Tcl support
</span>6025b9b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6025b9b419157587b4f96b75b11182d87d5f9bb2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 15 15:56:42 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> port_binary_distributable: remove old Tcl support
</span>---
jobs/port_binary_distributable.tcl | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/port_binary_distributable.tcl b/jobs/port_binary_distributable.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 593e58e..95aad37 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/port_binary_distributable.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/port_binary_distributable.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/usr/bin/env port-tclsh
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if type -fp port-tclsh >/dev/null; then exec port-tclsh "$0" "$@"; else exec /usr/bin/tclsh "$0" "$@"; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span> #
# Check that binaries of a port are distributable by looking at its license
# and the licenses of its dependencies.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +14,6 @@ if type -fp port-tclsh >/dev/null; then exec port-tclsh "$0" "$@"; else exec /us
</span>
set MY_VERSION 0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-array set portsSeen {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set check_deptypes {depends_build depends_lib}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,8 +124,7 @@ proc infoForPort {portName variantInfo} {
</span> foreach dependencyType $check_deptypes {
if {[info exists portInfo($dependencyType)] && $portInfo($dependencyType) ne ""} {
foreach dependency $portInfo($dependencyType) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set afterColon [expr {[string last ":" $dependency] + 1}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend dependencyList [string range $dependency $afterColon end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dependencyList [string range $dependency [string last ":" $dependency]+1 end]
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,8 +145,8 @@ proc infoForPort {portName variantInfo} {
</span> # return license with any trailing dash followed by a number and/or plus sign removed
proc remove_version {license} {
set dash [string last - $license]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$dash != -1 && [regexp {[0-9.+]+} [string range $license [expr {$dash + 1}] end]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [string range $license 0 [expr {$dash - 1}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$dash != -1 && [regexp {[0-9.+]+} [string range $license $dash+1 end]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [string range $license 0 $dash-1]
</span> } else {
return $license
}
</pre><pre style='margin:0'>
</pre>