[65427] trunk/dports/devel/akonadi

[snc at macports.org]

Revision: 65427
          http://trac.macports.org/changeset/65427
Author:   snc at macports.org
Date:     2010-03-25 20:05:16 -0700 (Thu, 25 Mar 2010)
Log Message:
-----------
always use mysql, add patch for install dir, fix dependencies, #24209

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

Added Paths:
-----------
    trunk/dports/devel/akonadi/files/
    trunk/dports/devel/akonadi/files/patch-akonadi-prefix.h.cmake.diff

Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile	2010-03-26 01:54:33 UTC (rev 65426)
+++ trunk/dports/devel/akonadi/Portfile	2010-03-26 03:05:16 UTC (rev 65427)
@@ -6,6 +6,7 @@
 
 name                akonadi
 version             1.3.1
+revision            1
 categories          devel kde kde4
 maintainers         nomaintainer
 description         A personal information management storage service.
@@ -19,10 +20,19 @@
                     sha1    b6e97634878fe52785f3dec7d6394a18579d4a50 \
                     rmd160  487408ad3ac49983b9151aba358225f203ed19a1
 
+depends_build-append port:qt4-mac
 depends_lib-append  port:soprano \
-					port:boost
+					port:boost \
+                    port:shared-mime-info
+depends_run-append  path:bin/mysql5:mysql5-server
 
-configure.args-append   -DMYSQLD_EXECUTABLE="" \
+patch.dir           ${workpath}/${distname}
+patchfiles          patch-akonadi-prefix.h.cmake.diff
+post-patch {
+    reinplace s|@@APPS@@|${applications_dir}| ${workpath}/${distname}/akonadi-prefix.h.cmake
+}
+
+configure.args-append   -DMYSQLD_EXECUTABLE="${prefix}/libexec/mysqld" \
                         ../${distname}
 
 platform darwin 9 {
@@ -34,10 +44,6 @@
     }
 }
 
-variant mysql description "Install the Akonadi server" {
-    depends_lib-append	    path:bin/mysqld:mysql5-devel
-    configure.args-delete   -DMYSQLD_EXECUTABLE=""
-}
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/devel/akonadi/files/patch-akonadi-prefix.h.cmake.diff
===================================================================
--- trunk/dports/devel/akonadi/files/patch-akonadi-prefix.h.cmake.diff	                        (rev 0)
+++ trunk/dports/devel/akonadi/files/patch-akonadi-prefix.h.cmake.diff	2010-03-26 03:05:16 UTC (rev 65427)
@@ -0,0 +1,8 @@
+--- akonadi-prefix.h.cmake.orig	2010-03-25 14:28:55.000000000 -0400
++++ akonadi-prefix.h.cmake	2010-03-25 14:29:05.000000000 -0400
+@@ -4,4 +4,4 @@
+ #define AKONADIDATA   "${SHARE_INSTALL_PREFIX}"
+ #define AKONADICONFIG "${CONFIG_INSTALL_DIR}"
+ // the below is hardcoded to what FindKDE4Internal.cmake sets it to, since we have no way of finding that
+-#define AKONADIBUNDLEPATH "/Applications/KDE4"
++#define AKONADIBUNDLEPATH "@@APPS@@/KDE4"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100325/91cdee21/attachment.html>