Update of /cvsroot/fink/experimental/asari In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18011
Modified Files: mysql.info mysql.patch Log Message: now mysql uses system-openssl. modified mysqld_safe to always use %p/var/mysql for datadir. Index: mysql.patch =================================================================== RCS file: /cvsroot/fink/experimental/asari/mysql.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mysql.patch 13 Oct 2005 18:36:25 -0000 1.1 +++ mysql.patch 15 Oct 2005 18:18:20 -0000 1.2 @@ -1,6 +1,6 @@ diff -Naur mysql-5.0.13-rc/mysys/default.c mysql-5.0.13-rc.fink/mysys/default.c --- mysql-5.0.13-rc/mysys/default.c 2005-09-23 04:39:57.000000000 +0900 -+++ mysql-5.0.13-rc.fink/mysys/default.c 2005-10-14 02:48:28.000000000 +0900 ++++ mysql-5.0.13-rc.fink/mysys/default.c 2005-10-16 02:13:52.000000000 +0900 @@ -980,6 +980,8 @@ { const char *env, **ptr= default_directories; @@ -10,3 +10,46 @@ #ifdef __WIN__ *ptr++= "C:/"; +diff -Naur mysql-5.0.13-rc/scripts/mysqld_safe.sh mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh +--- mysql-5.0.13-rc/scripts/mysqld_safe.sh 2005-09-23 04:40:24.000000000 +0900 ++++ mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh 2005-10-16 02:18:56.000000000 +0900 +@@ -132,22 +132,24 @@ + # Second, try to find the data directory + # + +-# Try where the binary installs put it +-if test -d $MY_BASEDIR_VERSION/data/mysql +-then +- DATADIR=$MY_BASEDIR_VERSION/data +- if test -z "$defaults" -a -r "$DATADIR/my.cnf" +- then +- defaults="--defaults-extra-file=$DATADIR/my.cnf" +- fi +-# Next try where the source installs put it +-elif test -d $MY_BASEDIR_VERSION/var/mysql +-then +- DATADIR=$MY_BASEDIR_VERSION/var +-# Or just give up and use our compiled-in default +-else ++# Fink's MySQL uses @PREFIX@/var/lib by default.. ++ ++# # Try where the binary installs put it ++# if test -d $MY_BASEDIR_VERSION/data/mysql ++# then ++# DATADIR=$MY_BASEDIR_VERSION/data ++# if test -z "$defaults" -a -r "$DATADIR/my.cnf" ++# then ++# defaults="--defaults-extra-file=$DATADIR/my.cnf" ++# fi ++# # Next try where the source installs put it ++# elif test -d $MY_BASEDIR_VERSION/var/mysql ++# then ++# DATADIR=$MY_BASEDIR_VERSION/var ++# # Or just give up and use our compiled-in default ++# else + [EMAIL PROTECTED]@ +-fi ++# fi + + if test -z "$MYSQL_HOME" + then Index: mysql.info =================================================================== RCS file: /cvsroot/fink/experimental/asari/mysql.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mysql.info 14 Oct 2005 12:28:33 -0000 1.2 +++ mysql.info 15 Oct 2005 18:18:20 -0000 1.3 @@ -1,13 +1,13 @@ Package: mysql Version: 5.0.13 -Revision: 1 +Revision: 2 Description: Open Source SQL database License: GPL/LGPL Maintainer: ASARI Takashi <[EMAIL PROTECTED]> # Dependencies: Depends: %N15-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) -BuildDepends: readline5 +BuildDepends: readline5, system-openssl-dev # Unpack Phase: Source: mirror:custom:Downloads/MySQL-5.0/%n-%v-rc.tar.gz @@ -78,15 +78,24 @@ SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 -ConfigureParams: --disable-dependency-tracking --with-innodb --without-readline --with-mysqld-user=mysql --with-extra-charsets=complex --mandir=%p/share/man --infodir=%p/share/info --localstatedir=%p/var/mysql --libexecdir=%p/sbin --sysconfdir=%p/etc --with-embedded-server --enable-thread-safe-client --enable-local-infile -GCC: 3.3 - -CompileScript: << -mysql_cv_btype_last_arg_accept=socklen_t F77=no ./configure %c -perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' isam/Makefile -perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' myisam/Makefile -make +ConfigureParams: << + --disable-dependency-tracking \ + --with-innodb \ + --without-readline \ + --with-mysqld-user=mysql \ + --with-extra-charsets=complex \ + --mandir=%p/share/man \ + --infodir=%p/share/info \ + --localstatedir=%p/var/mysql \ + --libexecdir=%p/sbin \ + --sysconfdir=%p/etc \ + --with-embedded-server \ + --enable-thread-safe-client \ + --enable-local-infile \ + \ + --with-openssl << +GCC: 3.3 # Install Phase: InstallScript: << ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits