[48738] trunk/dports/x11/imake/Portfile

mcalhoun at macports.org mcalhoun at macports.org
Fri Mar 27 14:04:40 PDT 2009


Revision: 48738
          http://trac.macports.org/changeset/48738
Author:   mcalhoun at macports.org
Date:     2009-03-27 14:04:40 -0700 (Fri, 27 Mar 2009)
Log Message:
-----------
imake: Add build dependency on xorg-xproto.
Allow use of system xorg-xproto with variant system_x11.
Fixes #18081.

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

Modified: trunk/dports/x11/imake/Portfile
===================================================================
--- trunk/dports/x11/imake/Portfile	2009-03-27 19:52:33 UTC (rev 48737)
+++ trunk/dports/x11/imake/Portfile	2009-03-27 21:04:40 UTC (rev 48738)
@@ -25,7 +25,7 @@
     rmd160 e440ee22baca33d2831a3ecb8453dca43b3d862e \
 
 depends_run    port:xorg-cf-files path:bin/perl:perl5
-depends_build  port:pkgconfig
+depends_build  port:pkgconfig port:xorg-xproto
 
 configure.env-append  HAS_PERL=yes
 configure.args  --mandir=${prefix}/share/man
@@ -37,6 +37,30 @@
         ${worksrcpath}/mkhtmlindex.pl
 }
 
+variant system_x11 description {Use the system X11 rather than MacPorts} {
+    if { ! [string equal ${prefix} ${x11prefix}] } {
+        if { [file exists ${x11prefix}/bin/imake] } {
+            # imake was installed by system X11.
+            depends_build
+            depends_lib
+            depends_run
+            fetch           { }
+            checksum        { }
+            extract         { }
+            patch           { }
+            build           { }
+            destroot        {
+                xinstall -d ${destroot}${prefix}/share/doc/${name}
+                system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
+            }
+            use_configure no
+        } elseif { ${os.major} >= 9 && [file exists ${x11prefix}/lib/pkgconfig/xproto.pc] } {
+            # Current versions of XQuartz no longer provide imake, so system_x11 means use the X11 headers.
+            depends_build-delete port:xorg-xproto
+        }
+    }
+}
+
 livecheck.check  regex
 livecheck.url    "http://xorg.freedesktop.org/releases/individual/util/?C=M;O=D"
 livecheck.regex  ${name}-(\\d+(?:\\.\\d+)*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090327/79aaed6a/attachment-0001.html>


More information about the macports-changes mailing list