<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/30e9ca62c4157cdd5698eb6649c91673675e086b">https://github.com/macports/macports-base/commit/30e9ca62c4157cdd5698eb6649c91673675e086b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 30e9ca62c4157cdd5698eb6649c91673675e086b
</span>Merge: d54a3bb afe6052
Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Apr 15 17:32:37 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    Merge branch 'master' of github.com:macports/macports-base into vcs-fetch
</span>
 .gitignore                           |   7 +-
 ChangeLog                            |  18 ++-
 Makefile.in                          |   2 +-
 Mk/macports.autoconf.mk.in           |   5 +
 Mk/macports.subdir.mk                |   1 +
 Mk/macports.tea.mk                   |   9 +-
 config/RELEASE_URL                   |   2 +-
 configure                            |  35 ++++-
 configure.ac                         |  15 +-
 doc/archive_sites.conf               |  13 ++
 doc/macports.conf.5                  |  23 ++-
 doc/macports.conf.5.txt              |  13 +-
 doc/macports.conf.in                 |   8 +-
 doc/port.1                           |   7 +-
 doc/port.1.txt                       |   9 +-
 doc/portfile.7                       |  16 ++-
 doc/prefix.mtree.in                  |  20 +--
 portmgr/ReleaseProcess.md            |   2 +-
 src/Makefile.in                      |   2 +-
 src/compat/Makefile.in               |  30 ++++
 src/compat/getdelim.c                |  88 ++++++++++++
 src/compat/getdelim.h                |  11 ++
 src/compat/getline.c                 |  54 +++++++
 src/compat/getline.h                 |  11 ++
 src/{pextlib1.0 => compat}/strlcat.c |   6 +-
 src/{pextlib1.0 => compat}/strlcat.h |   9 +-
 src/compat/strlcpy.c                 |  53 +++++++
 src/compat/strlcpy.h                 |  10 ++
 src/config.h.in                      |   9 +-
 src/darwintracelib1.0/Makefile.in    |  11 ++
 src/darwintracelib1.0/darwintrace.c  |  18 ---
 src/macports1.0/macports.tcl         | 131 ++++++++++++-----
 src/macports1.0/reclaim.tcl          |  11 +-
 src/macports1.0/tests/macports.test  |   5 +-
 src/package1.0/portarchivefetch.tcl  |   9 +-
 src/pextlib1.0/Makefile.in           |  16 ++-
 src/pextlib1.0/Pextlib.c             |  17 ++-
 src/pextlib1.0/fgetln.c              |  78 ----------
 src/pextlib1.0/system.c              |  72 +++-------
 src/pextlib1.0/tests/system.tcl      |  79 ++++++++++
 src/port/port.tcl                    |  27 +++-
 src/port1.0/portactivate.tcl         |  15 +-
 src/port1.0/portbuild.tcl            |   3 +-
 src/port1.0/portconfigure.tcl        |  26 +++-
 src/port1.0/portextract.tcl          |  10 +-
 src/port1.0/portfetch.tcl            |   9 +-
 src/port1.0/portload.tcl             |  32 ++++-
 src/port1.0/portmain.tcl             |  15 +-
 src/port1.0/portpatch.tcl            |   8 ++
 src/port1.0/portreload.tcl           |  46 ++++--
 src/port1.0/portstartupitem.tcl      |  29 ++--
 src/port1.0/portunload.tcl           |  32 ++++-
 src/port1.0/portutil.tcl             |  46 +++++-
 src/registry2.0/Makefile.in          |   1 -
 src/registry2.0/graph.c              | 201 --------------------------
 src/registry2.0/graph.h              |  39 -----
 src/registry2.0/graphobj.c           | 146 -------------------
 src/registry2.0/graphobj.h           |  43 ------
 src/registry2.0/item.c               | 272 -----------------------------------
 src/registry2.0/item.h               |  39 -----
 src/registry2.0/itemobj.c            | 183 -----------------------
 src/registry2.0/itemobj.h            |  45 ------
 src/registry2.0/portimage.tcl        |  24 +++-
 src/registry2.0/registry.c           |   4 -
 src/registry2.0/registry.h           |   2 +-
 src/registry2.0/tests/depends.tcl    |   2 +-
 src/registry2.0/tests/entry.tcl      |   2 +-
 src/registry2.0/tests/item.tcl       |  51 -------
 standard_configure.sh                |   2 +-
 69 files changed, 936 insertions(+), 1353 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --cc src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cb32e1,2a58241..79d6473
</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;'>@@@ -46,14 -46,21 +46,15 @@@ namespace eval portfetch 
</span>  }
  
  # define options: distname master_sites
<span style='display:block; white-space:pre;background:#ffe0e0;'>- options master_sites patch_sites extract.suffix distfiles patchfiles use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg dist_subdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options master_sites patch_sites extract.suffix distfiles patchfiles use_tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg dist_subdir \
</span>      fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \
      master_sites.mirror_subdir patch_sites.mirror_subdir \
 -    bzr.url bzr.revision \
 -    cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.method \
 -    svn.url svn.revision svn.method \
 -    git.cmd git.url git.branch \
 -    hg.cmd hg.url hg.tag
 -
 -# XXX we use the command framework to buy us some useful features,
 -# but this is not a user-modifiable command
 -commands bzr
 -commands cvs
 -commands svn
 +    bzr.url bzr.revision bzr.file bzr.file_prefix \
 +    cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
 +    svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
 +    git.url git.branch git.file git.file_prefix git.fetch_submodules \
 +    hg.url hg.tag hg.file hg.file_prefix
  
  # Defaults
  default extract.suffix .tar.gz
</pre><pre style='margin:0'>

</pre>