<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/aaf5c5816d6452cdaba71a8ccf7b3492cf117db3">https://github.com/macports/macports-base/commit/aaf5c5816d6452cdaba71a8ccf7b3492cf117db3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aaf5c5816d6452cdaba71a8ccf7b3492cf117db3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 15 00:55:29 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> move startupitem.* options to portstartupitem
</span>---
src/port1.0/port.tcl | 2 ++
src/port1.0/portdestroot.tcl | 27 +--------------------------
src/port1.0/portstartupitem.tcl | 27 ++++++++++++++++++++++++++-
3 files changed, 29 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/port.tcl b/src/port1.0/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 64edc54..99381d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +83,8 @@ package require porttrace 1.0
</span> package require portdistcheck 1.0
package require portlivecheck 1.0
package require portmirror 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+package require portstartupitem 1.0
</span> package require portload 1.0
package require portunload 1.0
package require portreload 1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdestroot.tcl b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 328e87c..4bd25a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,13 +47,7 @@ namespace eval portdestroot {
</span>
# define options
options destroot.target destroot.destdir destroot.clean destroot.keepdirs destroot.umask \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree destroot.asroot destroot.delete_la_files \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.autostart startupitem.create startupitem.executable \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.init startupitem.install startupitem.location \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logevents startupitem.logfile startupitem.name \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.netchange startupitem.pidfile startupitem.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.requires startupitem.restart startupitem.start \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.stop startupitem.type startupitem.uniquename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree destroot.asroot destroot.delete_la_files
</span> commands destroot
# Set defaults
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,24 +65,6 @@ default destroot.keepdirs ""
</span> default destroot.violate_mtree no
default destroot.delete_la_files {${delete_la_files}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.autostart no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.executable ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.init ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.install {$system_options(startupitem_install)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.location LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.logevents no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.logfile ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.name {${subport}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.netchange no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.pidfile ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.plist {${startupitem.uniquename}.plist}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.requires ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.restart ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.start ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.stop ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.type {$system_options(startupitem_type)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default startupitem.uniquename {org.macports.${startupitem.name}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set_ui_prefix
proc portdestroot::destroot_getargs {args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +133,6 @@ proc portdestroot::destroot_finish {args} {
</span>
# Create startup-scripts/items
if {[tbool startupitem.create]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- package require portstartupitem 1.0
</span> portstartupitem::startupitem_create
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portstartupitem.tcl b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4344eb0..53cb014 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +70,31 @@ package require portutil 1.0
</span> namespace eval portstartupitem {
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options startupitem.autostart startupitem.create startupitem.executable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.init startupitem.install startupitem.location \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.logevents startupitem.logfile startupitem.name \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.netchange startupitem.pidfile startupitem.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.requires startupitem.restart startupitem.start \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.stop startupitem.type startupitem.uniquename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.autostart no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.executable ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.init ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.install {$system_options(startupitem_install)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.location LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.logevents no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.logfile ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.name {${subport}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.netchange no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.pidfile ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.plist {${startupitem.uniquename}.plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.requires ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.restart ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.start ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.stop ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.type {$system_options(startupitem_type)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default startupitem.uniquename {org.macports.${startupitem.name}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set_ui_prefix
proc portstartupitem::startupitem_create_darwin_launchd {args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +228,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> }
# To log events then tell daemondo to log at verbosity=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.logevents] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool startupitem.logevents]} {
</span> lappend args "--verbosity=1"
}
</pre><pre style='margin:0'>
</pre>