[108851] trunk/dports/databases

[ryandesign at macports.org]

Revision: 108851
          https://trac.macports.org/changeset/108851
Author:   ryandesign at macports.org
Date:     2013-08-03 00:13:20 -0700 (Sat, 03 Aug 2013)
Log Message:
-----------
mysql5, mysql51: follow stealth update of 5.1.70 (#39906, #39976)

Modified Paths:
--------------
    trunk/dports/databases/mysql5/Portfile
    trunk/dports/databases/mysql51/Portfile

Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile	2013-08-03 05:44:43 UTC (rev 108850)
+++ trunk/dports/databases/mysql5/Portfile	2013-08-03 07:13:20 UTC (rev 108851)
@@ -6,7 +6,8 @@
 name                    mysql5
 version                 5.1.70
 # Please set revision_client and revision_server to 0 if you bump version.
-set revision_client     0
+# Also change back the dist_subdir (stealth upgrade fixed)
+set revision_client     1
 set revision_server     0
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
@@ -15,7 +16,7 @@
 maintainers             ryandesign pixilla
 license                 GPL-2
 distname                mysql-${version}
-dist_subdir             mysql51
+dist_subdir             mysql51/${version}_1
 use_parallel_build      yes
 
 description \
@@ -33,8 +34,8 @@
     http://mirror.facebook.net/mysql/Downloads/MySQL-${branch}/ \
     http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/
 
-checksums           rmd160  9a7978aa9370c56ed5c3a0a9f3ca135255f19cd8 \
-                    sha256  9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed
+checksums               rmd160  3992485cf86171c9838585e1e073ff999966a11d \
+                        sha256  05ffdce6b94d8ea6bb69a1585685c40e8f3e5ce903231fc62d475a56ebec040c
 
 set major_version       [strsed ${version} {s/\..*$//}]
 set mysql               mysql${major_version}
@@ -43,14 +44,14 @@
 set dbdir               ${prefix}/var/db/${mysql}
 set sysconfdir          ${prefix}/etc/${mysql}
 
-if {"darwin" == ${os.platform} && ${os.major} > 8} {
+if {"darwin" eq ${os.platform} && ${os.major} > 8} {
     set mysqluser       _mysql
 } else {
     set mysqluser       mysql
 }
 add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server
 
-if {${name} == ${subport}} {
+if {${name} eq ${subport}} {
     
     PortGroup               archcheck 1.0
 

Modified: trunk/dports/databases/mysql51/Portfile
===================================================================
--- trunk/dports/databases/mysql51/Portfile	2013-08-03 05:44:43 UTC (rev 108850)
+++ trunk/dports/databases/mysql51/Portfile	2013-08-03 07:13:20 UTC (rev 108851)
@@ -7,7 +7,8 @@
 set name_mysql      ${name}
 version             5.1.70
 # Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 0
+# Also change back the dist_subdir (stealth upgrade fixed)
+set revision_client 1
 set revision_server 0
 categories          databases
 platforms           darwin
@@ -15,13 +16,13 @@
 maintainers         pixilla openmaintainer
 homepage            http://www.mysql.com/
 
-if {"darwin" == ${os.platform} && ${os.major} > 8} {
+if {"darwin" eq ${os.platform} && ${os.major} > 8} {
     set mysqluser       _mysql
 } else {
     set mysqluser       mysql
 }
 
-if {$subport == $name} {
+if {${subport} eq ${name}} {
 
     # http://bugs.mysql.com/bug.php?id=47360
     PortGroup           muniversal 1.0
@@ -44,15 +45,16 @@
         http://ftp.plusline.de/mysql/Downloads/MySQL-${version_branch}/
     
     distname            mysql-${version}
+    dist_subdir         ${name}/${version}_1
     use_parallel_build  yes
     
     patch.pre_args      -p1
     patchfiles          patch-Makefile.in.diff \
                         patch-scripts-mysql_secure_installation.sh.diff
-
-    checksums           rmd160  9a7978aa9370c56ed5c3a0a9f3ca135255f19cd8 \
-                        sha256  9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed
     
+    checksums           rmd160  3992485cf86171c9838585e1e073ff999966a11d \
+                        sha256  05ffdce6b94d8ea6bb69a1585685c40e8f3e5ce903231fc62d475a56ebec040c
+    
     depends_lib         port:zlib port:tcp_wrappers
     depends_run         port:mysql_select
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130803/4181f249/attachment.html>