diff options
| author | Peter Hawkins <thepish@FreeBSD.org> | 1998-10-22 07:47:41 +0000 |
|---|---|---|
| committer | Peter Hawkins <thepish@FreeBSD.org> | 1998-10-22 07:47:41 +0000 |
| commit | 9d7c8151afbaebca7269d8536d8258eff1e11200 (patch) | |
| tree | cdf527f546d65002419c6a476ffed0cfda0de700 | |
| parent | d83046f9caf9ccaf090f358e6d9b5fe39e1eb084 (diff) | |
| download | ports-9d7c8151afbaebca7269d8536d8258eff1e11200.tar.gz ports-9d7c8151afbaebca7269d8536d8258eff1e11200.zip | |
Notes
60 files changed, 900 insertions, 620 deletions
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql322-client/Makefile +++ b/databases/mysql322-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql322-server/distinfo +++ b/databases/mysql322-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql322-server/files/patch-ab +++ b/databases/mysql322-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql322-server/files/patch-af b/databases/mysql322-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql322-server/files/patch-af +++ b/databases/mysql322-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql323-client/Makefile +++ b/databases/mysql323-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql323-server/files/patch-ab +++ b/databases/mysql323-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql323-server/files/patch-af +++ b/databases/mysql323-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql40-server/files/patch-ab +++ b/databases/mysql40-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql40-server/files/patch-af +++ b/databases/mysql40-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql41-server/files/patch-ab +++ b/databases/mysql41-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql41-server/files/patch-af +++ b/databases/mysql41-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql50-server/files/patch-ab +++ b/databases/mysql50-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql50-server/files/patch-af +++ b/databases/mysql50-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql51-server/files/patch-ab +++ b/databases/mysql51-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql51-server/files/patch-af +++ b/databases/mysql51-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql54-server/files/patch-ab +++ b/databases/mysql54-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql54-server/files/patch-af +++ b/databases/mysql54-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql55-server/files/patch-ab +++ b/databases/mysql55-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql55-server/files/patch-af +++ b/databases/mysql55-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/mysql60-server/files/patch-ab +++ b/databases/mysql60-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/mysql60-server/files/patch-af +++ b/databases/mysql60-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 3fcfd1cd04f6..5ed51094cf47 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -3,11 +3,11 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.28 1998/10/01 11:29:51 jseger Exp $ +# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $ # -DISTNAME= mysql-3.22.6-alpha -PKGNAME= mysql-3.22.6a +DISTNAME= mysql-3.22.9-beta +PKGNAME= mysql-3.22.9b CATEGORIES= databases MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -15,8 +15,6 @@ MASTER_SITES= http://mysql.polaris.ca/Downloads/MySQL-3.22/ \ MAINTAINER= ibex@physik.TU-Berlin.DE -BROKEN_ELF= build - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 @@ -75,6 +73,8 @@ post-install: @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "/sbin/ldconfig -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh @ ${ECHO} " ${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh @@ -93,6 +93,6 @@ post-install: @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .endif - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql .include <bsd.port.mk> diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 3c563e34508d..b51827f250a8 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4 +MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258 diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab index 2aa751cd44c6..1698b84a1df9 100644 --- a/databases/percona55-server/files/patch-ab +++ b/databases/percona55-server/files/patch-ab @@ -1,17 +1,29 @@ ---- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 -+++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 +--- scripts/mysql_install_db.sh.orig Sun Oct 18 23:59:46 1998 ++++ scripts/mysql_install_db.sh Wed Oct 21 15:22:31 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file # This scripts creates the privilige tables db, host, user in mysql --# It should be run from the top level installation directory +-# It should be run from the top level installation directory. # # All arguments to this script is passed to safe_mysqld -@@ -16,40 +15,12 @@ - bn=`basename $file .frm-new` - mv $file $dir/$bn.frm - done +@@ -11,36 +10,8 @@ + + if test "$1" = "-IN-RPM" + then +- # We are doing a rpm install. +- IN_RPM=1; shift +- # First check if we already have the mysql database. +- if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM +- then +- for file in $mdata/*.frm-new +- do +- dir=`dirname $file` +- bn=`basename $file .frm-new` +- cp $file $dir/$bn.frm +- done +- fi -else - if test ! -d "./data" - then @@ -30,27 +42,31 @@ - exit 1 - fi - fi ++ # Make -IN-RPM a noop, just in case... ++ shift fi if test ! -x @bindir@/mysqladmin - then -- if test "@localstatedir@" = "./data" +@@ -51,17 +22,6 @@ + ls -l /usr/bin/mysql* + echo "Didn't find @bindir@/mysqladmin" + exit 1 +- elif test "@localstatedir@" = "./data" - then - echo "Can't execute @bindir@/mysqladmin" +- echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" - exit 1 +- exit 1 - else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" - exit 1 -- fi + fi fi - if test -f @localstatedir@/mysql/db.ISM -@@ -65,9 +36,6 @@ - exit 1 +@@ -84,9 +44,6 @@ + fi fi -# On IRIX hostname is in /usr/bsd so add this to the path @@ -59,29 +75,29 @@ hostname=`hostname` # Install this too in the user table # create database mysql & test -@@ -118,10 +86,7 @@ - # - if test ! -f @localstatedir@/mysql/user.frm +@@ -142,10 +99,7 @@ then -- if test "@localstatedir@" != "./data" -- then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql -- fi -+ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p ./data/mysql/*.frm @localstatedir@/mysql + fi fi - @bindir@/mysql mysql <<END_OF_DATA -@@ -150,9 +115,6 @@ +@@ -175,9 +129,6 @@ # Dumping data for table 'user' # -INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); -@@ -160,16 +122,19 @@ +@@ -185,6 +136,13 @@ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N'); END_OF_DATA @@ -95,13 +111,17 @@ if test $? -eq 0 then @bindir@/mysqladmin reload - echo "mysqld demon is running and mysql grant tables are installed." +@@ -197,13 +155,6 @@ echo echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -- echo -- echo "You can test the MySQL demon with the benchmarks in the 'bench'" -- echo "directory:" -- echo "cd bench ; run-all-tests" echo +- if test -z "$IN_RPM" +- then +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- fi echo "You can also try the mysql command line tool with:" echo "@bindir@/mysql test" + echo diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af index 77d9219c4ecb..e3ba06c5d132 100644 --- a/databases/percona55-server/files/patch-af +++ b/databases/percona55-server/files/patch-af @@ -1,8 +1,8 @@ ---- scripts/safe_mysqld.sh.orig Mon Aug 10 16:31:56 1998 -+++ scripts/safe_mysqld.sh Tue Sep 1 11:03:21 1998 -@@ -10,25 +10,9 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing safe_mysqld +--- scripts/safe_mysqld.sh.orig Wed Oct 7 10:30:58 1998 ++++ scripts/safe_mysqld.sh Wed Oct 21 15:05:52 1998 +@@ -12,33 +12,9 @@ + + trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) -if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ @@ -22,6 +22,14 @@ - MY_BASEDIR_VERSION=@prefix@ - DATADIR=@localstatedir@ - ledir=@libexecdir@ +- if test ! -x $ledir/mysqld +- then +- echo "The file $ledir/mysqld doesn't exists or is not executable" +- echo "Please do a cd to the mysql installation directory and restart" +- echo "this scrift from there as follows:" +- echo "./bin/safe_mysqld". +- exit 1; +- fi -fi +MY_BASEDIR_VERSION=@prefix@ +DATADIR=@localstatedir@ @@ -29,7 +37,7 @@ pidfile=$DATADIR/`@HOSTNAME@`.pid log=$DATADIR/`@HOSTNAME@`.log -@@ -93,33 +77,6 @@ +@@ -103,33 +79,6 @@ if test ! -f $pidfile # This is removed if normal shutdown then break; @@ -42,7 +50,7 @@ - # The only thing is ps x => redhat 5 gives warnings when using ps -x. - # kill -9 is used or the proces won't react on the kill. - numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $log +- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err - I=1 - while test "$I" -le "$numofproces" - do @@ -54,12 +62,12 @@ - # echo "TEST $I - $T **" - if kill -9 $T - then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $log +- echo "mysqld proces hanging, pid $T - killed" | tee -a $err - else - break - fi - I=`expr $I + 1` - done fi - echo "mysqld restarted on " `date` | tee -a $log + echo "mysqld restarted on " `date` | tee -a $err done diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 4bcfb3097885..bbab91cd70ca 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -7,8 +7,8 @@ bin/isamlog bin/make_binary_distribution bin/msql2mysql bin/mysql -bin/mysql.server bin/mysql_install_db +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug @@ -19,8 +19,6 @@ bin/perror bin/replace bin/resolveip bin/safe_mysqld -bin/which1 -bin/zap etc/rc.d/mysql.sh include/mysql/dbug.h include/mysql/errmsg.h @@ -41,7 +39,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.4.0 +lib/mysql/libmysqlclient.so.4 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -52,6 +50,7 @@ share/doc/mysql/manual.ps share/doc/mysql/manual.texi share/doc/mysql/manual.txt share/doc/mysql/manual_toc.html +share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/dutch/errmsg.sys @@ -67,8 +66,9 @@ share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys share/mysql/italian/errmsg.txt share/mysql/my-example.cnf -share/mysql/mysql-3.22.6-alpha.spec +share/mysql/mysql-3.22.9-beta.spec share/mysql/mysql-log-rotate +share/mysql/mysql.server share/mysql/mysql/db.frm share/mysql/mysql/func.frm share/mysql/mysql/host.frm @@ -108,5 +108,5 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql @exec %D/bin/mysql_install_db @exec /usr/bin/killall mysqld -@unexec /sbin/ldconfig -R -@exec /sbin/ldconfig -m %D/lib +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/mysql +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |