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

[source_changes at macosforge.org]

Revision: 23516
          http://trac.macosforge.org/projects/macports/changeset/23516
Author:   yves at macports.org
Date:     2007-04-03 09:30:46 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Make a more complete check :
for Apple X11 with or without X11SDK (ticket:6188)
for Apple X11SDK without X11 (ticket:10238)
Also good for ticket:1551

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

Modified: trunk/dports/x11/XFree86/Portfile
===================================================================
--- trunk/dports/x11/XFree86/Portfile	2007-04-03 16:00:30 UTC (rev 23515)
+++ trunk/dports/x11/XFree86/Portfile	2007-04-03 16:30:46 UTC (rev 23516)
@@ -28,10 +28,16 @@
     ${distname}-src-5.tgz md5 f66708c7ff882e4ca232896266fbf92f
 
 patchfiles \
-    darwin.cf.diff darwinKeyboard.c.diff detect.mk.diff \
-    patch-GL_apple-Imakefile patch-GL_apple-dri_driver.h \
-    patch-Xserver-darwin.c patch-Xserver-darwin-Imakefile \
-    xterm_Imakefile.diff XTerm.ad.diff xfree86.fink.patch
+    darwin.cf.diff \
+    darwinKeyboard.c.diff \
+    detect.mk.diff \
+    patch-GL_apple-Imakefile \
+    patch-GL_apple-dri_driver.h \
+    patch-Xserver-darwin.c \
+    patch-Xserver-darwin-Imakefile \
+    xterm_Imakefile.diff \
+    XTerm.ad.diff \
+    xfree86.fink.patch
 
 depends_build   bin:perl:perl5.8
 use_configure   no
@@ -42,22 +48,13 @@
 build.target    World
 destroot.target install install.man
 
-pre-fetch {
-    if { [file exists ${prefix}/bin/quartz-wm] } {
-        ui_msg ""
-        ui_warn "
-            You have an Apple X11 installation already.
-                MacPorts will not overwrite it. 
-            If you really want to use XFree86 instead,
-                please move it aside first :
+platform darwin {
 
-                    sudo mv /usr/X11R6 /usr/X11R6.apple
-        "
-        exit 1
+    post-patch {
+        file mkdir "${workpath}/include"
+        file link -symbolic "${workpath}/include/security" "/usr/include/pam"
     }
-}
 
-platform darwin {
     configure {
         set hostfd [open "${worksrcpath}/config/cf/host.def" a+]
         puts $hostfd "#define ProjectRoot ${prefix}"
@@ -67,33 +64,77 @@
         puts $hostfd "#define FontconfigFontsConfDir  \"${prefix}/etc/fonts\""
         close $hostfd
     }
+}
 
-    post-patch {
-        file mkdir "${workpath}/include"
-        file link -symbolic "${workpath}/include/security" "/usr/include/pam"
+
+platform puredarwin {
+
+    post-configure	{
+        set hostfd [open "${worksrcpath}/config/cf/host.def" a+]
+        puts $hostfd "#define DarwinQuartzSupport NO"
+        puts $hostfd "#define BuildGlxExt YES"
+        puts $hostfd "#define BuildGLXLibrary YES"
+        close $hostfd
     }
 }
 
 platform macosx {
-    # Should be fixed in Imakefile
+
+    # 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 "
+                    You have an Apple X11 installation already.
+                        MacPorts will not overwrite it.
+
+                    If you wish to use Apple X11,
+                        install the X11SDK included with Xcode tools.
+
+                    If you really want to use XFree86 instead,
+                        please move it aside first :
+
+                            sudo mv /usr/X11R6 /usr/X11R6.apple
+                "
+             } else {
+                ui_error "
+                    You have an Apple X11 installation already.
+                        MacPorts will not overwrite it. 
+
+                    If you really want to use XFree86 instead,
+                        please move it aside first :
+
+                            sudo mv /usr/X11R6 /usr/X11R6.apple
+                "
+             }
+        } elseif { ![file exists ${prefix}/lib/libX11.dylib] } {
+            ui_msg ""
+            ui_error "
+                    You have an Apple X11SDK installation already.
+                        MacPorts will not overwrite it. 
+
+                    If you wish to use Apple X11,
+                        install it from your MacOSX install disc.
+
+                    If you really want to use XFree86 instead,
+                        please move it aside first :
+
+                            sudo mv /usr/X11R6 /usr/X11R6.apple
+            "
+        }
+    }
+
+    # Dirty hack, should be fixed in Imakefile
     pre-destroot {
         reinplace \
             "s|\$\(DESTDIR\)\[\[:space:\]\]\[\[:space:\]\]*\$\(|\$\(DESTDIR\)\$\(|g" \
                 ${worksrcpath}/programs/Xserver/Makefile
      }
+
      post-destroot {
         xinstall -d ${destroot}/Applications/MacPorts
         cd ${destroot}/Applications/MacPorts
         system "ln -s ${prefix}/bin/XDarwin.app"
     }
 }
-
-platform puredarwin {
-    post-configure	{
-        set hostfd [open "${worksrcpath}/config/cf/host.def" a+]
-        puts $hostfd "#define DarwinQuartzSupport NO"
-        puts $hostfd "#define BuildGlxExt YES"
-        puts $hostfd "#define BuildGLXLibrary YES"
-        close $hostfd
-    }
-}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070403/663eff97/attachment.html