[127155] trunk/dports

[jmr at macports.org]

Revision: 127155
          https://trac.macports.org/changeset/127155
Author:   jmr at macports.org
Date:     2014-10-21 19:47:40 -0700 (Tue, 21 Oct 2014)
Log Message:
-----------
canna, kinput2: remove workarounds now that imake is fixed

Modified Paths:
--------------
    trunk/dports/textproc/canna/Portfile
    trunk/dports/x11/kinput2/Portfile

Modified: trunk/dports/textproc/canna/Portfile
===================================================================
--- trunk/dports/textproc/canna/Portfile	2014-10-22 02:19:00 UTC (rev 127154)
+++ trunk/dports/textproc/canna/Portfile	2014-10-22 02:47:40 UTC (rev 127155)
@@ -49,10 +49,6 @@
 
 use_xmkmf       yes
 
-compiler.blacklist      *clang*
-
-build.env-append IMAKECPP="${configure.cpp}"
-
 pre-build {
     build.target    canna
     if {[variant_isset universal]} {

Modified: trunk/dports/x11/kinput2/Portfile
===================================================================
--- trunk/dports/x11/kinput2/Portfile	2014-10-22 02:19:00 UTC (rev 127154)
+++ trunk/dports/x11/kinput2/Portfile	2014-10-22 02:47:40 UTC (rev 127155)
@@ -47,19 +47,10 @@
     close ${fd}
 }
 
-#use_xmkmf      yes
-depends_build   port:imake
+use_xmkmf      yes
 
-compiler.blacklist      *clang*
-
-configure {
-    # IMAKECPP should be set explicitly before calling xmkmf.
-    system "cd ${worksrcpath} && IMAKECPP=${configure.cpp} xmkmf"
-}
-
 pre-build {
-    # IMAKECPP should be declared here too.
-    system "cd ${worksrcpath} && IMAKECPP=${configure.cpp} make Makefiles PREFIX=${prefix}"
+    system "cd ${worksrcpath} && make Makefiles PREFIX=${prefix}"
     system "cd ${worksrcpath} && make depend PREFIX=${prefix}"
 
     build.target {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141021/2ab7c220/attachment.html>