[28625] trunk/dports/databases/mysql5-devel/Portfile

[source_changes at macosforge.org]

Revision: 28625
          http://trac.macosforge.org/projects/macports/changeset/28625
Author:   jwa at macports.org
Date:     2007-09-05 06:41:03 -0700 (Wed, 05 Sep 2007)

Log Message:
-----------
version bump to 5.1.21, add 5 to binaries in configuration, remove patch as unnecessary, change startup, add violate_mtree due to /sql-bench, didn't find a setting to put it somewhere else

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

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2007-09-05 13:15:18 UTC (rev 28624)
+++ trunk/dports/databases/mysql5-devel/Portfile	2007-09-05 13:41:03 UTC (rev 28625)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			mysql5-devel
-set vers 5.1.20
+set vers 5.1.21
 version			${vers}-beta
 
 categories		databases
@@ -27,15 +27,13 @@
 
 distname mysql-${version}
 
-checksums md5 1a3883347040de3990c152d7aceabccb \
-    sha1 8e0107c73c5dea88dce177c787c2bfbd95f97287 \
-    rmd160 8ad08acfeffe299ab31c018d9933d5ed48d1e628
+checksums md5 c8e428a526b21d53c494a75b0ee01ffb \
+    sha1 50ceb0df1d37a1eb94d46f60314edde2d7608bda \
+    rmd160 111328f8795124940b1feaf2d840684d3e46710b
 
 depends_lib port:zlib \
     port:openssl
 
-patchfiles	patch-mysys-base64.c
-				
 set dbdir       ${prefix}/var/db/${name}
 set mysqluser	mysql
 
@@ -47,6 +45,7 @@
     --includedir=${prefix}/include/${name} \
     --datadir=${prefix}/share/${name} \
     --sysconfdir=${prefix}/etc/${name} \
+    --program-suffix=5 \
     --with-zlib-dir=${prefix} \
     --with-ssl=${prefix} \
     --with-extra-charsets=complex \
@@ -59,7 +58,7 @@
     --enable-thread-safe-client
 
 post-configure {
-    reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" tests/Makefile
+    reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
 }
 
 platform darwin 6 {
@@ -76,16 +75,20 @@
 
 platform darwin 8 {
     configure.compiler	gcc-4.0
+    configure.cppflags-append	-I${worksrcpath}/include
 }
 				
 variant server {
     configure.args-delete --without-server
     # Create a startupitem to start/stop the server
     startupitem.create	yes
-    startupitem.start	"${prefix}/share/mysql5/mysql/mysql.server start"
-    startupitem.stop	"${prefix}/share/mysql5/mysql/mysql.server stop"
+    startupitem.start	"${prefix}/share/${name}/mysql/mysql.server start"
+    startupitem.stop	"${prefix}/share/${name}/mysql/mysql.server stop"
 }
 
+# the directory ${prefix}/sql-bench
+destroot.violate_mtree	yes
+
 pre-destroot {
     # Some directories we must have in all cases
     xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
@@ -112,9 +115,9 @@
 post-destroot {
     system "rm -rf ${destroot}${prefix}/mysql-test/"
 	
-    # Symlink mysql binaries into bin directory, with a 5 appended to the name
+    # Symlink mysql binaries into bin directory
     foreach f [glob -tails -directory ${destroot}${prefix}/lib/${name}/bin my*] {
-	system "cd ${destroot}${prefix}/bin && ln -sf ../lib/${name}/bin/${f} ${f}5"
+	ln -sf ${prefix}/lib/${name}/bin/${f} ${destroot}${prefix}/bin
     }
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070905/628bdf0f/attachment.html