[33655] trunk/dports/databases/mysql5

ryandesign at macports.org ryandesign at macports.org
Sat Feb 2 08:33:37 PST 2008


Revision: 33655
          http://trac.macosforge.org/projects/macports/changeset/33655
Author:   ryandesign at macports.org
Date:     2008-02-02 08:32:53 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
mysql5 and mysql5-devel: expand tabs to spaces and other whitespace and formatting changes only, to make these ports more similar; see #14142

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

Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile	2008-02-02 16:04:47 UTC (rev 33654)
+++ trunk/dports/databases/mysql5/Portfile	2008-02-02 16:32:53 UTC (rev 33655)
@@ -1,121 +1,121 @@
 # $Id$
 
-PortSystem          1.0
+PortSystem              1.0
 
-name                mysql5
-version             5.0.51
-homepage            http://www.mysql.com/
-categories          databases
-platforms           darwin
-maintainers         ryandesign
-distname            mysql-${version}
+name                    mysql5
+version                 5.0.51
+homepage                http://www.mysql.com/
+categories              databases
+platforms               darwin
+maintainers             ryandesign
+distname                mysql-${version}
 
 description \
-	Multithreaded SQL database server
+    Multithreaded SQL database server
 
 long_description \
-	MySQL is an open-source, multi-threaded SQL database \
-	with a command syntax very similar to mSQL.
+    MySQL is an open-source, multi-threaded SQL database \
+    with a command syntax very similar to mSQL.
 
 master_sites \
-	http://mysql.mirrors.pair.com/Downloads/MySQL-5.0/ \
-	http://mysql.he.net/Downloads/MySQL-5.0/ \
-	http://mysql.orst.edu/Downloads/MySQL-5.0 \
-	http://mysql.oss.eznetsols.org/Downloads/MySQL-5.0/ \
-	http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
-	http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/ \
-	http://ftp.plusline.de/mysql/Downloads/MySQL-5.0/
+    http://mysql.mirrors.pair.com/Downloads/MySQL-5.0/ \
+    http://mysql.he.net/Downloads/MySQL-5.0/ \
+    http://mysql.orst.edu/Downloads/MySQL-5.0 \
+    http://mysql.oss.eznetsols.org/Downloads/MySQL-5.0/ \
+    http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
+    http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/ \
+    http://ftp.plusline.de/mysql/Downloads/MySQL-5.0/
 
 checksums \
-	md5 88c39c8cb77810febb83b7ee625364d7 \
-	sha1 a9a253ea842e973df6f475c04dac77522de0dea7 \
-	rmd160 e14baa1c40cb385fa64fc72355db9ca58a6be2f9
+    md5 88c39c8cb77810febb83b7ee625364d7 \
+    sha1 a9a253ea842e973df6f475c04dac77522de0dea7 \
+    rmd160 e14baa1c40cb385fa64fc72355db9ca58a6be2f9
 
 depends_lib \
-	port:zlib \
-	port:openssl
+    port:zlib \
+    port:openssl
 
