[27241] trunk/dports/x11/XFree86/Portfile

[source_changes at macosforge.org]

Revision: 27241
          http://trac.macosforge.org/projects/macports/changeset/27241
Author:   yves at macports.org
Date:     2007-07-25 08:31:40 -0700 (Wed, 25 Jul 2007)

Log Message:
-----------
Use return instead of exit 

Modified Paths:
--------------
    trunk/dports/x11/XFree86/Portfile

Modified: trunk/dports/x11/XFree86/Portfile
===================================================================
--- trunk/dports/x11/XFree86/Portfile	2007-07-25 15:28:01 UTC (rev 27240)
+++ trunk/dports/x11/XFree86/Portfile	2007-07-25 15:31:40 UTC (rev 27241)
@@ -90,9 +90,9 @@
     # Should also check for cookie crumbs in the keyboard
     pre-fetch {
         if { [file exists ${prefix}/bin/quartz-wm] } {
-            ui_msg ""
             if { ![file exists ${prefix}/include/X11/X.h] } {
-                ui_error "
+                return -code error "
+                
                     You have an Apple X11 installation already.
                         MacPorts will not overwrite it.
 
@@ -105,7 +105,8 @@
                             sudo mv /usr/X11R6 /usr/X11R6.apple
                 "
             } else {
-                ui_error "
+                return -code error "
+                
                     You have an Apple X11 installation already.
                         MacPorts will not overwrite it. 
 
@@ -115,10 +116,9 @@
                             sudo mv /usr/X11R6 /usr/X11R6.apple
                 "
             }
-            exit 1
         } elseif { [file exists ${prefix}/include/X11/X.h] } {
-            ui_msg ""
-            ui_error "
+            return -code error "
+            
                     You have an Apple X11SDK installation already.
                         MacPorts will not overwrite it. 
 
@@ -130,7 +130,6 @@
 
                             sudo mv /usr/X11R6 /usr/X11R6.apple
             "
-            exit 1
         }
     }
 

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