[118665] trunk/dports/devel/dbus/Portfile

[mcalhoun at macports.org]

Revision: 118665
          https://trac.macports.org/changeset/118665
Author:   mcalhoun at macports.org
Date:     2014-04-07 13:33:50 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
dbus:
   * Remove distracting warnings unless variant is specifically requested.
   * Obsolete variants will disappear with next upgrade.
   * See thread https://lists.macosforge.org/pipermail/macports-dev/2014-April/026329.html
   * No revision bump because there is no change in installed files.

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2014-04-07 20:05:56 UTC (rev 118664)
+++ trunk/dports/devel/dbus/Portfile	2014-04-07 20:33:50 UTC (rev 118665)
@@ -93,14 +93,13 @@
 # These variants are obsolete
 # dbus should respect the global variable startupitem.install set in ${prefix}/etc/macports/macports.conf
 # See https://guide.macports.org/#reference.startupitems
-variant startupitem conflicts no_startupitem description {obsolete} {
+if { [variant_isset startupitem] } {
     pre-configure {
         if { ![tbool startupitem.install] } {
             ui_error "You have requested an obsolete variant that conflicts with the value of startupitem.install set in ${prefix}/etc/macports/macports.conf"
             ui_error "If you want to install the startup items, please change the global variable in ${prefix}/etc/macports/macports.conf"
             ui_error "Note: this will affect other ports"
             ui_error "See https://guide.macports.org/#reference.startupitems"
-            ui_error "If you are upgrading and just want this error to go away, run \"${sudo}port clean dbus && ${sudo}port upgrade dbus -startupitem\""
             return -code error "invalid obsolete variant"
         } else {
             ui_warn "You have requested an obsolete variant"
@@ -110,14 +109,13 @@
     }
 }
 
-variant no_startupitem conflicts startupitem description {obsolete} {
+if { [variant_isset no_startupitem] } {
     pre-configure {
         if { [tbool startupitem.install] } {
             ui_error "You have requested an obsolete variant that conflicts with the value of startupitem.install set in ${prefix}/etc/macports/macports.conf"
             ui_error "If you do not want to install the startup items, please change the global variable in ${prefix}/etc/macports/macports.conf"
             ui_error "Note: this will affect other ports"
             ui_error "See https://guide.macports.org/#reference.startupitems"
-            ui_error "If you are upgrading and just want this error to go away, run \"${sudo}port clean dbus && port ${sudo}upgrade dbus -no_startupitem\""
             return -code error "invalid obsolete variant"            
         } else {
             ui_warn "You have requested an obsolete variant"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140407/b0c52593/attachment.html>