<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/5b83aaa439ec5ca7b5c03bac2f07f2f5076cd60e">https://github.com/macports/macports-base/commit/5b83aaa439ec5ca7b5c03bac2f07f2f5076cd60e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5b83aaa439ec5ca7b5c03bac2f07f2f5076cd60e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 18 08:07:17 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> Support startupitems that aren't generated by base
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Whether a port has a startupitem is now indicated by startupitem.type
</span><span style='display:block; white-space:pre;color:#404040;'> not being "none". Setting startupitem.create indicates that base should
</span><span style='display:block; white-space:pre;color:#404040;'> generate a startupitem, and changes the default value of
</span><span style='display:block; white-space:pre;color:#404040;'> startupitem.type.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If you want a traditional startupitem to be generated, nothing changes.
</span><span style='display:block; white-space:pre;color:#404040;'> If you want to provide your own, set startupitem.type to the type you
</span><span style='display:block; white-space:pre;color:#404040;'> are providing and install it yourself; and don't set
</span><span style='display:block; white-space:pre;color:#404040;'> startupitem.create.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/36770
</span>---
src/port1.0/portstartupitem.tcl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
<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 dea6d5b..6a1bfec 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;'>@@ -108,7 +108,11 @@ set_ui_prefix
</span>
# Calculate a default value for startupitem.type
proc portstartupitem::get_startupitem_type {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global system_options os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global system_options os.platform startupitem.create
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![tbool startupitem.create]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
set type $system_options(startupitem_type)
if {$type eq "default" || $type eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +131,7 @@ proc portstartupitem::get_startupitem_type {} {
</span> # Add user notes regarding any installed startupitem
proc portstartupitem::add_notes {} {
global startupitem.create startupitem.autostart subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![tbool startupitem.create]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.type} eq "none"} {
</span> return
}
if {[exists notes]} {
</pre><pre style='margin:0'>
</pre>