[126419] trunk/dports/x11/imake

[jmr at macports.org]

Revision: 126419
          https://trac.macports.org/changeset/126419
Author:   jmr at macports.org
Date:     2014-10-09 14:52:12 -0700 (Thu, 09 Oct 2014)
Log Message:
-----------
imake: use tradcpp on 10.8 and up (#41408). Dependents will still need to set configure.cpp to ${prefix}/bin/tradcpp until r125859 is released.

Revision Links:
--------------
    https://trac.macports.org/changeset/125859

Modified Paths:
--------------
    trunk/dports/x11/imake/Portfile
    trunk/dports/x11/imake/files/patch-imakemdep.h.diff

Modified: trunk/dports/x11/imake/Portfile
===================================================================
--- trunk/dports/x11/imake/Portfile	2014-10-09 21:50:06 UTC (rev 126418)
+++ trunk/dports/x11/imake/Portfile	2014-10-09 21:52:12 UTC (rev 126419)
@@ -5,7 +5,7 @@
 
 name         imake
 version      1.0.5
-revision     1
+revision     2
 categories   x11 devel
 license      X11
 installs_libs no
@@ -27,7 +27,17 @@
 depends_run    port:xorg-cf-files path:bin/perl:perl5
 depends_build  port:pkgconfig port:xorg-xproto
 
+if {${os.platform} eq "darwin" && ${os.major} >= 12} {
+    depends_run-append port:tradcpp
+    set cppcmd ${prefix}/bin/tradcpp
+} else {
+    set cppcmd /usr/bin/cpp
+}
+
 patchfiles     patch-imakemdep.h.diff
+post-patch {
+    reinplace "s|::CPPCMD::|${cppcmd}|" ${worksrcpath}/imakemdep.h
+}
 
 configure.env  HAS_PERL=yes
 

Modified: trunk/dports/x11/imake/files/patch-imakemdep.h.diff
===================================================================
--- trunk/dports/x11/imake/files/patch-imakemdep.h.diff	2014-10-09 21:50:06 UTC (rev 126418)
+++ trunk/dports/x11/imake/files/patch-imakemdep.h.diff	2014-10-09 21:52:12 UTC (rev 126419)
@@ -1,6 +1,15 @@
 --- imakemdep.h.orig	2012-03-08 16:47:32.000000000 +1100
-+++ imakemdep.h	2012-06-02 03:24:16.000000000 +1000
-@@ -339,7 +339,7 @@
++++ imakemdep.h	2014-09-28 14:41:15.000000000 +1000
+@@ -267,7 +267,7 @@ in this Software without prior written a
+ #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
+ 
+ #   if defined(__APPLE__)
+-#    define DEFAULT_CPP "/usr/bin/cpp"
++#    define DEFAULT_CPP "::CPPCMD::"
+ #    define DEFAULT_CC "cc"
+ #   endif
+ #   if defined(Lynx) || defined(__Lynx__)
+@@ -339,7 +339,7 @@ in this Software without prior written a
  #     define DEFAULT_CPP "/usr/X11R6/bin/cpp"
  #    endif
  #   endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141009/2a81ca21/attachment.html>