[39952] trunk/dports/databases/mysql5-devel

[ryandesign at macports.org]

Revision: 39952
          http://trac.macports.org/changeset/39952
Author:   ryandesign at macports.org
Date:     2008-09-13 20:01:09 -0700 (Sat, 13 Sep 2008)
Log Message:
-----------
mysql5-devel: merge r39951 from mysql5:

 * use bindir in mysql_secure_installation script so it can find mysql regardless of $PATH; see the second issue in #14600
 * use absolute links instead of relative ones in ${prefix}/bin; see #13421

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

Added Paths:
-----------
    trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff

Property Changed:
----------------
    trunk/dports/databases/mysql5-devel/


Property changes on: trunk/dports/databases/mysql5-devel
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/databases/mysql5:39951

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2008-09-14 02:38:18 UTC (rev 39951)
+++ trunk/dports/databases/mysql5-devel/Portfile	2008-09-14 03:01:09 UTC (rev 39952)
@@ -5,6 +5,7 @@
 name                    mysql5-devel
 set vers                5.1.28
 version                 ${vers}-rc
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
@@ -46,16 +47,25 @@
 #set major_version       [strsed ${version} {s/\..*$//}]
 set major_version       [strsed ${vers} {s/\..*$//}]
 set mysql               mysql${major_version}
+set libdir              ${prefix}/lib/${mysql}
+set bindir              ${libdir}/bin
 set dbdir               ${prefix}/var/db/${mysql}
 set sysconfdir          ${prefix}/etc/${mysql}
 set mysqluser           mysql
 
+patchfiles \
+    patch-mysql_secure_installation.sh.diff
+
+post-patch {
+    reinplace s%@BINDIR@%${bindir}%g ${worksrcpath}/scripts/mysql_secure_installation.sh
+}
+
 configure.args \
     --mandir=${prefix}/share/man \
     --infodir=${prefix}/share/info \
     --localstatedir=${dbdir} \
-    --libdir=${prefix}/lib/${mysql} \
-    --bindir=${prefix}/lib/${mysql}/bin \
+    --libdir=${libdir} \
+    --bindir=${bindir} \
     --includedir=${prefix}/include/${mysql} \
     --datadir=${prefix}/share/${mysql} \
     --sysconfdir=${sysconfdir} \
@@ -158,8 +168,8 @@
     }
     
     # Symlink mysql binaries into bin directory, with ${major_version} appended to the name
-    foreach f [glob -tails -directory ${destroot}${prefix}/lib/${mysql}/bin my*] {
-        ln -sf ../lib/${mysql}/bin/${f} ${destroot}${prefix}/bin/${f}${major_version}
+    foreach f [glob -tails -directory ${destroot}${bindir} my*] {
+        ln -sf ${bindir}/${f} ${destroot}${prefix}/bin/${f}${major_version}
     }
 }
 

Copied: trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff (from rev 39951, trunk/dports/databases/mysql5/files/patch-mysql_secure_installation.sh.diff)
===================================================================
--- trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff	                        (rev 0)
+++ trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff	2008-09-14 03:01:09 UTC (rev 39952)
@@ -0,0 +1,11 @@
+--- scripts/mysql_secure_installation.sh	2008-08-04 07:20:02.000000000 -0500
++++ scripts/mysql_secure_installation.sh	2008-09-13 20:46:27.000000000 -0500
+@@ -39,7 +39,7 @@
+ 
+ do_query() {
+     echo $1 >$command
+-    mysql --defaults-file=$config <$command
++    @BINDIR@/mysql --defaults-file=$config <$command
+     return $?
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080913/02c9bb16/attachment.html