[74249] trunk/dports/devel/akonadi/Portfile
michaelld at macports.org
michaelld at macports.org
Wed Dec 8 18:04:46 PST 2010
Revision: 74249
http://trac.macports.org/changeset/74249
Author: michaelld at macports.org
Date: 2010-12-08 18:04:41 -0800 (Wed, 08 Dec 2010)
Log Message:
-----------
akonadi: resolve header conflict with cdparanoia by moving inclusion of <utils.h> to <src/utils.h.>.
Modified Paths:
--------------
trunk/dports/devel/akonadi/Portfile
Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- 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 at g" \
+ ${workpath}/${distname}/${fixfile}
+ }
}
configure.args-append -DMYSQLD_EXECUTABLE="${prefix}/libexec/mysqld"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101208/cb47fd81/attachment.html>
More information about the macports-changes
mailing list