[109245] branches/release_2_2/base

[cal at macports.org]

Revision: 109245
          https://trac.macports.org/changeset/109245
Author:   cal at macports.org
Date:     2013-08-11 04:51:15 -0700 (Sun, 11 Aug 2013)
Log Message:
-----------
Cherry-pick r106810 from trunk: startupitem.autostart support for the certsync port (#35474)

Revision Links:
--------------
    https://trac.macports.org/changeset/106810

Modified Paths:
--------------
    branches/release_2_2/base/src/port1.0/portactivate.tcl
    branches/release_2_2/base/src/port1.0/portdeactivate.tcl
    branches/release_2_2/base/src/port1.0/portdestroot.tcl
    branches/release_2_2/base/src/port1.0/portstartupitem.tcl

Property Changed:
----------------
    branches/release_2_2/base/


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809,107106,107465,107527,107674,107753,108406
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/port1.0/portactivate.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portactivate.tcl	2013-08-11 11:50:41 UTC (rev 109244)
+++ branches/release_2_2/base/src/port1.0/portactivate.tcl	2013-08-11 11:51:15 UTC (rev 109245)
@@ -59,7 +59,7 @@
 }
 
 proc portactivate::activate_main {args} {
-    global env subport version revision portvariants user_options PortInfo
+    global env subport version revision portvariants user_options PortInfo startupitem.autostart UI_PREFIX
 
     registry_activate $subport $version $revision $portvariants [array get user_options]
 
@@ -97,5 +97,13 @@
         ui_notice ""
     }
 
+    if {[tbool startupitem.autostart]} {
+        ui_notice "$UI_PREFIX [format [msgcat::mc "Loading %s"] [option subport]]"
+        if {[eval_targets "load"]} {
+            ui_error [format [msgcat::mc "Failed to load %s"] [option subport]]
+            return 1
+        }
+    }
+
     return 0
 }

Modified: branches/release_2_2/base/src/port1.0/portdeactivate.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portdeactivate.tcl	2013-08-11 11:50:41 UTC (rev 109244)
+++ branches/release_2_2/base/src/port1.0/portdeactivate.tcl	2013-08-11 11:51:15 UTC (rev 109245)
@@ -57,7 +57,15 @@
 }
 
 proc portdeactivate::deactivate_main {args} {
-    global subport version revision portvariants user_options
+    global subport version revision portvariants user_options startupitem.autostart UI_PREFIX
+
+    if {[tbool startupitem.autostart]} {
+        ui_notice "$UI_PREFIX [format [msgcat::mc "Unloading %s"] [option subport]]"
+        if {[eval_targets "unload"]} {
+            ui_warn [format [msgcat::mc "Failed to unload %s, continuing anyway."] [option subport]]
+        }
+    }
+
     registry_deactivate $subport $version $revision $portvariants [array get user_options]
     return 0
 }

Modified: branches/release_2_2/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portdestroot.tcl	2013-08-11 11:50:41 UTC (rev 109244)
+++ branches/release_2_2/base/src/port1.0/portdestroot.tcl	2013-08-11 11:51:15 UTC (rev 109245)
@@ -49,11 +49,12 @@
 # define options
 options destroot.target destroot.destdir destroot.clean destroot.keepdirs destroot.umask \
         destroot.violate_mtree destroot.asroot destroot.delete_la_files \
-        startupitem.create startupitem.requires startupitem.init \
-        startupitem.name startupitem.start startupitem.stop startupitem.restart \
-        startupitem.type startupitem.executable \
-        startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange \
-        startupitem.uniquename startupitem.plist startupitem.location startupitem.install
+        startupitem.autostart startupitem.create startupitem.executable \
+        startupitem.init startupitem.install startupitem.location \
+        startupitem.logevents startupitem.logfile startupitem.name \
+        startupitem.netchange startupitem.pidfile startupitem.plist \
+        startupitem.requires startupitem.restart startupitem.start \
+        startupitem.stop startupitem.type startupitem.uniquename
 commands destroot
 
 # Set defaults

Modified: branches/release_2_2/base/src/port1.0/portstartupitem.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portstartupitem.tcl	2013-08-11 11:50:41 UTC (rev 109244)
+++ branches/release_2_2/base/src/port1.0/portstartupitem.tcl	2013-08-11 11:51:15 UTC (rev 109245)
@@ -64,6 +64,9 @@
 #       - for launchd, generate log messages inside daemondo
 #       - for systemstarter, generate log messages in our generated script
 #
+#   startupitem.autoload    yes/no
+#       Automatically load the startupitem after activating. Defaults to no.
+#
 
 package provide portstartupitem 1.0
 package require portutil 1.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130811/17f8a381/attachment.html>