Hey,
same change for mysql-server as mbalmer@ did for postgresql-server.
Don't install a database with an empty root password.
Additionally: 'pkg_delete -c' shouldn't remove the databases.
ok?
Bernd
Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile 14 Oct 2006 05:04:54 -0000 1.121
+++ Makefile 18 Oct 2006 16:33:42 -0000
@@ -12,7 +12,7 @@ COMMENT-tests= "multithreaded SQL databa
VERSION= 5.0.26
DISTNAME= mysql-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}
-PKGNAME-server= mysql-server-${VERSION}
+PKGNAME-server= mysql-server-${VERSION}p0
FULLPKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES= databases
V= MySQL-5.0
Index: pkg/INSTALL-server
===================================================================
RCS file: pkg/INSTALL-server
diff -N pkg/INSTALL-server
--- pkg/INSTALL-server 12 Oct 2004 21:14:42 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL-server,v 1.10 2004/10/12 21:14:42 espie Exp $
-#
-# Pre/post-installation setup of MySQL
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-DB_DIR=${DB_DIR}
-
-do_notice_existingdir()
-{
- echo
- echo "+---------------"
- echo "| You appear to already have a MySQL database directory in $DB_DIR"
- echo "|"
- echo "| The database directory has been preserved. If you want to start"
- echo "| from the default database setup, you should perform these steps"
- echo "| as root:"
- echo "|"
- echo "| rm -rf $DB_DIR"
- echo "| $PREFIX/bin/mysql_install_db"
- echo "|"
- echo "+---------------"
- echo
-}
-
-do_database_install()
-{
- $PREFIX/bin/mysql_install_db
-}
-
-case $2 in
- POST-INSTALL)
- if [ -d $DB_DIR ]; then
- do_notice_existingdir
- else
- do_database_install
- fi
- ;;
-esac
-
-exit 0
Index: pkg/MESSAGE-server
===================================================================
RCS file: pkg/MESSAGE-server
diff -N pkg/MESSAGE-server
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE-server 18 Oct 2006 16:28:24 -0000
@@ -0,0 +1,2 @@
+The mysql-server package doesn't initialize a default database.
+Please run ${PREFIX}/bin/mysql_install_db to create an initial database.
Index: pkg/PLIST-server
===================================================================
RCS file: /home/OpenBSD/cvs/ports/databases/mysql/pkg/PLIST-server,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-server
--- pkg/PLIST-server 14 Oct 2006 05:04:54 -0000 1.23
+++ pkg/PLIST-server 18 Oct 2006 16:33:28 -0000
@@ -150,5 +150,4 @@ share/mysql/swedish/
share/mysql/swedish/errmsg.sys
share/mysql/ukrainian/
share/mysql/ukrainian/errmsg.sys
[EMAIL PROTECTED] rm -rf ${DB_DIR}
@extraunexec rm -rf ${SOCKET_DIR}
