[121377] trunk/dports/kde/kdelibs4

[nicos at macports.org]

Revision: 121377
          https://trac.macports.org/changeset/121377
Author:   nicos at macports.org
Date:     2014-06-24 09:02:37 -0700 (Tue, 24 Jun 2014)
Log Message:
-----------
kdelibs4: remove faulty FindFlex.cmake file (ticket #44119)

Modified Paths:
--------------
    trunk/dports/kde/kdelibs4/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdelibs4/files/patch-removeFindFlex.diff

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2014-06-24 15:37:55 UTC (rev 121376)
+++ trunk/dports/kde/kdelibs4/Portfile	2014-06-24 16:02:37 UTC (rev 121377)
@@ -59,7 +59,8 @@
                     patch-cmake-modules-FindKDE4-Internal.cmake.diff \
                     patch-cmake-modules-FindPhonon.cmake.diff \
                     patch-cmake-modules-FindQt4.cmake.diff \
-                    patch-cmake-modules-KDE4Macros.cmake.diff
+                    patch-cmake-modules-KDE4Macros.cmake.diff \
+                    patch-removeFindFlex.diff
 
 #The patch forcing raster graphics (speeding up some applications) causes others to 
 #crash (see for example kmymoney in #43767)
@@ -89,6 +90,11 @@
 
 set startup_root ""
 
+pre-configure {
+    #The FindFlex.cmake file is not working and may conflict with the one provided by cmake (ticket #44119)
+    delete file ${worksrcpath}/cmake/modules/FindFlex.cmake
+}
+
 pre-activate {
     if {![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
         && [vercmp [lindex $vers 1] 4.8.1] < 0} {

Added: trunk/dports/kde/kdelibs4/files/patch-removeFindFlex.diff
===================================================================
--- trunk/dports/kde/kdelibs4/files/patch-removeFindFlex.diff	                        (rev 0)
+++ trunk/dports/kde/kdelibs4/files/patch-removeFindFlex.diff	2014-06-24 16:02:37 UTC (rev 121377)
@@ -0,0 +1,10 @@
+--- kdelibs-4.12.5-orig/cmake/modules/CMakeLists.txt	2014-04-28 13:37:51.000000000 +0900
++++ kdelibs-4.12.5/cmake/modules/CMakeLists.txt	2014-06-24 21:32:09.000000000 +0900
+@@ -41,7 +41,6 @@
+                FindFAM.cmake
+                FindFFmpeg.cmake
+                FindFlac.cmake
+-               FindFlex.cmake
+                FindFontconfig.cmake
+                FindGLIB2.cmake
+                FindGMP.cmake
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140624/829ffa2f/attachment.html>