[94476] trunk/dports/python/py-mysql

[blair at macports.org]

Revision: 94476
          https://trac.macports.org/changeset/94476
Author:   blair at macports.org
Date:     2012-06-19 23:04:36 -0700 (Tue, 19 Jun 2012)
Log Message:
-----------
py-mysql: rename +mysql5 to +mysql51, add +mysql55, drop support for
mysql*-devel versions providing mysql_config.

Modified Paths:
--------------
    trunk/dports/python/py-mysql/Portfile
    trunk/dports/python/py-mysql/files/patch-site.cfg.diff

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2012-06-20 05:10:01 UTC (rev 94475)
+++ trunk/dports/python/py-mysql/Portfile	2012-06-20 06:04:36 UTC (rev 94476)
@@ -35,13 +35,15 @@
     post-patch {
         reinplace "s|@PREFIX@|${prefix}|g" \
             ${worksrcpath}/site.cfg
-        reinplace "s|@MYSQL_SUFFIX@|${mysql_suffix}|g" \
+        reinplace "s|@MYSQL_CONFIG@|${mysql_config}|g" \
             ${worksrcpath}/site.cfg
     }
 
     pre-configure {
-        if {![variant_isset mysql4] && ![variant_isset mysql5]} {
-            return -code error "you must select either mysql4 or mysql5"
+        if {![variant_isset mysql4] &&
+            ![variant_isset mysql51] &&
+            ![variant_isset mysql55]} {
+            return -code error "you must select either mysql4, mysql51 or mysql55"
         }
     }
 
@@ -52,18 +54,21 @@
             ${destroot}${prefix}/share/doc/${subport}
     }
 
-    variant mysql4 conflicts mysql5 description {Build with MySQL 4} {
+    set mysql_config {}
+
+    variant mysql4 conflicts mysql51 mysql55 description {Build with MySQL 4} {
         depends_lib-append  port:mysql4
+        set mysql_config bin/mysql_config
     }
 
-    variant mysql5 conflicts mysql4 description {Build with MySQL 5} {
-        depends_lib-append  path:bin/mysql_config5:mysql5
+    variant mysql51 conflicts mysql4 mysql55 description {Build with MySQL 5.1} {
+        depends_lib-append  port:mysql51
+        set mysql_config lib/mysql51/bin/mysql_config
     }
 
-    set mysql_suffix    {}
-    if {![variant_isset mysql4]} {
-        set mysql_suffix 5
-        default_variants +mysql5
+    variant mysql55 conflicts mysql4 mysql51 description {Build with MySQL 5.5} {
+        depends_lib-append  port:mysql55
+        set mysql_config lib/mysql55/bin/mysql_config
     }
 
     livecheck.type      none

Modified: trunk/dports/python/py-mysql/files/patch-site.cfg.diff
===================================================================
--- trunk/dports/python/py-mysql/files/patch-site.cfg.diff	2012-06-20 05:10:01 UTC (rev 94475)
+++ trunk/dports/python/py-mysql/files/patch-site.cfg.diff	2012-06-20 06:04:36 UTC (rev 94476)
@@ -5,7 +5,7 @@
  # Only use this if mysql_config is not on your PATH, or you have some weird
  # setup that requires it.
 -#mysql_config = /usr/local/bin/mysql_config
-+mysql_config = @PREFIX@/bin/mysql_config at MYSQL_SUFFIX@
++mysql_config = @PREFIX@/@MYSQL_CONFIG@
  
  # The Windows registry key for MySQL.
  # This has to be set for Windows builds to work.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120619/f2c477bc/attachment-0001.html>