Modified: trunk/dports/devel/akonadi/Portfile (74248 => 74249)

--- trunk/dports/devel/akonadi/Portfile	2010-12-09 01:44:05 UTC (rev 74248)
+++ trunk/dports/devel/akonadi/Portfile	2010-12-09 02:04:41 UTC (rev 74249)
@@ -28,8 +28,18 @@
 depends_run-append  path:libexec/mysqld:mysql5-server
 
 patchfiles          patch-akonadi-prefix.h.cmake.diff
+
 post-patch {
     reinplace s|@@APPS@@|${applications_dir}| ${workpath}/${distname}/akonadi-prefix.h.cmake
+
+    # fix '#include "utils.h"' -> "src/utils.h" to avoid a conflict
+    # with the 'utils.h' header installed by the cdparanoia port
+    foreach fixfile { server/src/handler/fetchhelper.cpp \
+                          server/src/storage/entities.xsl \
+                          server/src/storage/itemretriever.cpp } {
+        reinplace "/include/s@\\(utils\\.h\\)@src/\\1@g" \
+            ${workpath}/${distname}/${fixfile}
+    }
 }
 
 configure.args-append   -DMYSQLD_EXECUTABLE="${prefix}/libexec/mysqld"