Ticket #46952: akonadi-diff.patch

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
-# $Id: Portfile 127727 2014-11-02 07:21:25Z nicos@macports.org $
+# $Id: Portfile 126425 2014-10-10 01:31:30Z nicos@macports.org $
 
 PortSystem          1.0
 PortGroup           kde4    1.1
 PortGroup           compiler_blacklist_versions 1.0
 
+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+
@@ -15 +19 @@
 long_description    Akonadi is an extensible cross-desktop storage service \
 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
+# homepage            http://community.kde.org/KDE_PIM/Akonadi
+# master_sites        kde:stable/${name}/src/
+# use_bzip2           yes
 
-checksums           rmd160  411e4e3b203cd9681b10d21af75806f723a687ec \
-                    sha256  8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2
+# checksums           rmd160  411e4e3b203cd9681b10d21af75806f723a687ec \
+#                     sha256  8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2
 
 depends_lib-append  port:soprano \
                     port:boost \
@@ -177 +181 @@
     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
+    # do this only on the files actually containing the pattern (which would also exclude the
+    # .git directory)
     fs-traverse item ${workpath}/${distname} {
         if {[file isfile ${item}]} {
-            reinplace "/include/s@\\(utils\\.h\\)@src/\\1@g" ${item}
+            if {[::fileutil::grep "include.*utils.h" ${item}] != ""} {
+                reinplace "/include/s@\\(utils\\.h\\)@src/\\1@g" ${item}
+            }
         }
     }
         reinplace "s|/Applications|${applications_dir}|" ${worksrcpath}/CMakeLists.txt
 }
 
+variant quiet description {Disable debug output to reduce chattyness} {
+    # mute akonadiserver which is usually overly chatty:
+    configure.cflags-append     -DQT_NO_DEBUG_OUTPUT
+    configure.cxxflags-append   -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
     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