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

[source_changes at macosforge.org]

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

Log Message:
-----------
Fix the X11 detection code and add exit codes

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

Modified: trunk/dports/x11/XFree86/Portfile
===================================================================
--- trunk/dports/x11/XFree86/Portfile	2007-07-25 09:18:22 UTC (rev 27230)
+++ trunk/dports/x11/XFree86/Portfile	2007-07-25 14:23:40 UTC (rev 27231)
@@ -104,7 +104,7 @@
 
                             sudo mv /usr/X11R6 /usr/X11R6.apple
                 "
-             } else {
+            } else {
                 ui_error "
                     You have an Apple X11 installation already.
                         MacPorts will not overwrite it. 
@@ -114,8 +114,9 @@
 
                             sudo mv /usr/X11R6 /usr/X11R6.apple
                 "
-             }
-        } elseif { ![file exists ${prefix}/lib/libX11.dylib] } {
+            }
+            exit 1
+        } elseif { [file exists ${prefix}/include/X11/X.h] } {
             ui_msg ""
             ui_error "
                     You have an Apple X11SDK installation already.
@@ -129,6 +130,7 @@
 
                             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/e6dbd856/attachment.html