-set major_version   [strsed ${version} {s/\..*$//}]
-set mysql           mysql${major_version}
-set dbdir           ${prefix}/var/db/${mysql}
-set sysconfdir      ${prefix}/etc/${mysql}
-set mysqluser       mysql
+set major_version       [strsed ${version} {s/\..*$//}]
+set mysql               mysql${major_version}
+set dbdir               ${prefix}/var/db/${mysql}
+set sysconfdir          ${prefix}/etc/${mysql}
+set mysqluser           mysql
 
 configure.args \
-	--mandir=${prefix}/share/man \
-	--infodir=${prefix}/share/info \
-	--localstatedir=${dbdir} \
-	--libdir=${prefix}/lib/${mysql} \
-	--bindir=${prefix}/lib/${mysql}/bin \
-	--includedir=${prefix}/include/${mysql} \
-	--datadir=${prefix}/share/${mysql} \
-	--sysconfdir=${sysconfdir} \
-	--with-zlib-dir=${prefix} \
-	--with-openssl=${prefix} \
-	--with-extra-charsets=complex \
-	--with-federated-storage-engine \
-	--with-unix-socket-path=${prefix}/var/run/${mysql}/mysqld.sock \
-	--with-mysqld-user=${mysqluser} \
-	--without-bench \
-	--enable-thread-safe-client
+    --mandir=${prefix}/share/man \
+    --infodir=${prefix}/share/info \
+    --localstatedir=${dbdir} \
+    --libdir=${prefix}/lib/${mysql} \
+    --bindir=${prefix}/lib/${mysql}/bin \
+    --includedir=${prefix}/include/${mysql} \
+    --datadir=${prefix}/share/${mysql} \
+    --sysconfdir=${sysconfdir} \
+    --with-zlib-dir=${prefix} \
+    --with-openssl=${prefix} \
+    --with-extra-charsets=complex \
+    --with-federated-storage-engine \
+    --with-unix-socket-path=${prefix}/var/run/${mysql}/mysqld.sock \
+    --with-mysqld-user=${mysqluser} \
+    --without-bench \
+    --enable-thread-safe-client
 
 variant server {
-	# Create a startupitem to start/stop the server
-	startupitem.create	yes
-	startupitem.start	"${prefix}/share/${mysql}/mysql/mysql.server start"
-	startupitem.stop	"${prefix}/share/${mysql}/mysql/mysql.server stop"
+    # Create a startupitem to start/stop the server
+    startupitem.create  yes
+    startupitem.start   "${prefix}/share/${mysql}/mysql/mysql.server start"
+    startupitem.stop    "${prefix}/share/${mysql}/mysql/mysql.server stop"
 }
 
 pre-destroot {
-	# Some directories we must have in all cases
-	xinstall -m 755 -d ${destroot}${sysconfdir}
-	destroot.keepdirs-append ${destroot}${sysconfdir}
-	
-	# Setup only for server
-	if { [variant_isset server] } {
-		addgroup ${mysqluser}
-		set gid [existsgroup ${mysqluser}]
-		adduser ${mysqluser} gid=${gid} realname=MySQL\ Server
-		
-		# Some directories we must have only if we're running as a server
-		xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
-		
-		xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
-			${destroot}${dbdir} \
-			${destroot}${prefix}/var/run/${mysql}
-		destroot.keepdirs-append  \
-			${destroot}${dbdir} \
-			${destroot}${prefix}/var/run/${mysql}
-	}
+    # Some directories we must have in all cases
+    xinstall -m 755 -d ${destroot}${sysconfdir}
+    destroot.keepdirs-append ${destroot}${sysconfdir}
+    
+    # Setup only for server
+    if { [variant_isset server] } {
+        addgroup ${mysqluser}
+        set gid [existsgroup ${mysqluser}]
+        adduser ${mysqluser} gid=${gid} realname=MySQL\ Server
+        
+        # Some directories we must have only if we're running as a server
+        xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
+        
+        xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
+            ${destroot}${dbdir} \
+            ${destroot}${prefix}/var/run/${mysql}
+        destroot.keepdirs-append  \
+            ${destroot}${dbdir} \
+            ${destroot}${prefix}/var/run/${mysql}
+    }
 }
 
 post-destroot {
-	delete ${destroot}${prefix}/mysql-test
-	
-	# Fix paths in manpages and sample configuration files
-	foreach manpage [glob -type f ${destroot}${prefix}/share/man/man\[1-9\]/*] {
-		reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${manpage}
-	}
-	foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${mysql}/mysql/my-*.cnf] {
-		reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${samp_conffile}
-	}
-	
-	# 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}
-	}
+    delete ${destroot}${prefix}/mysql-test
+    
+    # Fix paths in manpages and sample configuration files
+    foreach manpage [glob -type f ${destroot}${prefix}/share/man/man\[1-9\]/*] {
+        reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${manpage}
+    }
+    foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${mysql}/mysql/my-*.cnf] {
+        reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${samp_conffile}
+    }
+    
+    # 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}
+    }
 }
 
 post-install {
-	if { [variant_isset server] } {
-		ui_msg "******************************************************"
-		ui_msg "* In order to setup the database, you might want to run"
-		ui_msg "* sudo -u ${mysqluser} mysql_install_db5"
-		ui_msg "* if this is a new install" 
-		ui_msg "******************************************************"
-	}
+    if { [variant_isset server] } {
+        ui_msg "******************************************************"
+        ui_msg "* In order to setup the database, you might want to run"
+        ui_msg "* sudo -u ${mysqluser} mysql_install_db5"
+        ui_msg "* if this is a new install"
+        ui_msg "******************************************************"
+    }
 }
 
-livecheck.check     regex
-livecheck.url       http://dev.mysql.com/
-livecheck.regex     "GA</acronym> (${major_version}\\.\[0-9.\]+)"
+livecheck.check         regex
+livecheck.url           http://dev.mysql.com/
+livecheck.regex         "GA</acronym> (${major_version}\\.\[0-9.\]+)"

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2008-02-02 16:04:47 UTC (rev 33654)
+++ trunk/dports/databases/mysql5-devel/Portfile	2008-02-02 16:32:53 UTC (rev 33655)
@@ -1,22 +1,25 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem              1.0
 
-name			mysql5-devel
-set vers 5.1.22
-version			${vers}-rc
+name                    mysql5-devel
+set vers                5.1.22
+version                 ${vers}-rc
+homepage                http://www.mysql.com/
+categories              databases
+platforms               darwin
+maintainers             jwa ryandesign openmaintainer
+distname                mysql-${version}
 
-categories		databases
-platforms		darwin
+description \
+    Multithreaded SQL database server
 
-maintainers		jwa ryandesign openmaintainer
+long_description \
+    MySQL is an open-source, multi-threaded SQL database \
+    with a command syntax very similar to mSQL.
 
-description		Multithreaded SQL database server
-long_description	MySQL is an open-source, multi-threaded SQL database \
-				with a command syntax very similar to mSQL.
-
-homepage		http://www.mysql.com/
-master_sites		http://dev.mysql.com/get/Downloads/MySQL-5.1/ \
+master_sites \
+    http://dev.mysql.com/get/Downloads/MySQL-5.1/ \
     http://mysql.mirrors.pair.com/Downloads/MySQL-5.1/ \
     http://mysql.he.net/Downloads/MySQL-5.1/ \
     http://mysql.orst.edu/Downloads/MySQL-5.1 \
@@ -25,24 +28,25 @@
     http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.1/ \
     http://ftp.plusline.de/mysql/Downloads/MySQL-5.1/
 
-distname mysql-${version}
-
-checksums md5 87be813d1b2d76b1c756de0a16fa29fb \
+checksums \
+    md5 87be813d1b2d76b1c756de0a16fa29fb \
     sha1 97c1396e0f0561485df120cce2092192aecd12a0 \
     rmd160 f4bd9dc6a161b4479ac09d26727ea5713c57d1b3
 
-depends_lib port:zlib \
+depends_lib \
+    port:zlib \
     port:openssl
 
-#set major_version   [strsed ${version} {s/\..*$//}]
-set major_version   [strsed ${vers} {s/\..*$//}]
-set mysql           mysql${major_version}
-#set dbdir           ${prefix}/var/db/${mysql}
-set sysconfdir      ${prefix}/etc/${name}
-set dbdir       ${prefix}/var/db/${name}
-set mysqluser	mysql
+#set major_version       [strsed ${version} {s/\..*$//}]
+set major_version       [strsed ${vers} {s/\..*$//}]
+set mysql               mysql${major_version}
+#set dbdir               ${prefix}/var/db/${mysql}
+set sysconfdir          ${prefix}/etc/${name}
+set dbdir               ${prefix}/var/db/${name}
+set mysqluser           mysql
 
-configure.args	--mandir=${prefix}/share/man \
+configure.args \
+    --mandir=${prefix}/share/man \
     --infodir=${prefix}/share/info \
     --localstatedir=${dbdir} \
     --libdir=${prefix}/lib/${name} \
@@ -69,76 +73,76 @@
 
 platform darwin 6 {
     pre-fetch {
-	return -code error "no support for systems prior to 10.3"
+        return -code error "no support for systems prior to 10.3"
     }
 }
 
 platform darwin 8 {
-    configure.cppflags-append	-I${worksrcpath}/include
+    configure.cppflags-append   -I${worksrcpath}/include
 }
 
 variant server description {add a startup item} {
     configure.args-delete --without-server
     # Create a startupitem to start/stop the server
-    startupitem.create	yes
-    startupitem.start	"${prefix}/share/${name}/mysql/mysql.server start"
-    startupitem.stop	"${prefix}/share/${name}/mysql/mysql.server stop"
+    startupitem.create  yes
+    startupitem.start   "${prefix}/share/${name}/mysql/mysql.server start"
+    startupitem.stop    "${prefix}/share/${name}/mysql/mysql.server stop"
 }
 
 # the directories ${prefix}/sql-bench ${prefix}/mysql-test
-destroot.violate_mtree	yes
+destroot.violate_mtree  yes
 
 pre-destroot {
     # Some directories we must have in all cases
     xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
     destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
-
+    
     # Setup only for server
     if { [variant_isset server] } {
-	addgroup ${mysqluser}
-	set gid [existsgroup ${mysqluser}]
-	adduser ${mysqluser} gid=${gid} realname=MySQL\ Server
-
-	# Some directories we must have only if we're running as a server
-	xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
-
-	xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
-	    ${destroot}${dbdir} \
-	    ${destroot}${prefix}/var/run/${name}
-	destroot.keepdirs-append  \
-	    ${destroot}${dbdir} \
-	    ${destroot}${prefix}/var/run/${name}
+        addgroup ${mysqluser}
+        set gid [existsgroup ${mysqluser}]
+        adduser ${mysqluser} gid=${gid} realname=MySQL\ Server
+        
+        # Some directories we must have only if we're running as a server
+        xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
+        
+        xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
+            ${destroot}${dbdir} \
+            ${destroot}${prefix}/var/run/${name}
+        destroot.keepdirs-append  \
+            ${destroot}${dbdir} \
+            ${destroot}${prefix}/var/run/${name}
     }
 }
 
 post-destroot {
     delete ${destroot}${prefix}/mysql-test
-
+    
     # Fix paths in manpages and sample configuration files
     foreach manpage [glob -type f ${destroot}${prefix}/share/man/man\[1-9\]/*] {
-	reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${manpage}
+        reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${manpage}
     }
     foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name}/mysql/my-*.cnf] {
-	reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${samp_conffile}
+        reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${samp_conffile}
     }
-
+    
     # Symlink mysql binaries into bin directory
     foreach f [glob -tails -directory ${destroot}${prefix}/lib/${name}/bin my*] {
-	ln -sf ${prefix}/lib/${name}/bin/${f} ${destroot}${prefix}/bin/${f}${major_version}
+        ln -sf ${prefix}/lib/${name}/bin/${f} ${destroot}${prefix}/bin/${f}${major_version}
     }
 }
 
 post-install {
     if { [variant_isset server] } {
-	ui_msg "******************************************************"
-	ui_msg "* In order to setup the database, you might want to run"
-	ui_msg "* sudo -u ${mysqluser} mysql_install_db5"
-	ui_msg "* if this is a new install"
-	ui_msg "******************************************************"
+        ui_msg "******************************************************"
+        ui_msg "* In order to setup the database, you might want to run"
+        ui_msg "* sudo -u ${mysqluser} mysql_install_db5"
+        ui_msg "* if this is a new install"
+        ui_msg "******************************************************"
     }
 }
 
-livecheck.check		regex
-livecheck.url		http://dev.mysql.com/
-livecheck.version	${vers}
-livecheck.regex		"(5\\.1\\.\[0-9\.\]+)"
+livecheck.check         regex
+livecheck.url           http://dev.mysql.com/
+livecheck.version       ${vers}
+livecheck.regex         "(5\\.1\\.\[0-9\.\]+)"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080202/2c29a9e2/attachment-0001.html


More information about the macports-changes mailing list