Update of /cvsroot/fink/experimental/asari
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11186
Modified Files:
mysql.info mysql.listmirrors.sh mysql.patch
Added Files:
mysql-5.0.67.info mysql-5.0.67.patch
Removed Files:
mysql-5.1.14.info
Log Message:
following upstream; todo: check the shlibs field and introduce
mysql16-shlibs/dev if needed.
--- NEW FILE: mysql-5.0.67.info ---
Info2:<<
Package: mysql%type_pkg[-ssl]
Version: 5.0.67
Revision: 1001
Description: Open Source SQL database
License: GPL/LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Type: -ssl (. -ssl)
# Dependencies:
Depends: %N15-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1)
BuildDepends: readline5 (>= 5.0-1004), fink (>= 0.25)
Conflicts: %{Ni}, %{Ni}-ssl
Replaces: %{Ni}, %{Ni}-ssl
# Unpack Phase:
Source: mirror:custom:Downloads/MySQL-5.0/%{ni}-%v.tar.gz
Source-MD5: 7164483a5ffb8f7aa59b761c13cdbd6e
CustomMirror: <<
# Some country codes not in /sw/lib/fink/mirror/_keys
eur-BE: http://mysql.easynet.be/
eur-BE: ftp://ftp.easynet.be/mysql/
eur-BE: http://mysql.mirror.kangaroot.net/
eur-BE: ftp://mysql.mirror.kangaroot.net/pub/mysql/
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.webname.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: ftp://ftp.inria.fr/pub/MySQL/
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-GR: http://ftp.uoi.gr/pub/databases/mysql/
eur-GR: ftp://ftp.uoi.gr/pub/databases/mysql/
eur-GR: http://ftp.ntua.gr/pub/databases/mysql/
eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/
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://na.mirror.garr.it/mirrors/MySQL/
eur-IT: ftp://na.mirror.garr.it/mirrors/MySQL/
eur-LV: http://mysql.php.lv/
eur-LT: http://mysql.bst.lt/
eur-NL: http://mysql.mirrors.webazilla.nl/
eur-NL: http://mirror.leaseweb.com/mysql/
eur-NL: ftp://mirror.leaseweb.com/mysql/
eur-NL: http://mirror.hostfuss.com/mysql/
eur-NL: ftp://mirror.hostfuss.com/mysql/
eur-NL: http://mysql.proserve.nl/
eur-NL: ftp://mysql.proserve.nl/pub/mysql/Downloads
eur-PL: http://ftp.tpnet.pl/vol/d3/ftp.mysql.com/
eur-PL: ftp://ftp.tpnet.pl/d3/ftp.mysql.com/
eur-PT: http://mysql.nfsi.pt/
eur-PT: ftp://ftp.nfsi.pt/pub/mysql/
eur-RO: ftp://mirrors.fibernet.ro/1/MySQL/
eur-RO: http://ftp.astral.ro/mirrors/mysql.com/
eur-RO: ftp://ftp.astral.ro/mirrors/mysql.com/
eur-RO: http://mirrors.xservers.ro/mysql/
eur-RU: http://mysql.mix.su/
eur-RU: ftp://mysql.mix.su/
eur-SI: http://mirrors.paknet.org/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-SE: http://ftp.sunet.se/pub/unix/databases/relational/mysql/
eur-SE: ftp://ftp.sunet.se/pub/unix/databases/relational/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://ftp.itu.edu.tr/Mirror/Mysql/
eur-TR: ftp://ftp.itu.edu.tr/Mirror/Mysql/
eur-UA: http://mysql.infocom.ua/
eur-UK: http://www.mirrorservice.org/sites/ftp.mysql.com/
eur-UK: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/
eur-UK: http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/
eur-UK: ftp://mirrors.ukfast.co.uk/ftp.mysql.com/
eur-UK: http://mirrors.dedipower.com/www.mysql.com/
nam-CA: http://mysql.mirror.iweb.ca/
nam-CA: ftp://mysql.mirror.iweb.ca/
nam-CA: http://mysql.mirror.rafal.ca/
nam-CA: ftp://mysql.mirror.rafal.ca/pub/mysql/
nam-CA: http://mirror.csclub.uwaterloo.ca/mysql/
nam-CA: ftp://mirror.csclub.uwaterloo.ca/mysql/
nam-CA: http://mysql.serenitynet.com/
nam-CA: ftp://ftp.mysql.serenitynet.com/
nam-US: http://mirror.trouble-free.net/mysql_mirror/
nam-US: http://mysql.he.net/
nam-US: http://mysql.mirrors.hoobly.com/
nam-US: ftp://mirror.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://opensource.become.com/mysql/
nam-US: http://mysql.llarian.net/
nam-US: ftp://mysql.llarian.net/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-AR: http://mysql.patan.com.ar/
sam-BR: http://mysql.cce.usp.br/
sam-BR: ftp://mysql.cce.usp.br/mysql
asi-AM: http://mysql.mirrors.arminco.com/
asi-AM: http://mysql.mirrors.adc.am/
asi-IN: http://mysqlmirror.netandhost.in/
asi-ID: http://mysql.cbn.net.id/
asi-ID: ftp://mirror.cbn.net.id/pub/mysql/
asi-IL: http://mirror.mirimar.net/mysql/
asi-IL: http://mysql.spd.co.il/
asi-JP: http://ftp.iij.ad.jp/pub/db/mysql/
asi-JP: ftp://ftp.iij.ad.jp/pub/db/mysql/
asi-PK: http://mirror.pakistani.org/mysql/
asi-PK: ftp://mirror.pakistani.org/pub/mysql/
asi-KR: http://mysql.byungsoo.net/
asi-KR: ftp://mysql.byungsoo.net/pub/mysql/
asi-KR: http://mysql.holywar.net/
asi-SG: http://mysql.oss.eznetsols.org/
asi-SG: ftp://ftp.oss.eznetsols.org/mysql/
asi-TW: http://mysql.ntu.edu.tw/
asi-TW: ftp://ftp.ntu.edu.tw/pub/MySQL/
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://mysql.stu.edu.tw/
asi-TW: http://mysql.cdpa.nsysu.edu.tw/
asi-TW: ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/
asi-TW: ftp://ftp.stu.edu.tw/pub/Unix/Database/Mysql/
asi-TH: http://mysql.thaiweb.net/
asi-VN: http://mirror-fpt-telecom.fpt.net/mysql/
asi-VN: ftp://mirror-fpt-telecom.fpt.net/mysql/
afr-ZA: http://mysql.mirror.ac.za/
afr-ZA: ftp://mysql.mirror.ac.za/
aus-AU: http://mysql.mirrors.ilisys.com.au/
aus-NZ: http://mysql.inspire.net.nz/
aus-NZ: ftp://mysql.inspire.net.nz/mysql/
<<
# Patch Phase
PatchFile: %n-%v.patch
PatchFile-MD5: 11f81fb29a2ea5875db8584cc60e6934
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
NoSetMAKEFLAGS: true
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-readline \
--disable-dependency-tracking \
--with-mysqld-user=mysql \
(%type_pkg[-ssl]) --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
<<
SplitOff: <<
Description: Open Source SQL database - Development headers and libraries
Package: %N15-dev
Depends: %N15-shlibs (= %v-%r)
BuildDependsOnly: True
Conflicts: %{Ni} (<= 3.23.56-1), %{Ni}-dev, %{Ni}12-dev, %{Ni}14-dev,
%{Ni}15-dev, %{Ni}-ssl15-dev
Replaces: %{Ni} (<< 5.0.38-1004), %{Ni}-ssl (<< 5.0.38-1004), %{Ni}-dev,
%{Ni}12-dev, %{Ni}14-dev, %{Ni}15-dev, %{Ni}-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
<<
SplitOff2: <<
Description: Open Source SQL database - Shared libraries
Package: %N15-shlibs
Conflicts: %{Ni}15-shlibs, %{Ni}-ssl15-shilbs
Replaces: %{Ni} (<< 5.0.38-1004), %{Ni}-ssl (<< 5.0.38-1004), %{Ni}15-shlibs,
%{Ni}-ssl15-shilbs
Files: <<
lib/mysql/libmysqlclient.15.0.0.dylib
lib/mysql/libmysqlclient.15.dylib
lib/mysql/libmysqlclient_r.15.0.0.dylib
lib/mysql/libmysqlclient_r.15.dylib
lib/mysql/libndbclient.2.0.0.dylib
lib/mysql/libndbclient.2.dylib
<<
Shlibs: <<
%p/lib/mysql/libmysqlclient.15.dylib 16.0.0 %n (>= 5.0.15-1)
%p/lib/mysql/libmysqlclient_r.15.dylib 16.0.0 %n (>= 5.0.15-1)
%p/lib/mysql/libndbclient.2.dylib 3.0.0 %n (>= 5.0.38-1004)
<<
DocFiles: README COPYING
<<
SplitOff3: <<
Description: Open Source SQL database - Client
Package: %N-client
Depends: %N15-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004)
Conflicts: %{Ni} (<= 3.23.54a-2), %{Ni}-client, %{Ni}-ssl-client
Replaces: %{Ni} (<= 5.0.38-1001), %{Ni}-ssl (<= 5.0.38-1001), %{Ni}-client,
%{Ni}-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/
<<
Index: mysql.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/mysql.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mysql.info 28 Nov 2008 19:30:56 -0000 1.23
+++ mysql.info 29 Nov 2008 09:44:21 -0000 1.24
@@ -1,6 +1,6 @@
Info2:<<
Package: mysql%type_pkg[-ssl]
-Version: 5.0.67
+Version: 5.1.30
Revision: 1001
Description: Open Source SQL database
License: GPL/LGPL
@@ -14,8 +14,8 @@
Replaces: %{Ni}, %{Ni}-ssl
# Unpack Phase:
-Source: mirror:custom:Downloads/MySQL-5.0/%{ni}-%v.tar.gz
-Source-MD5: 7164483a5ffb8f7aa59b761c13cdbd6e
+Source: mirror:custom:Downloads/MySQL-5.1/%{ni}-%v.tar.gz
+Source-MD5: b658e58887a74dce65224ae0fc8ee06a
CustomMirror: <<
# Some country codes not in /sw/lib/fink/mirror/_keys
eur-BE: http://mysql.easynet.be/
@@ -156,7 +156,7 @@
<<
# Patch Phase
PatchFile: %{ni}.patch
-PatchFile-MD5: a8deb268b18c5cd38be857c9290562fc
+PatchFile-MD5: 04f54e7d29e3d0a10ab57cbd7d4daa8b
PatchScript: /usr/bin/sed "s|@PREFIX@|%p|g" %{PatchFile} | /usr/bin/patch -p1
# Compile Phase:
@@ -183,7 +183,7 @@
--without-readline \
--disable-dependency-tracking \
--with-mysqld-user=mysql \
- (%type_pkg[-ssl]) --with-yassl \
+ (%type_pkg[-ssl]) --with-ssl \
\
--mandir=%p/share/man \
--infodir=%p/share/info \
@@ -303,8 +303,8 @@
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";
+ echo "of MySQL, you should run %p/bin/mysql_upgrade ."
+ echo "See: http://dev.mysql.com/doc/refman/5.1/en/upgrade.html";
else
# create initial database
%p/bin/mysql_install_db --user=mysql
@@ -340,9 +340,9 @@
'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.
+If you are upgrading from MySQL 5.0, you should update your tables using
+'mysql_upgrade' . For more information about upgrading,
+please read "2.11 Upgrading MySQL" in MySQL 5.1 Reference Manual.
#
You can start the MySQL server manually using
'mysqld_safe --user=mysql &'
Index: mysql.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/mysql.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mysql.patch 19 Mar 2007 05:24:51 -0000 1.9
+++ mysql.patch 29 Nov 2008 09:44:21 -0000 1.10
@@ -1,23 +1,22 @@
-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-16 02:13:52.000000000
+0900
-@@ -980,6 +980,8 @@
- {
- const char *env, **ptr= default_directories;
+diff -Naru mysql-5.1.30/mysys/default.c mysql-5.1.30.fink/mysys/default.c
+--- mysql-5.1.30/mysys/default.c 2008-11-15 01:36:56.000000000 +0900
++++ mysql-5.1.30.fink/mysys/default.c 2008-11-29 18:02:21.000000000 +0900
+@@ -1086,8 +1086,6 @@
-+ *ptr++= "@PREFIX@/etc/";
-+
- #ifdef __WIN__
- *ptr++= "C:/";
+ #else
-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
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+
+ #if defined(DEFAULT_SYSCONFDIR)
+ if (DEFAULT_SYSCONFDIR != "")
+diff -Naru mysql-5.1.30/scripts/mysqld_safe.sh
mysql-5.1.30.fink/scripts/mysqld_safe.sh
+--- mysql-5.1.30/scripts/mysqld_safe.sh 2008-11-15 01:37:06.000000000
+0900
++++ mysql-5.1.30.fink/scripts/mysqld_safe.sh 2008-11-29 18:02:54.000000000
+0900
+@@ -233,21 +233,7 @@
#
--# Try where the binary installs put it
+ # Try where the binary installs put it
-if test -d $MY_BASEDIR_VERSION/data/mysql
-then
- DATADIR=$MY_BASEDIR_VERSION/data
@@ -31,26 +30,8 @@
- 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
-
--- mysql-5.1.14.info DELETED ---
Index: mysql.listmirrors.sh
===================================================================
RCS file: /cvsroot/fink/experimental/asari/mysql.listmirrors.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mysql.listmirrors.sh 29 Dec 2006 08:57:59 -0000 1.1
+++ mysql.listmirrors.sh 29 Nov 2008 09:44:21 -0000 1.2
@@ -1,9 +1,9 @@
#!/bin/sh
-curl
http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-5.0.27.tar.gz/from/pick |
- grep /get/Downloads/MySQL-5.0/mysql-5.0.27.tar.gz/from/ |
+curl
http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-5.0.67.tar.gz/from/pick |
+ grep /get/Downloads/MySQL-5.0/mysql-5.0.67.tar.gz/from/ |
sed -e 's|^.*<h2>Europe</h2>||' |
perl -pe 's|<a href="(.*?)">.?.?TP</a>|\n\1\n|g' |
grep "^/get" |
grep -e "from/http" -e "from/ftp" |
- sed -e 's|/get/Downloads/MySQL-5.0/mysql-5.0.27.tar.gz/from/||g'
+ sed -e 's|/get/Downloads/MySQL-5.0/mysql-5.0.67.tar.gz/from/||g'
--- NEW FILE: mysql-5.0.67.patch ---
diff -Naru mysql-5.0.67/mysys/default.c mysql-5.0.67.fink/mysys/default.c
--- mysql-5.0.67/mysys/default.c 2008-11-29 04:54:49.000000000 +0900
+++ mysql-5.0.67.fink/mysys/default.c 2008-11-29 05:15:35.000000000 +0900
@@ -1077,7 +1077,6 @@
#else
- errors += add_directory(alloc, "/etc/", dirs);
#if defined(__EMX__) || defined(OS2)
if ((env= getenv("ETC")))
diff -Naru mysql-5.0.67/scripts/mysql_upgrade_shell.sh
mysql-5.0.67.fink/scripts/mysql_upgrade_shell.sh
--- mysql-5.0.67/scripts/mysql_upgrade_shell.sh 2008-11-29 04:54:53.000000000
+0900
+++ mysql-5.0.67.fink/scripts/mysql_upgrade_shell.sh 2008-11-29
14:50:37.000000000 +0900
@@ -150,18 +150,7 @@
if test -z "$DATADIR"
then
- # Try where the binary installs put it
- if test -d $MY_BASEDIR_VERSION/data/mysql
- then
- DATADIR=$MY_BASEDIR_VERSION/data
- # 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 ! -x "$bindir/mysqlcheck"
diff -Naru mysql-5.0.67/scripts/mysqld_safe.sh
mysql-5.0.67.fink/scripts/mysqld_safe.sh
--- mysql-5.0.67/scripts/mysqld_safe.sh 2008-11-29 04:54:53.000000000 +0900
+++ mysql-5.0.67.fink/scripts/mysqld_safe.sh 2008-11-29 05:11:31.000000000
+0900
@@ -133,22 +133,7 @@
# 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
[EMAIL PROTECTED]@
-fi
if test -z "$MYSQL_HOME"
then
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
