[112338] trunk/dports/kde/kdevelop

Sat Oct 19 00:05:58 PDT 2013

Revision: 112338
          https://trac.macports.org/changeset/112338
Author:   nicos at macports.org
Date:     2013-10-19 00:05:57 -0700 (Sat, 19 Oct 2013)
Log Message:
-----------
Kdevelop: update to 4.5.1, correct okteta and valgrind variants, solve license conflict with openssl

Modified Paths:
--------------
    trunk/dports/kde/kdevelop/Portfile
    trunk/dports/kde/kdevelop/files/patch-CMakeLists.diff
    trunk/dports/kde/kdevelop/files/patch-okteta.diff

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

Modified: trunk/dports/kde/kdevelop/Portfile
===================================================================

--- trunk/dports/kde/kdevelop/Portfile	2013-10-19 07:03:04 UTC (rev 112337)
+++ trunk/dports/kde/kdevelop/Portfile	2013-10-19 07:05:57 UTC (rev 112338)
@@ -6,7 +6,7 @@
 PortGroup           muniversal 1.0
 
 name                kdevelop
-version             4.4.1
+version             4.5.1
 categories          kde kde4
 platforms           darwin
 license             GPL-2+
@@ -23,8 +23,8 @@
 homepage            http://www.kdevelop.org/
 master_sites        kde:stable/kdevelop/${version}/src/
 
-checksums           rmd160  e37a5f25711bb283b68e7a8d2a2f194c3176abcb \
-                    sha256  7efac56e0390910247e8d3c4a80ce215a1dc4c75b0a1ecc5b594d8de35acde0c
+checksums           rmd160  447d1a8ff4f995a0ff876eeabb048b63a7d77b25 \
+                    sha256  36b559b0c0aff13370e27dda57383605e719b55e4b95abd932e513183fcb46ee
 
 use_bzip2           yes
 
@@ -35,13 +35,25 @@
                     port:kate \
                     port:oxygen-icons
 
-#1. Avoid automatic use of valgrind unless specified in variant
-#2. Avoid automatic use of okteta unless specified in variant
-#3. Suppress general std=c++0x definition which crashes with pure C files
-#4-5. Change use of std::list with QList which is recognized during build
-patchfiles          patch-ConfigureChecks.diff \
-                    patch-okteta.diff \
-                    patch-Cxx.diff \
+#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
+license_noconflict  openssl
+
+pre-configure {
+    #Suppress these arguments from cmake portgroup 
+    #which break compilation for develop
+    configure.args-delete   -DCMAKE_OSX_DEPLOYMENT_TARGET="" \
+                            -DCMAKE_OSX_SYSROOT=/
+}
+
+pre-build {
+    #Mac compilers do not link with .so libraries
+    reinplace "s|../../../lib/kdevcpplanguagesupport.so||g" \
+        ${workpath}/build/languages/cpp/tests/CMakeFiles/cppassistantstest.dir/link.txt
+}
+
+#1. Avoid automatic use of okteta unless specified in variant (find scripts are broken)
+#2-3. Change use of std::list with QList which is recognized during build
+patchfiles          patch-okteta.diff \
                     patch-declarationbuilder.diff \
                     patch-context.diff
 
@@ -49,13 +61,11 @@
     patchfiles-append   patch-CMakeLists.diff
 }
 
-variant valgrind description "Adds support for valgrind" {
-    depends_lib-append  port:valgrind
-    patchfiles-delete   patch-ConfigureChecks.diff
-}
+variant valgrind description \
+    "Obsolete stub variant (kdevelop does not use valgrind anymore)" {}
 
-variant okteta description "Adds support for okteta and kdesdk" {
-    depends_lib-append  port:kdesdk4
+variant okteta description "Adds support for okteta" {
+    depends_lib-append  port:okteta
     patchfiles-delete   patch-okteta.diff
 }    
 

Modified: trunk/dports/kde/kdevelop/files/patch-CMakeLists.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-CMakeLists.diff	2013-10-19 07:03:04 UTC (rev 112337)
+++ trunk/dports/kde/kdevelop/files/patch-CMakeLists.diff	2013-10-19 07:05:57 UTC (rev 112338)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2012-04-14 04:58:45.000000000 +0900
-+++ CMakeLists.txt	2012-07-14 19:47:30.000000000 +0900
-@@ -50,7 +50,7 @@
+--- CMakeLists.txt.orig	2013-10-18 21:01:21.000000000 +0900
++++ CMakeLists.txt	2013-10-18 21:01:26.000000000 +0900
+@@ -49,7 +49,7 @@
  add_subdirectory(documentation)
- add_subdirectory(providers)
+ add_subdirectory(kdeintegration)
  add_subdirectory(utils)
 -add_subdirectory(doc)
 +#add_subdirectory(doc)
+ add_subdirectory(file_templates)
+ 
  #macro_optional_add_subdirectory(doc)
- 
- macro_display_feature_log()

Deleted: trunk/dports/kde/kdevelop/files/patch-ConfigureChecks.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-ConfigureChecks.diff	2013-10-19 07:03:04 UTC (rev 112337)
+++ trunk/dports/kde/kdevelop/files/patch-ConfigureChecks.diff	2013-10-19 07:05:57 UTC (rev 112338)
@@ -1,7 +0,0 @@
---- ConfigureChecks.cmake.orig	2012-09-24 21:37:58.000000000 +0900
-+++ ConfigureChecks.cmake	2012-09-24 21:38:00.000000000 +0900
-@@ -1,3 +1,3 @@
- include(CheckIncludeFiles)
- 
--check_include_files(valgrind/valgrind.h   HAVE_VALGRIND_H)
-+#check_include_files(valgrind/valgrind.h   HAVE_VALGRIND_H)

Deleted: trunk/dports/kde/kdevelop/files/patch-Cxx.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-Cxx.diff	2013-10-19 07:03:04 UTC (rev 112337)
+++ trunk/dports/kde/kdevelop/files/patch-Cxx.diff	2013-10-19 07:05:57 UTC (rev 112338)
@@ -1,10 +0,0 @@
---- 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)

Modified: trunk/dports/kde/kdevelop/files/patch-okteta.diff
===================================================================
--- trunk/dports/kde/kdevelop/files/patch-okteta.diff	2013-10-19 07:03:04 UTC (rev 112337)
+++ trunk/dports/kde/kdevelop/files/patch-okteta.diff	2013-10-19 07:05:57 UTC (rev 112338)
@@ -1,5 +1,5 @@
---- utils/CMakeLists.txt.orig	2012-10-16 06:40:52.000000000 +0900
-+++ utils/CMakeLists.txt	2012-10-30 00:55:39.000000000 +0900
+--- utils/CMakeLists.txt.orig	2013-10-19 14:45:54.000000000 +0900
++++ utils/CMakeLists.txt	2013-10-19 14:46:00.000000000 +0900
 @@ -1,4 +1,4 @@
 -macro_optional_find_package( LibOktetaKasten )
 +#macro_optional_find_package( LibOktetaKasten )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131019/bc5f7083/attachment-0001.html>
