[119433] trunk/dports/devel/akonadi/Portfile

[nicos at macports.org]

Revision: 119433
          https://trac.macports.org/changeset/119433
Author:   nicos at macports.org
Date:     2014-04-25 05:47:30 -0700 (Fri, 25 Apr 2014)
Log Message:
-----------
akonadi: upgrade to 1.12.1
make variant mysql5 obsolete (replaced by mysql51)
make mariadb55 default variant
rename mariadb and percona variants with numbers (ticket #43431)

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

Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile	2014-04-25 12:08:04 UTC (rev 119432)
+++ trunk/dports/devel/akonadi/Portfile	2014-04-25 12:47:30 UTC (rev 119433)
@@ -6,7 +6,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                akonadi
-version             1.12.0
+version             1.12.1
 categories          devel kde kde4
 maintainers         nicos openmaintainer
 license             LGPL-2+
@@ -18,8 +18,8 @@
 master_sites        kde:stable/${name}/src/
 use_bzip2           yes
 
-checksums           rmd160  bc47b87f8f228d0a8cf8d180d742c65ed1ce4dd0 \
-                    sha256  35243793b73e8028973c101c68ef80a8a54be0fe9aa562c9473e73b4657fea26
+checksums           rmd160  6e486f4a39948af6f470b652bf3223de75af5e53 \
+                    sha256  a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145
 
 depends_lib-append  port:soprano \
                     port:boost \
@@ -105,18 +105,10 @@
     destroot.violate_mtree  yes
 }
 
-variant mysql5 \
-   conflicts sqlite mysql51 mysql55 mysql56 mariadb percona \
-   description {build with mysql5 port} {
+variant mysql5 requires mysql51 description {Legacy compatibility variant} {}
 
-   depends_lib-append      port:qt4-mac-mysql5-plugin
-   depends_run-append      port:mysql5-server
-   configure.args-append   -DDATABASE_BACKEND=MYSQL \
-                           -DMYSQLD_EXECUTABLE=${prefix}/libexec/mysqld
-}
-
 variant mysql51 \
-   conflicts sqlite mysql5 mysql55 mysql56 mariadb percona \
+   conflicts sqlite mysql55 mysql56 mariadb55 percona55 \
    description {build with mysql51 port} {
 
    depends_lib-append      port:qt4-mac-mysql51-plugin
@@ -126,7 +118,7 @@
 }
 
 variant mysql55 \
-   conflicts sqlite mysql5 mysql51 mysql56 mariadb percona \
+   conflicts sqlite mysql51 mysql56 mariadb55 percona55 \
    description {build with mysql55 port} {
 
    depends_lib-append      port:qt4-mac-mysql55-plugin
@@ -136,7 +128,7 @@
 }
 
 variant mysql56 \
-   conflicts sqlite mysql5 mysql51 mysql55 mariadb percona \
+   conflicts sqlite mysql51 mysql55 mariadb55 percona55 \
    description {build with mysql56 port} {
 
    depends_lib-append      port:qt4-mac-mysql56-plugin
@@ -145,8 +137,10 @@
                            -DMYSQLD_EXECUTABLE=${prefix}/lib/mysql55/bin/mysqld
 }
 
-variant mariadb \
-   conflicts sqlite mysql5 mysql51 mysql55 mysql56 percona \
+variant mariadb requires mariadb55 description {Legacy compatibility variant} {}
+
+variant mariadb55 \
+   conflicts sqlite mysql51 mysql55 mysql56 percona55 \
    description {build with mariadb port} {
 
    depends_lib-append      port:qt4-mac-mariadb-plugin
@@ -155,10 +149,12 @@
                            -DMYSQLD_EXECUTABLE=${prefix}/lib/mariadb/bin/mysqld
 }
 
-variant percona \
-   conflicts sqlite mysql5 mysql51 mysql55 mysql56 mariadb \
-   description {build with percona port} {
+variant percona requires percona55 description {Legacy compatibility variant} {}
 
+variant percona55 \
+   conflicts sqlite mysql51 mysql55 mysql56 mariadb55 \
+   description {build with percona55 port} {
+
    depends_lib-append      port:qt4-mac-percona-plugin
    depends_run-append      port:percona-server
    configure.args-append   -DDATABASE_BACKEND=MYSQL \
@@ -166,7 +162,7 @@
 }
 
 variant sqlite \
-   conflicts mysql5 mysql51 mysql55 mysql56 mariadb percona \
+   conflicts mysql51 mysql55 mysql56 mariadb55 percona55 \
    description {Use sqlite backend instead of MySQL} {
 
    depends_lib-append      port:qt4-mac-sqlite3-plugin          
@@ -175,9 +171,9 @@
 }
 
 if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] \
-    && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona] \
+    && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55] \
     && ![variant_isset sqlite]} {
-    default_variants +mysql5
+    default_variants +mariadb55
 }
 
 post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140425/18e65692/attachment.html>