most recent changes, diff for xfree86

Index: x11/XFree86/Portfile
--- x11/XFree86/Portfile (revision 36949)
+++ x11/XFree86/Portfile (revision 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
"
}
}