complete 4.0.14

3 files changed, 59 insertions, 4 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d6818756f594..cd822e2e7d0f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.60 2003/07/23 20:24:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.61 2003/07/28 23:24:37 robbat2 Exp $
+
+  28 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14.ebuild,
+  files/mysql-4.0.14-mysqld-safe-sh.diff:
+  Finish Fixing 4.0.14 and release
 
 *mysql-4.0.14 (23 Jul 2003)
 
diff --git a/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff
new file mode 100644
index 000000000000..ed744134b51e
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff
@@ -0,0 +1,51 @@
+--- mysql-4.0.14/scripts/mysqld_safe.sh.orig	2003-07-18 07:57:41.000000000 -0700
++++ mysql-4.0.14/scripts/mysqld_safe.sh	2003-07-28 15:01:24.000000000 -0700
+@@ -88,44 +88,16 @@
+   done
+ }
+ 
+-
+-MY_PWD=`pwd`
+-# Check if we are starting this relative (for the binary release)
+-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "$defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
+-# Check if this is a 'moved install directory'
+-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./libexec/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/var
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
+ MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
+ user=@MYSQLD_USER@
+ niceness=0
+ 
+-# Use the mysqld-max binary by default if the user doesn't specify a binary
+-if test -x $ledir/mysqld-max
+-then
+-  MYSQLD=mysqld-max
+-else
+-  MYSQLD=mysqld
+-fi
++MYSQLD=mysqld
+ 
+ # these rely on $DATADIR by default, so we'll set them later on
+ pid_file=
diff --git a/dev-db/mysql/mysql-4.0.14.ebuild b/dev-db/mysql/mysql-4.0.14.ebuild
index dd953b149f8d..e59d50d8eb0f 100644
--- a/dev-db/mysql/mysql-4.0.14.ebuild
+++ b/dev-db/mysql/mysql-4.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14.ebuild,v 1.1 2003/07/23 20:24:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14.ebuild,v 1.2 2003/07/28 23:24:37 robbat2 Exp $
 
 #to accomodate -laadeedah releases
 NEWP=${P}
@@ -63,7 +63,7 @@ src_unpack() {
 	#zap startup script messages
 	patch -p1 < ${FILESDIR}/mysql-4.0.4-install-db-sh.diff || die
 	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-4.0-mysqld-safe-sh.diff || die
+	patch -p1 < ${FILESDIR}/mysql-4.0.14-mysqld-safe-sh.diff || die
 	#for correct hardcoded sysconf directory
 	patch -p1 < ${FILESDIR}/mysql-4.0-my-print-defaults.diff || die
 	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
@@ -72,7 +72,7 @@ src_unpack() {
 	# i would really prefer to fix this at the Makefile.am level, but can't
 	# get the software to autoreconf as distributed - too many missing files
 	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${P}-thrssl.patch || die
+	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
 }
 
 src_compile() {