<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/71ac45c1e2857a6565dedd30b975afa3c5d09aa1">https://github.com/macports/macports-base/commit/71ac45c1e2857a6565dedd30b975afa3c5d09aa1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 71ac45c1e2857a6565dedd30b975afa3c5d09aa1
</span>Merge: 810221b cf99898
Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Apr 1 20:50:46 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Merge remote-tracking branch 'origin/master' into vcs-fetch
</span>
ChangeLog | 27 +++
HACKING | 10 +-
LICENSE | 2 +-
Mk/macports.autoconf.mk.in | 1 -
aclocal.m4 | 61 ++---
configure | 70 +++---
configure.ac | 5 +-
doc/Makefile.in | 9 +-
doc/macports.conf.5 | 2 +-
doc/macports.conf.in | 2 +-
doc/port-activate.1 | 2 +-
doc/port-archive.1 | 2 +-
doc/port-archivefetch.1 | 2 +-
doc/port-cat.1 | 2 +-
doc/port-cd.1 | 2 +-
doc/port-clean.1 | 2 +-
doc/port-contents.1 | 2 +-
doc/port-dependents.1 | 2 +-
doc/port-deps.1 | 2 +-
doc/port-diagnose.1 | 2 +-
doc/port-dir.1 | 2 +-
doc/port-distcheck.1 | 2 +-
doc/port-distfiles.1 | 2 +-
doc/port-dmg.1 | 2 +-
doc/port-echo.1 | 2 +-
doc/port-edit.1 | 2 +-
doc/port-exit.1 | 2 +-
doc/port-fetch.1 | 2 +-
doc/port-gohome.1 | 2 +-
doc/port-help.1 | 2 +-
doc/port-info.1 | 2 +-
doc/port-install.1 | 2 +-
doc/port-installed.1 | 2 +-
doc/port-lint.1 | 2 +-
doc/port-list.1 | 2 +-
doc/port-livecheck.1 | 2 +-
doc/port-load.1 | 2 +-
doc/port-log.1 | 2 +-
doc/port-mirror.1 | 2 +-
doc/port-notes.1 | 2 +-
doc/port-outdated.1 | 2 +-
doc/port-platform.1 | 2 +-
doc/port-provides.1 | 2 +-
doc/port-reclaim.1 | 24 +-
doc/port-reclaim.1.txt | 10 +-
doc/port-rev-upgrade.1 | 2 +-
doc/port-search.1 | 2 +-
doc/port-select.1 | 2 +-
doc/port-selfupdate.1 | 2 +-
doc/port-setrequested.1 | 2 +-
doc/port-space.1 | 2 +-
doc/port-sync.1 | 2 +-
doc/port-unarchive.1 | 2 +-
doc/port-uninstall.1 | 2 +-
doc/port-upgrade.1 | 2 +-
doc/port-usage.1 | 2 +-
doc/port-variants.1 | 2 +-
doc/port-version.1 | 2 +-
doc/port.1 | 13 +-
doc/port.1.txt | 12 +-
doc/portgroup.7 | 2 +-
doc/portstyle.7 | 2 +-
doc/portundocumented.7 | 2 +-
doc/pubkeys.conf.5 | 2 +-
doc/sources.conf.5 | 2 +-
doc/variants.conf.5 | 2 +-
portmgr/dmg/License.html | 2 +-
portmgr/dmg/ReadMe.rtf | 4 +-
src/macports1.0/macports.tcl | 47 ++--
src/macports1.0/macports_util.tcl | 6 +-
src/macports1.0/reclaim.tcl | 186 ++++++++-------
src/macports1.0/tests/macports_dlist.test | 10 +-
src/port/port.tcl | 95 ++------
src/port/portindex.tcl | 13 +-
src/port1.0/portactivate.tcl | 8 +-
src/port1.0/portbuild.tcl | 6 +-
src/port1.0/portconfigure.tcl | 14 +-
src/port1.0/portdeactivate.tcl | 7 +-
src/port1.0/portdepends.tcl | 5 +-
src/port1.0/portdestroot.tcl | 6 +-
src/port1.0/portfetch.tcl | 5 +-
src/port1.0/portinstall.tcl | 2 +-
src/port1.0/portlint.tcl | 12 +-
src/port1.0/portload.tcl | 24 +-
src/port1.0/portmirror.tcl | 7 +-
src/port1.0/portreload.tcl | 7 +-
src/port1.0/portsandbox.tcl | 19 +-
src/port1.0/portstartupitem.tcl | 257 ++++++++++++++-------
src/port1.0/porttrace.tcl | 21 +-
src/port1.0/portunload.tcl | 9 +-
src/port1.0/portutil.tcl | 21 +-
src/port1.0/tests/Portfile | 45 ++--
src/port1.0/tests/portdistcheck.test | 47 ++--
.../{Portfile.in => Portfile} | 2 +-
tests/test/case-insensitive-deactivate/test.tcl | 53 +----
tests/test/library.tcl.in | 16 +-
tests/test/svn-and-patchsites/Portfile | 25 +-
tests/test/svn-and-patchsites/patch | 0
tests/test/svn-and-patchsites/test.tcl | 27 +--
tests/test/universal/test.tcl | 3 +-
100 files changed, 738 insertions(+), 625 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --cc src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 34dd597,f7c9a85..c4e2c12
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmirror.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@@ -51,7 -51,12 +51,12 @@@ namespace eval portmirror
</span> # It also records the path in a database.
proc portmirror::mirror_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global mirror_filemap portdbpath
</span> - global fetch.type mirror_filemap portdbpath subport license
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ global mirror_filemap portdbpath subport license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact -nocase $license "nomirror"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Not mirroring $subport due to license NoMirror"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
set mirror_filemap_path [file join $portdbpath distfiles_mirror.db]
filemap open mirror_filemap $mirror_filemap_path
</pre><pre style='margin:0'>
</pre>