[99826] trunk/dports/kde

[ryandesign at macports.org]

Revision: 99826
          https://trac.macports.org/changeset/99826
Author:   ryandesign at macports.org
Date:     2012-11-18 03:54:44 -0800 (Sun, 18 Nov 2012)
Log Message:
-----------
kdevelop, kdevplatform: update for changes to cmake portgroup; simplify clang and Lion-and-up c++0x addition

Modified Paths:
--------------
    trunk/dports/kde/kdevelop/Portfile
    trunk/dports/kde/kdevplatform/Portfile

Modified: trunk/dports/kde/kdevelop/Portfile
===================================================================
--- trunk/dports/kde/kdevelop/Portfile	2012-11-18 11:39:41 UTC (rev 99825)
+++ trunk/dports/kde/kdevelop/Portfile	2012-11-18 11:54:44 UTC (rev 99826)
@@ -59,29 +59,13 @@
     patchfiles-delete   patch-okteta.diff
 }    
 
-#Deleting double architecture build from cmake group
-pre-configure {
-    configure.universal_args-delete \
-        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
-    if {${configure.sdkroot} != ""} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-    } else {
-        configure.args-append -DCMAKE_OSX_SYSROOT=/
+#Using c++0x for Lion and higher in case of clang 64-bit
+if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
+    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
+    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     }
 }
 
-if {${configure.compiler} == "clang" && ${os.major} >= 11} {
-    array set merger_configure_args {
-        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
-    }
-}
-
-if {![variant_isset universal]} {
-    #Using c++0x for Lion and higher in case of clang 64-bit
-    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
-        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
-    }
-}
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/${name}
 livecheck.regex     "\(\\d+(?:\\.\\d+)*)\/"

Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile	2012-11-18 11:39:41 UTC (rev 99825)
+++ trunk/dports/kde/kdevplatform/Portfile	2012-11-18 11:54:44 UTC (rev 99826)
@@ -44,30 +44,13 @@
     patchfiles-delete   patch-pluginsCMakeLists.diff
 }
 
-#Deleting double architecture build from cmake group
-pre-configure {
-    configure.universal_args-delete \
-        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
-    if {${configure.sdkroot} != ""} {
-        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-    } else {
-        configure.args-append -DCMAKE_OSX_SYSROOT=/
+#Using c++0x for Lion and higher in case of clang 64-bit
+if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
+    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
+    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
+        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     }
 }
 
-if {${configure.compiler} == "clang" && ${os.major} >= 11} {
-    array set merger_configure_args {
-        i386   ""
-        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
-    }
-}
-
-if {![variant_isset universal]} {
-    #Using c++0x for Lion and higher in case of clang 64-bit
-    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
-        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
-    }
-}
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/kdevelop/${kdevelopversion}/src
 livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121118/e689ba34/attachment.html>