[30823] trunk/base

[source_changes at macosforge.org]

Revision: 30823
          http://trac.macosforge.org/projects/macports/changeset/30823
Author:   afb at macports.org
Date:     2007-11-07 15:12:32 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
commit patch from sfiera, approved by: jberry, requested by: encre (#12743)

Modified Paths:
--------------
    trunk/base/doc/macports.conf.5
    trunk/base/src/port1.0/portstartupitem.tcl

Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5	2007-11-07 22:31:15 UTC (rev 30822)
+++ trunk/base/doc/macports.conf.5	2007-11-07 23:12:32 UTC (rev 30823)
@@ -149,7 +149,7 @@
 .It Va startupitem_type
 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.
-Supported types are: SystemStarter, launchd, default, rcNG.
+Supported types are: none, SystemStarter, launchd, default, rcNG.
 .br
 .Ic Default:
 default

Modified: trunk/base/src/port1.0/portstartupitem.tcl
===================================================================
--- trunk/base/src/port1.0/portstartupitem.tcl	2007-11-07 22:31:15 UTC (rev 30822)
+++ trunk/base/src/port1.0/portstartupitem.tcl	2007-11-07 23:12:32 UTC (rev 30823)
@@ -630,12 +630,16 @@
         }
     }
 
-    ui_msg "$UI_PREFIX [msgcat::mc "Creating ${startupitem.type} control script"]"
+    if { ${startupitem.type} == "none" } {
+        ui_msg "$UI_PREFIX [msgcat::mc "Skipping creation of control script"]"
+    } else {
+        ui_msg "$UI_PREFIX [msgcat::mc "Creating ${startupitem.type} control script"]"
 
-    switch -- ${startupitem.type} {
-        launchd         { startupitem_create_darwin_launchd }
-        systemstarter   { startupitem_create_darwin_systemstarter }
-        rcng            { startupitem_create_rcng }
-        default         { ui_error "$UI_PREFIX [msgcat::mc "Unrecognized startupitem type %s" ${startupitem.type}]" }
+        switch -- ${startupitem.type} {
+            launchd         { startupitem_create_darwin_launchd }
+            systemstarter   { startupitem_create_darwin_systemstarter }
+            rcng            { startupitem_create_rcng }
+            default         { ui_error "$UI_PREFIX [msgcat::mc "Unrecognized startupitem type %s" ${startupitem.type}]" }
+        }
     }
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071107/b9c0ea07/attachment.html