[93865] trunk/dports/x11/imake

[jmr at macports.org]

Revision: 93865
          https://trac.macports.org/changeset/93865
Author:   jmr at macports.org
Date:     2012-06-01 10:36:20 -0700 (Fri, 01 Jun 2012)
Log Message:
-----------
imake: use cpp not $CC -E with clang since it doesn't support -traditional-cpp, and don't change compiler defaults since configure.cpp may be empty and dependents may want a different one anyway

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	2012-06-01 17:05:56 UTC (rev 93864)
+++ trunk/dports/x11/imake/Portfile	2012-06-01 17:36:20 UTC (rev 93865)
@@ -5,6 +5,7 @@
 
 name         imake
 version      1.0.5
+revision     1
 categories   x11 devel
 license      X11
 installs_libs no
@@ -23,18 +24,13 @@
                     sha1   1fd3dca267d125ad86583d7f9663b6ff532cddd1 \
                     sha256 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
 
-patchfiles-append patch-imakemdep.h.diff
-
-post-patch {
-    reinplace "s|__MACPORTS_CPP__|${configure.cpp}|g" ${worksrcpath}/imakemdep.h
-    reinplace "s|__MACPORTS_CC__|${configure.cc}|g"   ${worksrcpath}/imakemdep.h
-}
-
 depends_run    port:xorg-cf-files path:bin/perl:perl5
 depends_build  port:pkgconfig port:xorg-xproto
 
-configure.env-append  HAS_PERL=yes RAWCPP=${configure.cpp}
+patchfiles     patch-imakemdep.h.diff
 
+configure.env  HAS_PERL=yes
+
 post-configure {
     # Ensure that the MacPorts perl is used
     reinplace \

Modified: trunk/dports/x11/imake/files/patch-imakemdep.h.diff
===================================================================
--- trunk/dports/x11/imake/files/patch-imakemdep.h.diff	2012-06-01 17:05:56 UTC (rev 93864)
+++ trunk/dports/x11/imake/files/patch-imakemdep.h.diff	2012-06-01 17:36:20 UTC (rev 93865)
@@ -1,13 +1,11 @@
---- imakemdep.h.orig	2010-05-02 10:59:14.000000000 -0700
-+++ imakemdep.h	2010-05-02 11:00:51.000000000 -0700
-@@ -270,8 +270,8 @@
- #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
- 
- #   if defined(__APPLE__)
--#    define DEFAULT_CPP "/usr/bin/cpp"
--#    define DEFAULT_CC "cc"
-+#    define DEFAULT_CPP "__MACPORTS_CPP__"
-+#    define DEFAULT_CC "__MACPORTS_CC__"
+--- 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 @@
+ #     define DEFAULT_CPP "/usr/X11R6/bin/cpp"
+ #    endif
  #   endif
- #   if defined(Lynx) || defined(__Lynx__)
- #    define DEFAULT_CC "gcc"
+-#   if defined(__GNUC__) && !defined(USE_CC_E)
++#   if defined(__GNUC__) && !defined(__clang__) && !defined(USE_CC_E)
+ #    define USE_CC_E
+ #    ifndef DEFAULT_CC
+ #     define DEFAULT_CC "gcc"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120601/635183bc/attachment.html>