[134234] trunk/dports/devel/akonadi

[nicos at macports.org]

Revision: 134234
          https://trac.macports.org/changeset/134234
Author:   nicos at macports.org
Date:     2015-03-20 07:48:34 -0700 (Fri, 20 Mar 2015)
Log Message:
-----------
akonadi: update to latest version on git repo (ticket #46952)

Modified Paths:
--------------
    trunk/dports/devel/akonadi/Portfile

Removed Paths:
-------------
    trunk/dports/devel/akonadi/files/patch-tests.diff

Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile	2015-03-20 14:48:23 UTC (rev 134233)
+++ trunk/dports/devel/akonadi/Portfile	2015-03-20 14:48:34 UTC (rev 134234)
@@ -5,9 +5,14 @@
 PortGroup           kde4    1.1
 PortGroup           compiler_blacklist_versions 1.0
 
+#Fetch from git repository to follow updates after the end of KDE4 public releases
+fetch.type          git
+git.url             git://anongit.kde.org/akonadi
+git.branch          c733429f
+
 name                akonadi
-version             1.13.0
-revision            1
+set akoversion      1.13.1
+version             ${akoversion}.20141210
 categories          devel kde kde4
 maintainers         nicos openmaintainer
 license             LGPL-2+
@@ -16,12 +21,7 @@
 for PIM data and metadata providing concurrent read, write, and query access.
 platforms           darwin
 homepage            http://community.kde.org/KDE_PIM/Akonadi
-master_sites        kde:stable/${name}/src/
-use_bzip2           yes
 
-checksums           rmd160  411e4e3b203cd9681b10d21af75806f723a687ec \
-                    sha256  8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2
-
 depends_lib-append  port:soprano \
                     port:boost \
                     port:shared-mime-info
@@ -31,6 +31,9 @@
 compiler.blacklist-append   {clang < 500}
 
 configure.args-append  -DPOSTGRES_PATH=Off
+# mute akonadiserver which is usually overly chatty:
+configure.cflags-append     -DQT_NO_DEBUG_OUTPUT
+configure.cxxflags-append   -DQT_NO_DEBUG_OUTPUT
 
 set startup_root ""
 post-destroot {
@@ -178,21 +181,22 @@
 }
 
 post-patch {
-    # fix '#include "utils.h"' -> "src/utils.h" to avoid a conflict
-    # with the 'utils.h' header installed by the cdparanoia port
-    fs-traverse item ${workpath}/${distname} {
+    fs-traverse item ${workpath}/${distname}/server {
         if {[file isfile ${item}]} {
             reinplace "/include/s@\\(utils\\.h\\)@src/\\1 at g" ${item}
         }
     }
-	reinplace "s|/Applications|${applications_dir}|" ${worksrcpath}/CMakeLists.txt
+    reinplace "s|/Applications|${applications_dir}|" ${worksrcpath}/CMakeLists.txt
 }
 
+variant verbose description {Enable debug output (chatty!)} {
+    configure.cflags-delete     -DQT_NO_DEBUG_OUTPUT
+    configure.cxxflags-delete   -DQT_NO_DEBUG_OUTPUT
+}
+
 platform darwin {
-    #Deactivate tests for 10.8 and lower, as they require full C++11 support (ticket #45300)
-    patchfiles-append     patch-tests.diff
+    #Deactivate tests as they require full C++11 support (ticket #45300)
     configure.args-append -DAKONADI_BUILD_TESTS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF
-
     if {${os.major} == 9} {
         if {[info exists universal_target] && ${universal_target} == "10.4"} {
         # Needed if compiling for 10.4 universal on 10.5
@@ -203,6 +207,4 @@
     }
 }
 
-livecheck.type      regex
-livecheck.url       http://kde.mirrors.hoobly.com/stable/akonadi/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.type      none

Deleted: trunk/dports/devel/akonadi/files/patch-tests.diff
===================================================================
--- trunk/dports/devel/akonadi/files/patch-tests.diff	2015-03-20 14:48:23 UTC (rev 134233)
+++ trunk/dports/devel/akonadi/files/patch-tests.diff	2015-03-20 14:48:34 UTC (rev 134234)
@@ -1,24 +0,0 @@
---- server/CMakeLists.txt.orig	2014-08-10 19:38:58.000000000 +0900
-+++ server/CMakeLists.txt	2014-10-10 10:24:15.000000000 +0900
-@@ -27,7 +27,9 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/handler)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/nepomuk)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests)
-+if(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
-+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests) 
-+endif(AKONADI_BUILD_TESTS AND BUILD_TESTING)
- include_directories(${Akonadi_SOURCE_DIR}/shared)
- if(Soprano_FOUND)
-   include_directories(${SOPRANO_INCLUDE_DIR})
-@@ -64,7 +66,9 @@
- add_subdirectory(akonadictl)
- add_subdirectory(control)
- add_subdirectory(src)
--add_subdirectory(tests)
-+if(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
-+  add_subdirectory(tests) 
-+endif(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}")
- if(MYSQLD_EXECUTABLE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150320/505ddb12/attachment-0001.html>