Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv597/main/finkinfo/database
Added Files: mysql-unified.info mysql-unified.patch Log Message: unified mysql, OKd by todai --- NEW FILE: mysql-unified.patch --- diff -Nurd mysql-5.0.45/mysys/default.c mysql-5.0.45-patched/mysys/default.c --- mysql-5.0.45/mysys/default.c 2007-07-04 09:06:27.000000000 -0400 +++ mysql-5.0.45-patched/mysys/default.c 2009-06-12 14:05:02.000000000 -0400 @@ -989,6 +989,8 @@ { const char *env, **ptr= default_directories; + *ptr++= "@PREFIX@/etc/"; + #ifdef __WIN__ *ptr++= "C:/"; diff -Nurd mysql-5.0.45/scripts/mysqld_safe.sh mysql-5.0.45-patched/scripts/mysqld_safe.sh --- mysql-5.0.45/scripts/mysqld_safe.sh 2007-07-04 09:06:09.000000000 -0400 +++ mysql-5.0.45-patched/scripts/mysqld_safe.sh 2009-06-12 14:05:02.000000000 -0400 @@ -133,22 +133,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 datad...@localstatedir@ -fi +# fi if test -z "$MYSQL_HOME" then --- NEW FILE: mysql-unified.info --- Info2:<< Package: mysql-unified Version: 5.0.45 Revision: 1 Description: Open Source SQL database License: GPL/LGPL Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp> # Dependencies: Depends: %N-shlibs (= %v-%r), mysql-client (= %v-%r), daemonic (>= 20010902-1) BuildDepends: readline5 (>= 5.0-1004), fink (>= 0.25) Conflicts: mysql (<< 5.0.45-1), mysql-ssl (<< 5.0.45-1) Replaces: mysql (<< 5.0.45-1), mysql-ssl (<< 5.0.45-1) # Unpack Phase: # Source: mirror:custom:Downloads/MySQL-5.0/mysql-%v.tar.gz # For Enterprise Server Source: ftp://ftp.mysql.com/pub/mysql/src/mysql-%v.tar.gz Source-MD5: a2a1c5a82bb22b45ab76a8ecab94e10d CustomMirror: << # Some country codes not in /sw/lib/fink/mirror/_keys eur-AM: http://mysql.mirrors.arminco.com/ eur-AT: http://gd.tuwien.ac.at/db/mysql/ eur-AT: ftp://gd.tuwien.ac.at/db/mysql/ eur-BE: http://mysql.belnet.be/ eur-BE: ftp://ftp.belnet.be/mirror/ftp.mysql.com/pub/mysql/ eur-BE: http://mysql.easynet.be/ eur-BE: ftp://ftp.easynet.be/mysql/ eur-BE: http://mysql.skynet.be/ eur-BE: ftp://ftp.mysql.skynet.be/pub/ftp.mysql.com/ eur-BA: http://mysql.blic.net/ eur-BG: http://mysql.online.bg/ eur-BG: ftp://mysql.online.bg/ eur-CZ: http://mysql.linux.cz/ eur-CZ: ftp://ftp.fi.muni.cz/pub/mysql/ eur-DK: http://mysql.borsen.dk/ eur-DK: http://mysql.mirrors.cybercity.dk/ eur-DK: http://mirrors.dotsrc.org/mysql/ eur-DK: ftp://mirrors.dotsrc.org/mysql/ eur-FI: http://mysql.tonnikala.org/ eur-FR: http://mir2.ovh.net/ftp.mysql.com/ eur-FR: ftp://mir1.ovh.net/ftp.mysql.com/ eur-FR: http://mysql.crihan.fr/ eur-FR: ftp://ftp.inria.fr/pub/MySQL/ eur-FR: http://ftp.club-internet.fr/mirrors/ftp.mysql.com/ eur-FR: ftp://ftp.club-internet.fr/pub/mirrors/ftp.mysql.com/ eur-FR: http://mirrors.ircam.fr/pub/mysql/ eur-FR: ftp://mirrors.ircam.fr/pub/mysql/ eur-DE: http://sunsite.informatik.rwth-aachen.de/mysql/ eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ eur-DE: http://ftp.gwdg.de/pub/misc/mysql/ eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ eur-DE: ftp://ftp.fu-berlin.de/unix/databases/mysql/ eur-DE: http://ftp.plusline.de/mysql/ eur-DE: ftp://ftp.plusline.de/pub/mysql/ eur-GR: http://mirrors.ntua.gr/MySQL/ eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/ eur-GR: http://mirrors.ee.teiath.gr/mysql/ eur-GR: ftp://mirrors.ee.teiath.gr/pub/mysql/ eur-HU: http://mysql.sote.hu/ eur-HU: ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/ eur-HU: http://mysql.mirrors.crysys.hit.bme.hu/ eur-HU: ftp://ftp.crysys.hu/pub/mysql/ eur-IS: http://mysql.rhnet.is/ eur-IS: ftp://ftp.rhnet.is/pub/mysql/ eur-IE: http://ftp.heanet.ie/mirrors/www.mysql.com/ eur-IE: ftp://ftp.heanet.ie/mirrors/www.mysql.com/ eur-IT: http://mirror.tomato.it/mysql/ eur-IT: http://na.mirror.garr.it/mirrors/MySQL/ eur-IT: ftp://na.mirror.garr.it/mirrors/MySQL/ eur-NL: http://mysql.proserve.nl/ eur-NL: ftp://mysql.proserve.nl/pub/mysql/Downloads eur-NL: http://ftp.snt.utwente.nl/pub/software/mysql/ eur-NL: ftp://ftp.snt.utwente.nl/pub/software/mysql/ eur-PL: http://sunsite.icm.edu.pl/mysql/ eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ eur-PT: http://mysql.nfsi.pt/ eur-PT: ftp://ftp.nfsi.pt/pub/mysql/ eur-PT: http://mysql.netvisao.pt/ eur-PT: ftp://mirrors2.netvisao.pt/mysql/ eur-PT: http://lisa.gov.pt/ftp/mysql/ eur-PT: ftp://ftp.roedu.net/pub/mirrors/ftp.mysql.com/ eur-RO: ftp://mirrors.fibernet.ro/1/MySQL/ eur-RO: http://mysql.ran.ro/ eur-RO: ftp://ftp.ran.ro/pub/mirrors/ftp.mysql.com/ eur-RU: http://mysql.directnet.ru/ eur-RU: ftp://ftp.dn.ru/pub/MySQL/ eur-RU: http://mysql.dn.ru/ eur-RU: http://mysql.mix.su/ eur-RU: ftp://mysql.mix.su/ eur-SI: http://mirrors.bevc.net/mysql/ eur-SI: ftp://ftp.bevc.net/mirrors/mysql/ eur-SI: http://ftp.arnes.si/mysql/ eur-SI: ftp://ftp.arnes.si/packages/mysql/ eur-SI: http://www.wsection.com/mysql/ eur-ES: http://mysql.rediris.es/ eur-ES: ftp://ftp.rediris.es/mirror/mysql/ eur-SE: http://mysql.dataphone.se/ eur-SE: ftp://mirror2.dataphone.se/pub/mysql/ eur-CH: http://mirror.switch.ch/ftp/mirror/mysql/ eur-CH: ftp://mirror.switch.ch/mirror/mysql/ eur-CH: ftp://ftp.solnet.ch/mirror/mysql/ eur-TR: http://mysql.progen.com.tr/ eur-UA: http://mysql.net.ua/ eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/ eur-UA: http://mysql.infocom.ua/ eur-UK: http://mysql.mirror.anlx.net/ eur-UK: http://www.mirrorservice.org/sites/ftp.mysql.com/ eur-UK: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/ eur-UK: http://mirrors.dedipower.com/www.mysql.com/ eur-UK: http://www.mirror.ac.uk/mirror/www.mysql.org/ eur-UK: ftp://ftp.mirror.ac.uk/mirror/www.mysql.org/ nam-CA: http://mysql.serenitynet.com/ nam-CA: ftp://ftp.mysql.serenitynet.com/ nam-PR: http://mirrors.hpcf.upr.edu/mysql/ nam-US: http://mirror.trouble-free.net/mysql_mirror/ nam-US: http://mysql.binarycompass.org/ nam-US: http://mysql.he.net/ nam-US: http://www.stathy.com/mysql/ nam-US: ftp://www.stathy.com/mysql/ nam-US: http://mysql.mirrors.hoobly.com/ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/ nam-US: http://mysql.mirrors.pair.com/ nam-US: http://mirror.x10.com/mirror/mysql/ nam-US: ftp://mirror.x10.com/mysql/ nam-US: http://mirror.services.wisc.edu/mysql/ nam-US: ftp://mirror.services.wisc.edu/mirrors/mysql/ nam-US: http://mirrors.24-7-solutions.net/pub/mysql/ nam-US: ftp://mirrors.24-7-solutions.net/pub/mysql/ nam-US: http://mysql.orst.edu/ nam-US: ftp://ftp.orst.edu/pub/mysql/ nam-US: http://mysql.mirror.redwire.net/ nam-US: ftp://mysql.mirror.redwire.net/pub/mysql/ sam-AR: http://mysql.localhost.net.ar/ sam-BR: ftp://ftp.pucpr.br/mysql/ sam-BR: http://mirrors.uol.com.br/pub/mysql/ sam-CL: http://mysql.vision.cl/ sam-CL: http://mysql.tecnoera.com/ asi-IN: http://mysqlmirror.netandhost.in/ asi-ID: http://komo.padinet.com/mysql/ asi-ID: ftp://komo.padinet.com/mysql/ asi-JP: http://mirror.mysql-partners-jp.biz/ asi-JP: http://ftp.iij.ad.jp/pub/db/mysql/ asi-JP: ftp://ftp.iij.ad.jp/pub/db/mysql/ asi-SG: http://mysql.oss.eznetsols.org/ asi-SG: ftp://ftp.oss.eznetsols.org/mysql/ asi-KR: http://mysql.byungsoo.net/ asi-KR: ftp://mysql.byungsoo.net/pub/mysql/ asi-KR: http://mysql.holywar.net/ asi-KR: http://mysql.new21.com/ asi-TW: http://mysql.isu.edu.tw/ asi-TW: http://mysql.cs.pu.edu.tw/ asi-TW: ftp://ftp.cs.pu.edu.tw/Unix/mysql/ asi-TW: http://ftp.stu.edu.tw/pub/Unix/Database/Mysql/ asi-TW: ftp://ftp.stu.edu.tw/pub/Unix/Database/Mysql/ aus-AU: http://mysql.planetmirror.com/ aus-AU: ftp://ftp.planetmirror.com/pub/mysql/ aus-AU: http://mysql.mirrors.ilisys.com.au/ aus-NZ: http://mysql.inspire.net.nz/ aus-NZ: ftp://mysql.inspire.net.nz/mysql/ afr-ZA: ftp://ftp.is.co.za/mirrors/mysql/ << # Patch Phase PatchFile: %n.patch PatchFile-MD5: 295bb29e3f6e87d38509e259701510d0 PatchScript: /usr/bin/sed "s|@PREFIX@|%p|g" %{PatchFile} | /usr/bin/patch -p1 # Compile Phase: # See BUILD/compile-ppc-max SetCFLAGS: -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -g SetCXXFLAGS: -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -g SetMAKEFLAGS: -j1 ConfigureParams: << --enable-assembler \ --with-extra-charsets=complex \ --enable-thread-safe-client \ --with-big-tables \ --with-innodb \ --with-archive-storage-engine \ --with-big-tables \ --with-blackhole-storage-engine \ --with-federated-storage-engine \ --with-csv-storage-engine \ --with-embedded-server \ --enable-local-infile \ --with-ndbcluster \ \ --without-libedit \ --without-readline \ --disable-dependency-tracking \ --with-mysqld-user=mysql \ --with-yassl \ \ --mandir=%p/share/man \ --infodir=%p/share/info \ --localstatedir=%p/var/mysql \ --libexecdir=%p/sbin \ --sysconfdir=%p/etc << GCC: 4.0 InfoTest: << TestScript: [[ "$UID" -eq 0 ]] && { chown -R nobody. ./mysql-test && /usr/bin/sudo -u nobody make test-force || exit 2; } || { make test-force || exit 2; } << # Install Phase: InstallScript: << make install DESTDIR=%d benchdir_root=%p/share/mysql libsdir=%p/lib/mysql ln -s mysql/libmysqlclient.la %i/lib ln -s mysql/libmysqlclient.a %i/lib ln -s mysql/libmysqlclient.dylib %i/lib # Remove %p/bin/test, which is also included in coreutils. rm -f %i/bin/test install -d -m 755 %i/share/doc/installed-packages touch %i/share/doc/installed-packages/{mysql,mysql-ssl,mysql-client,mysql-ssl-client,mysql15-dev,mysql15-shlibs,mysql-ssl15-dev,mysql-ssl15-shlibs} << SplitOff: << Description: Dummy Upgrade Package for MySQL Package: mysql Depends: %N (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff2: << Description: Dummy Upgrade Package for MySQL Package: mysql-ssl Depends: %N (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff10: << Description: Dummy Upgrade Package for MySQL Package: mysql15-dev Depends: %N-dev (>= 5.0.45-1), fink-obsolete-packages BuildDependsOnly: true Files: share/doc/installed-packages/%n << SplitOff11: << Description: Dummy Upgrade Package for MySQL Package: mysql-ssl15-dev Depends: %N-dev (>= 5.0.45-1), fink-obsolete-packages BuildDependsOnly: true Files: share/doc/installed-packages/%n << SplitOff12: << Description: Open Source SQL database - Development headers and libraries Package: %N-dev Depends: %N-shlibs (= %v-%r) BuildDependsOnly: True Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql14-dev Replaces: mysql (<< 5.0.38-1004), mysql-ssl (<< 5.0.38-1004), mysql-dev, mysql12-dev, mysql14-dev, mysql15-dev, mysql-ssl15-dev Files: << include lib/mysql/*.a lib/mysql/*.la lib/mysql/libmysqlclient.dylib lib/mysql/libmysqlclient_r.dylib lib/mysql/libndbclient.dylib bin/mysql_config lib/libmysqlclient.* share/man/man1/mysql_config.1 << DocFiles: README COPYING << SplitOff20: << Description: Dummy Upgrade Package for MySQL Package: mysql15-shlibs Depends: %N-shlibs (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff21: << Description: Dummy Upgrade Package for MySQL Package: mysql-ssl15-shlibs Depends: %N-shlibs (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff22: << Description: Open Source SQL database - Shared libraries Package: %N-shlibs Replaces: mysql (<< 5.0.38-1004), mysql-ssl (<< 5.0.38-1004), mysql15-shlibs, mysql-ssl15-shilbs Files: << lib/mysql/libmysqlclient.15*.dylib lib/mysql/libmysqlclient_r.15*.dylib lib/mysql/libndbclient.2*.dylib << Shlibs: << %p/lib/mysql/libmysqlclient.15.dylib 16.0.0 %n (>= 5.0.45-1) %p/lib/mysql/libmysqlclient_r.15.dylib 16.0.0 %n (>= 5.0.45-1) %p/lib/mysql/libndbclient.2.dylib 3.0.0 %n (>= 5.0.45-1) << DocFiles: README COPYING << SplitOff30: << Description: Dummy Upgrade Package for MySQL Package: mysql-client Depends: %N-client (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff31: << Description: Dummy Upgrade Package for MySQL Package: mysql-ssl-client Depends: %N-client (>= 5.0.45-1), fink-obsolete-packages Files: share/doc/installed-packages/%n << SplitOff32: << Description: Open Source SQL database - Client Package: %N-client Depends: %N-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004) Conflicts: mysql (<= 3.23.54a-2) Replaces: mysql (<= 5.0.38-1001), mysql-ssl (<= 5.0.38-1001), mysql-client, mysql-ssl-client Files: << bin/myisam_ftdump bin/mysql bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_tableinfo bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlimport bin/mysqlshow bin/mysqltest_embedded bin/mysqltestmanager bin/mysqltestmanager-pwgen bin/mysqltestmanagerc share/man/man1/mysql.1 share/man/man1/mysqlaccess.1 share/man/man1/mysqladmin.1 share/man/man1/mysqlcheck.1 share/man/man1/mysqldump.1 share/man/man1/mysqlimport.1 share/man/man1/mysqlshow.1 share/man/man1/myisam_ftdump.1 share/man/man1/mysql_explain_log.1 share/man/man8/mysqlmanager.8 << DocFiles: README COPYING << DocFiles: README COPYING # Build Phase: InfoDocs: mysql.info PostInstScript: << /usr/bin/install -o mysql -g mysql -m 700 -d %p/var/mysql # determine directory where databases are living data_dir=$(my_print_defaults mysqld | grep datadir | cut -d= -f2) if [ -z "$data_dir" ]; then data_dir=%p/var/mysql fi if [[ -e "$data_dir"/mysql || -e "$data_dir"/test ]]; then echo "$data_dir/mysql found. If you're upgrading from older version" echo "of MySQL, you should run %p/bin/mysql_upgrade_shell script." echo "See: http://dev.mysql.com/doc/refman/5.0/en/upgrade.html" else # create initial database %p/bin/mysql_install_db --user=mysql chown -R mysql:mysql $data_dir/mysql $data_dir/test fi # update daemonic init script if necessary daemonic install mysql << PreRmScript: << # clean up if [ $1 != "upgrade" ]; then daemonic remove mysql fi << DaemonicName: mysql DaemonicFile: << <service> <description>MySQL database server</description> <message>MySQL database server</message> <daemon name="mysql"> <executable background="yes">%p/bin/mysqld_safe</executable> </daemon> </service> << # Additional Data: DescUsage: << The package creates the administrative tables on installation. Be sure to set a MySQL root password using mysqladmin: 'mysqladmin -u root password your-new-password' or 'mysqladmin -u root -h localhost -p password your-new-password' # If you are upgrading from MySQL 4.1, you should update your tables using 'mysql_upgrade_shell' script. For more information about upgrading, please read "2.4.16. Upgrading MySQL" in MySQL 5.0 Reference Manual. # You can start the MySQL server manually using 'mysqld_safe --user=mysql &' or you can run 'daemonic enable mysql' to create a StartupItem for it. All of these must be done as root. << DescPackaging: << The MySQL benchmark suite is stowed away in <prefix>/share/mysql. The InnoDB package revision by Andrei Verovski. http://homepage.mac.com/macgurutemple/downloads.html Previous package revisions by Christoph Pfisterer and Peter O'Gorman. << DescPort: << Supports Darwin out of the box, although the libtool scripts are updated to build shared libraries. Version 3.23.47 fixes shutdown problem on MacOS X/Darwin platform. The 'without-readline' configure flag needs to be there to use the readline from fink instead of the bundled copy. It is being considered that installation directory for MySQL from %p to %p/lib/mysql, in order to avoid having utility programs like "perror", or "replace" in %p/bin. Maybe their names are too much neutral. mysql-ssl15-dev and mysql-ssl15-shlibs are named such, by mistake. It's not impossible to rename them, but just left as they are. << Homepage: http://dev.mysql.com/ << ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs