<pre style='margin:0'>
Umesh Singla (umeshksingla) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9963c3f4d20c14a66a0c01412f64e658715bfc4f">https://github.com/macports/macports-base/commit/9963c3f4d20c14a66a0c01412f64e658715bfc4f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9963c3f4d20c14a66a0c01412f64e658715bfc4f
</span>Merge: 272ae31 520a0e1
Author: Umesh Singla <umeshksingla@gmail.com>
AuthorDate: Sun Mar 11 23:36:52 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Resolve merge conflicts
</span>
ChangeLog | 4 +-
doc/macports.conf.5 | 180 +++++++++++++++
doc/macports.conf.in | 6 +
doc/port-activate.1 | 31 +++
doc/port-archive.1 | 19 ++
doc/port-archivefetch.1 | 25 +++
doc/port-cat.1 | 16 ++
doc/port-cd.1 | 18 ++
doc/port-clean.1 | 48 ++++
doc/port-contents.1 | 68 ++++++
doc/port-dependents.1 | 24 ++
doc/port-deps.1 | 41 ++++
doc/port-diagnose.1 | 24 ++
doc/port-dir.1 | 35 +++
doc/port-distcheck.1 | 19 ++
doc/port-distfiles.1 | 16 ++
doc/port-dmg.1 | 28 +++
doc/port-echo.1 | 21 ++
doc/port-edit.1 | 30 +++
doc/port-exit.1 | 22 ++
doc/port-fetch.1 | 18 ++
doc/port-gohome.1 | 16 ++
doc/port-help.1 | 37 ++++
doc/port-info.1 | 110 +++++++++
doc/port-install.1 | 30 +++
doc/port-installed.1 | 29 +++
doc/port-lint.1 | 45 ++++
doc/port-list.1 | 16 ++
doc/port-livecheck.1 | 27 +++
doc/port-load.1 | 18 ++
doc/port-log.1 | 54 +++++
doc/port-mirror.1 | 37 ++++
doc/port-notes.1 | 24 ++
doc/port-outdated.1 | 30 +++
doc/port-platform.1 | 23 ++
doc/port-provides.1 | 17 ++
doc/port-reclaim.1 | 30 +++
doc/port-rev-upgrade.1 | 26 +++
doc/port-search.1 | 98 ++++++++
doc/port-select.1 | 53 +++++
doc/port-selfupdate.1 | 57 +++++
doc/port-setrequested.1 | 22 ++
doc/port-space.1 | 65 ++++++
doc/port-sync.1 | 23 ++
doc/port-unarchive.1 | 18 ++
doc/port-uninstall.1 | 34 +++
doc/port-upgrade.1 | 56 +++++
doc/port-usage.1 | 16 ++
doc/port-variants.1 | 35 +++
doc/port-version.1 | 24 ++
doc/port.1 | 480 +++++++++++++++++++++++++++++++++++++++-
doc/port.1.txt | 3 +-
doc/portgroup.7 | 239 ++++++++++++++++++++
doc/portstyle.7 | 10 +
doc/portundocumented.7 | 34 +++
doc/pubkeys.conf.5 | 23 ++
doc/sources.conf.5 | 67 ++++++
doc/variants.conf.5 | 19 ++
src/cregistry/entry.c | 19 +-
src/cregistry/entry.h | 2 +-
src/cregistry/sql.c | 112 +++++++++-
src/macports1.0/macports.tcl | 138 +++++++++++-
src/macports1.0/migrate.tcl | 6 +-
src/macports1.0/reclaim.tcl | 1 -
src/macports1.0/restore.tcl | 41 +++-
src/package1.0/portpkg.tcl | 2 +-
src/pextlib1.0/sip_copy_proc.c | 12 +-
src/port/port.tcl | 20 ++
src/port1.0/port.tcl | 4 +-
src/port1.0/portactivate.tcl | 5 +-
src/port1.0/portdeactivate.tcl | 8 +-
src/port1.0/portdestroot.tcl | 43 +---
src/port1.0/portfetch.tcl | 26 ++-
src/port1.0/portinstall.tcl | 45 +++-
src/port1.0/portload.tcl | 2 +-
src/port1.0/portreload.tcl | 2 +-
src/port1.0/portstartupitem.tcl | 242 +++++++++++++-------
src/port1.0/portunload.tcl | 2 +-
src/port1.0/portutil.tcl | 32 ++-
src/registry2.0/entry.c | 107 ++++++---
src/registry2.0/entryobj.c | 6 +
src/registry2.0/fileobj.c | 1 +
src/registry2.0/tests/entry.tcl | 4 +-
83 files changed, 3295 insertions(+), 225 deletions(-)
</pre><pre style='margin:0'>
</pre>