Ticket #46952: akonadi-diff2.patch

trunk/dports/devel/akonadi/Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
 # $Id$
 
 PortSystem          1.0
@@ -5 +6 @@
 PortGroup           kde4    1.1
 PortGroup           compiler_blacklist_versions 1.0
 
+fetch.type          git
+if {[file exists /Users/bertin/cworks/new/KDE/kdepim/akonadi-git]} {
+    git.url         /Users/bertin/cworks/new/KDE/kdepim/akonadi-git
+} else {
+    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 +25 @@
 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
+worksrcdir          ${name}-${akoversion}
+distname            ${name}-${akoversion}
 
 depends_lib-append  port:soprano \
                     port:boost \
@@ -31 +38 @@
 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 {
@@ -177 +187 @@
     default_variants +mariadb55
 }
 
+# package require fileutil
 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}]} {
+#             # fix '#include "utils.h"' -> "src/utils.h" to avoid a conflict
+#             # with the 'utils.h' header installed by the cdparanoia port
+#             # do this only on the files actually containing the pattern (which would also exclude the
+#             # .git directory)
+#             if {[::fileutil::grep "include.*utils.h" ${item}] != ""} {
+#                 reinplace "/include/s@\\(utils\\.h\\)@src/\\1@g" ${item}
+#             }
             reinplace "/include/s@\\(utils\\.h\\)@src/\\1@g" ${item}
         }
     }
@@ -188 +204 @@
         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 +222 @@
     }
 }
 
-livecheck.type      regex
-livecheck.url       http://kde.mirrors.hoobly.com/stable/akonadi/src/
-livecheck.regex     ${name}-(\\d+(\\.\\d+)+)
+livecheck.type      none
+ No newline at end of file