[99094] trunk/dports/kde/kdevelop

[nicos at macports.org]

Revision: 99094
          http://trac.macports.org//changeset/99094
Author:   nicos at macports.org
Date:     2012-10-25 19:53:01 -0700 (Thu, 25 Oct 2012)
Log Message:
-----------
kdevelop: update to 4.4.0, suppress note about refresh cache

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

Added Paths:
-----------
    trunk/dports/kde/kdevelop/files/patch-Cxx.diff

Removed Paths:
-------------
    trunk/dports/kde/kdevelop/files/patch-parser.diff

Modified: trunk/dports/kde/kdevelop/Portfile
===================================================================
--- trunk/dports/kde/kdevelop/Portfile	2012-10-26 02:51:38 UTC (rev 99093)
+++ trunk/dports/kde/kdevelop/Portfile	2012-10-26 02:53:01 UTC (rev 99094)
@@ -5,8 +5,7 @@
 PortGroup           kde4 1.1
 
 name                kdevelop
-version             4.3.1
-revision            3
+version             4.4.0
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -23,8 +22,8 @@
 homepage            http://www.kdevelop.org/
 master_sites        kde:stable/kdevelop/${version}/src/
 
-checksums           sha1    99596bf333bf5a62547f3dc0800674db146eb401 \
-                    rmd160  918622218a88a6efe749d3cbf75cbcf01d8367a5
+checksums           rmd160  5bef6f24b9c43175c09fc8820139dcd5635103b5 \
+                    sha256  eb276293a67f934919319e7561344a23e1e6fb07d3dc1aedbb424d9dc11f5f91
 
 use_bzip2           yes
 
@@ -36,7 +35,8 @@
                     port:oxygen-icons
 
 #Avoid automatic use of valgrind unless specified in variant
-patchfiles          patch-ConfigureChecks.diff
+#Suppress general std=c++0x definition which crashes with pure C files
+patchfiles          patch-ConfigureChecks.diff patch-Cxx.diff
 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.diff
@@ -51,17 +51,14 @@
 if {${configure.compiler} == "clang"} {
     if {${os.major} >= 11} {
         #Case of Lion and higher (ticket #34545)
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++"
+        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++" \
+        configure.args-append   -DHAVE_UNORDERED_MAP=1
         patchfiles-append       patch-declarationbuilder.diff patch-context.diff
     } else {
         #Patching code for clang on SL where libc++ is not available
         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
-        patchfiles-append       patch-parser.diff
     }
 }
 
-notes " Please run ${prefix}/bin/kbuildsycoca4    
- command after installing kdevelop."
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/${name}
 livecheck.regex     "\(\\d+(?:\\.\\d+)*)\/"

Added: trunk/dports/kde/kdevelop/files/patch-Cxx.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-Cxx.diff	                        (rev 0)
+++ trunk/dports/kde/kdevelop/files/patch-Cxx.diff	2012-10-26 02:53:01 UTC (rev 99094)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2012-10-16 06:45:36.000000000 +0900
++++ CMakeLists.txt	2012-10-20 20:11:32.000000000 +0900
+@@ -47,7 +47,6 @@
+ 
+     if(HAVE_UNORDERED_MAP)
+         message(STATUS "Enabling c++0x support for unordered map")
+-        add_definitions( -std=c++0x ) # For unordered_map
+     else(HAVE_UNORDERED_MAP)
+         check_include_file_cxx(ext/hash_map HAVE_EXT_HASH_MAP)
+     endif(HAVE_UNORDERED_MAP)

Deleted: trunk/dports/kde/kdevelop/files/patch-parser.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-parser.diff	2012-10-26 02:51:38 UTC (rev 99093)
+++ trunk/dports/kde/kdevelop/files/patch-parser.diff	2012-10-26 02:53:01 UTC (rev 99094)
@@ -1,23 +0,0 @@
---- languages/cpp/parser/parser.h.orig	2012-04-14 04:54:26.000000000 +0900
-+++ languages/cpp/parser/parser.h	2012-06-08 11:17:38.000000000 +0900
-@@ -34,14 +34,15 @@
- #include <hash_map>
- using namespace stdext;
- 
--#elif defined GXX_LT_4_3
-+//#elif defined GXX_LT_4_3
-+#else
- #include <ext/hash_map>
- using namespace __gnu_cxx;
- 
--#else // CXX-0
--#include <unordered_map>
--template <class Key, class Data>
--class  hash_map : public std::unordered_map<Key, Data> { };
-+//#else // CXX-0
-+//#include <unordered_map>
-+//template <class Key, class Data>
-+//class  hash_map : public std::unordered_map<Key, Data> { };
- #endif
- 
- class TokenStream;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121025/d3a71705/attachment.html>