[36950] trunk/dports/x11/XFree86/Portfile
jmr at macports.org
jmr at macports.org
Tue May 20 13:10:53 PDT 2008
Revision: 36950
http://trac.macosforge.org/projects/macports/changeset/36950
Author: jmr at macports.org
Date: 2008-05-20 13:10:52 -0700 (Tue, 20 May 2008)
Log Message:
-----------
XFree86: add working detection of Apple X11 on Leopard
Modified Paths:
--------------
trunk/dports/x11/XFree86/Portfile
Modified: trunk/dports/x11/XFree86/Portfile
===================================================================
--- trunk/dports/x11/XFree86/Portfile 2008-05-20 19:44:26 UTC (rev 36949)
+++ trunk/dports/x11/XFree86/Portfile 2008-05-20 20:10:52 UTC (rev 36950)
@@ -75,7 +75,7 @@
# Should also check for cookie crumbs in the keyboard
pre-fetch {
- if { [file exists ${prefix}/bin/quartz-wm] } {
+ if { [file exists ${prefix}/bin/quartz-wm] || [file exists /usr/bin/quartz-wm] } {
if { ![file exists ${prefix}/include/X11/X.h] } {
return -code error "
@@ -88,7 +88,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv /usr/X11R6 /usr/X11R6.apple
+ sudo mv $x11prefix ${x11prefix}.apple
"
} else {
return -code error "
@@ -99,7 +99,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv /usr/X11R6 /usr/X11R6.apple
+ sudo mv $x11prefix ${x11prefix}.apple
"
}
} elseif { [file exists ${prefix}/include/X11/X.h] } {
@@ -114,7 +114,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv /usr/X11R6 /usr/X11R6.apple
+ sudo mv $x11prefix ${x11prefix}.apple
"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080520/2548e1ff/attachment-0001.htm
More information about the macports-changes
mailing list