<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/22d669ab8133585d749f45129059ed0619a7b6ec">https://github.com/macports/macports-base/commit/22d669ab8133585d749f45129059ed0619a7b6ec</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 22d669a Remove rcng startupitem type
</span>22d669a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 22d669ab8133585d749f45129059ed0619a7b6ec
</span>Author: Kurt Hindenburg <kurt.hindenburg@gmail.com>
AuthorDate: Sat Oct 14 11:02:28 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> Remove rcng startupitem type
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was only used on non-darwin systems and has been broken for a
</span><span style='display:block; white-space:pre;color:#404040;'> while; no port uses it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/36770
</span>---
doc/macports.conf.5 | 2 +-
doc/macports.conf.5.txt | 2 +-
doc/macports.conf.in | 3 +--
doc/portfile.7 | 2 +-
src/port1.0/portstartupitem.tcl | 49 +----------------------------------------
5 files changed, 5 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/macports.conf.5 b/doc/macports.conf.5
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f6bfff..6b65d86 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/macports.conf.5
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/macports.conf.5
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -395,7 +395,7 @@ lt lt.
</span> T{
\fBSupported types:\fR
T}:T{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-none, launchd, default, rcNG\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+none, launchd, default\&.
</span> T}
T{
\fBDefault:\fR
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/macports.conf.5.txt b/doc/macports.conf.5.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 769dd50..4e5f12b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/macports.conf.5.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/macports.conf.5.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@ startupitem_type::
</span> Set the default type of startupitems to be generated, overridable by
Portfiles that explicitly state a startupitem.type key. If set to "default",
then a type will be selected that's appropriate to the OS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *Supported types:*;; none, launchd, default, rcNG.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *Supported types:*;; none, launchd, default.
</span> *Default:*;; default
destroot_umask::
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/macports.conf.in b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a10cc29..3af5b61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,8 +121,7 @@ universal_archs @UNIVERSAL_ARCHS@
</span>
# Type of generated StartupItems.
# - launchd: Create StartupItems for use with launchd.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# - rcng: Create StartupItems for use with the rc.d system.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - default: Create StartupItems for launchd on OS X and for rc.d on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - default: Create StartupItems for launchd on OS X and none on
</span> # other platforms.
# - none: Disable creation of StartupItems.
# This setting only applies when building ports from source.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/portfile.7 b/doc/portfile.7
</span><span style='display:block; white-space:pre;color:#808080;'>index 11576e6..138cf4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1509,7 +1509,7 @@ on prior Mac OS X systems. A global default may be specified with the startupite
</span> .Em default
.br
.Sy Values:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-.Em launchd default rcNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.Em launchd default
</span> .br
.Sy Example
.Dl startupitem.type launchd
<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 5d6bc35..4344eb0 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;'>@@ -72,52 +72,6 @@ namespace eval portstartupitem {
</span>
set_ui_prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portstartupitem::startupitem_create_rcng {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix destroot os.platform \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name startupitem.requires \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.start startupitem.stop startupitem.restart \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set scriptdir ${destroot}${prefix}/etc/rc.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![exists startupitem.requires] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set startupitem.requires ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX We can't share defaults with startupitem_create_darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach item {startupitem.start startupitem.stop startupitem.restart} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists $item]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Missing required option $item"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot} ${scriptdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fd [open [file join ${scriptdir} ${startupitem.name}.sh] w 0755]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "# MacPorts generated RCng Script"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "# PROVIDE: ${startupitem.name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "# REQUIRE: ${startupitem.requires}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Implement BEFORE support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "# BEFORE:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "# KEYWORD: MacPorts"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ". ${prefix}/etc/rc.subr"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "name=\"${startupitem.name}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "start_cmd=\"${startupitem.start}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "stop_cmd=\"${startupitem.stop}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "restart_cmd=\"${startupitem.restart}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "load_rc_config \"${startupitem.name}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fd} "run_rc_command \"\$1\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc portstartupitem::startupitem_create_darwin_launchd {args} {
global UI_PREFIX prefix destroot destroot.keepdirs subport macosx_deployment_target \
startupitem.name startupitem.uniquename startupitem.plist startupitem.location \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -365,7 +319,7 @@ proc portstartupitem::startupitem_create {args} {
</span> set startupitem.type "launchd"
}
default {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set startupitem.type "rcng"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set startupitem.type "none"
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,7 +331,6 @@ proc portstartupitem::startupitem_create {args} {
</span>
switch -- ${startupitem.type} {
launchd { startupitem_create_darwin_launchd }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rcng { startupitem_create_rcng }
</span> default { ui_error "$UI_PREFIX [msgcat::mc "Unrecognized startupitem type %s" ${startupitem.type}]" }
}
}
</pre><pre style='margin:0'>
</pre>