- upgrade to MySQL 3.22.27

- make the default database directory a bit easier to change with the DB_DIR variable - add warning about possible virtual memory limit exhaustion - change default database directory to /var/mysql and chown it to the user:group - integrate check_old_version script into Makefile - we should be able to make this into a full package now, though not tested fully - install user:group of mysql and make MySQL load as user mysql Reviewed and tested by: ericj@
2000-01-01 05:54:12 +00:00 · 2000-01-01 05:54:12 +00:00 · 6f39e9630f
commit 6f39e9630f
parent 831106232f
13 changed files with 442 additions and 81 deletions
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.7 1999/12/02 03:47:36 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/01/01 05:54:12 brad Exp $
 # $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $

-DISTNAME=	mysql-3.22.22
-PKGNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.27
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mysql.org/Downloads/MySQL-3.22/ \
 		http://web.tryc.on.ca/mysql/Downloads/MySQL-3.22/ \
@ -12,7 +11,7 @@ MASTER_SITES=	http://www.mysql.org/Downloads/MySQL-3.22/ \
 		http://www.mysql.net/Downloads/MySQL-3.22/ \
 		http://www.gina.net/mysql/Downloads/MySQL-3.22/ \
 		http://mysql.pingzero.net/Downloads/MySQL-3.22/ \
-		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/
+		ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ 

 MAINTAINER=	ports@openbsd.org

@ -20,32 +19,59 @@ MAINTAINER=	ports@openbsd.org
 BROKEN=		"pthreads are currently not working SPARC"
 .endif

+DB_DIR?=	/var/mysql
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir="/var/db/mysql" \
+CONFIGURE_ARGS=	--localstatedir="${DB_DIR}" \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench \
-		--without-mit-threads
+		--without-mit-threads \
+		--with-unix-socket-path="${DB_DIR}/mysql.sock"

 DOCS=	manual.html manual.ps manual_toc.html manual.txt

+pre-build:      
+	@echo ""
+	@echo "*** WARNING: you may see an error such as"
+	@echo "***       virtual memory exhausted"
+	@echo "*** when building this package.  If you do you must increase"
+	@echo "*** your limits.  See the man page for your shell and look"
+	@echo "*** for the 'limit' or 'ulimit' command."
+	@echo ""
+
 pre-install:
 	@sed -e "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/startup.sh > ${WRKDIR}/startup.sh
 .if !defined(PACKAGE_BUILDING)
-	@env ${MAKE_ENV} perl ${SCRIPTDIR}/check_old_version
+.if exists(${DB_DIR}) && !defined(OVERWRITE_DB)
+	@echo "You appear to already have a mysql database directory in ${DB_DIR}."
+	@echo ""
+	@echo "In order to preserve your existing data, you should:"
+	@echo "		- dump all your databases"
+	@echo "		- kill mysql if it is running"
+	@echo "		- delete the ${DB_DIR} directory"
+	@echo "		- run 'make install'"
+	@echo "		- start up mysql"
+	@echo "		- re-create all of your database"
+	@echo "		- re-load your data"
+	@echo ""
+	@echo "If you understand the consequences of this upgrade, please re-build this"
+	@echo "port with the environment variable OVERWRITE_DB defined."
+	@false
+.endif
+	@PKG_PREFIX="${PREFIX}" PKG_DB_DIR="${DB_DIR}" sh ${PKGDIR}/INSTALL ${DISTNAME} PRE-INSTALL
 .endif

 post-install:
 	@mkdir -p ${PREFIX}/share/doc/mysql
+	@mkdir -p ${PREFIX}/share/doc/mysql/Img
 	@mkdir -p ${PREFIX}/share/mysql/mysql
-.if !defined(PACKAGE_BUILDING)
-	${PREFIX}/bin/mysql_install_db
-.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/startup.sh ${PREFIX}/lib/mysql
 .for doc in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/Docs/Img/*.gif ${PREFIX}/share/doc/mysql/Img
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 	@${LDCONFIG} -m ${PREFIX}/lib/mysql

--- a/databases/mysql/files/md5
+++ b/databases/mysql/files/md5
@ -1,3 +1,3 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
-RMD160 (mysql-3.22.22.tar.gz) = 6d53ca782160872a06643510dbcead1dbebb9c26
-SHA1 (mysql-3.22.22.tar.gz) = ecdfc46b952c6459bca99c4b96f69a2042a971af
+MD5 (mysql-3.22.27.tar.gz) = 385bee829a157b0a50e61402fc859035
+RMD160 (mysql-3.22.27.tar.gz) = 8f0b940402e7ca747860cc39a272a28e5db2ed45
+SHA1 (mysql-3.22.27.tar.gz) = fb617d2159c0ed28b39765f6acf3ba3abf8608e6
--- a/databases/mysql/files/startup.sh
+++ b/databases/mysql/files/startup.sh
@ -7,5 +7,5 @@ if [ -x /sbin/ldconfig ]; then
 fi

 if [ -x ${PREFIX}/bin/safe_mysqld ]; then
- ${PREFIX}/bin/safe_mysqld > /dev/null & && echo -n ' mysql'
+ ${PREFIX}/bin/safe_mysqld --user="mysql" > /dev/null & && echo -n ' mysql'
 fi
--- a/databases/mysql/patches/patch-aa
+++ b/databases/mysql/patches/patch-aa
@ -1,6 +1,6 @@
--- scripts/Makefile.in.orig	Wed Apr 28 21:27:04 1999
-+++ scripts/Makefile.in	Tue May 11 16:30:28 1999
-@@ -315,6 +315,7 @@
+--- scripts/Makefile.in.orig	Sun Dec 19 01:10:30 1999
+++ scripts/Makefile.in	Sun Dec 19 01:10:55 1999
+@@ -316,6 +316,7 @@
 	  -e 's!@''datadir''@!$(datadir)!g' \
 	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
 	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
--- a/databases/mysql/patches/patch-ab
+++ b/databases/mysql/patches/patch-ab
@ -1,6 +1,6 @@
--- sql/Makefile.in.orig	Wed Dec  1 19:37:03 1999
-+++ sql/Makefile.in	Wed Dec  1 19:40:08 1999
-@@ -1118,7 +1118,7 @@
+--- sql/Makefile.in.orig	Sun Dec 19 01:11:33 1999
+++ sql/Makefile.in	Sun Dec 19 01:11:52 1999
+@@ -1117,7 +1117,7 @@
 #	$(CXXCOMPILE) $(LM_CFLAGS) $< $(mysqld_LDADD)
 
 sql_yacc.o:	sql_yacc.cc sql_yacc.h
--- a/databases/mysql/patches/patch-ac
+++ b/databases/mysql/patches/patch-ac
@ -0,0 +1,48 @@
+--- scripts/mysql_install_db.sh.orig	Sun Dec 19 01:16:27 1999
+++ scripts/mysql_install_db.sh	Sun Dec 19 01:33:38 1999
+@@ -15,10 +15,6 @@
+ force=0
+ IN_RPM=0
+ 
+-# Are we doing an rpm install?
+-if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
+-if test "$1" = "--force"; then force=1; shift; fi
+-
+ # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
+ if test -w /
+ then
+@@ -49,21 +45,11 @@
+ 
+ if test ! -x $execdir/mysqld
+ then
+-  if test "$IN_RPM" -eq 1
+-  then
+-    echo "FATAL ERROR $execdir/mysqld not found!"
+-    exit 1
+-  else
+     echo "Didn't find $execdir/mysqld"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
+-  fi
+ fi
+ 
+-# On IRIX hostname is in /usr/bsd so add this to the path
+-PATH=$PATH:/usr/bsd
+-hostname=`hostname`		# Install this too in the user table
+-
+ # Check if hostname is valid
+ if test "$IN_RPM" -eq 0 -a $force -eq 0
+ then
+@@ -255,12 +241,6 @@
+ END_OF_DATA
+ then
+   echo ""
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+-    echo "to the right place for your system"
+-    echo
+-  fi
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+   echo "This is done with:"
+   echo "$bindir/mysqladmin -u root password 'new-password'"
--- a/databases/mysql/patches/patch-af
+++ b/databases/mysql/patches/patch-af
@ -1,5 +1,5 @@
--- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Sun Dec 19 01:26:59 1999
+++ scripts/safe_mysqld.sh	Sun Dec 19 01:29:21 1999
@@ -12,33 +12,9 @@
 
 trap '' 1 2 3 15			# we shouldn't let anyone kill us
@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# 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=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  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 "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
-    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@ -37,18 +37,18 @@
 
 pid_file=$DATADIR/`@HOSTNAME@`.pid
 log=$DATADIR/`@HOSTNAME@`.log
-@@ -114,33 +90,6 @@
+@@ -117,33 +93,6 @@
   if test ! -f $pid_file		# This is removed if normal shutdown
   then
     break;
 -  fi
 -  if @IS_LINUX@
 -  then
-    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # 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.
+-    # kill -9 is used or the process 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 $err_log
 -    I=1
@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
--- a/databases/mysql/patches/patch-ag
+++ b/databases/mysql/patches/patch-ag
@ -1,8 +1,8 @@
--- configure.orig	Wed Apr 28 21:03:38 1999
-+++ configure	Wed Dec  1 19:22:50 1999
-@@ -2199,30 +2199,7 @@
+--- configure.orig	Sun Dec 19 01:20:50 1999
+++ configure	Sun Dec 19 01:23:37 1999
+@@ -2865,30 +2865,7 @@
 echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2201: checking "how to check if pid exists"" >&5
+ echo "configure:2867: checking "how to check if pid exists"" >&5
 PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@ -32,7 +32,7 @@
 echo "$ac_t"""$FIND_PROC"" 1>&6
 
 # Check if a pid is valid
-@@ -3704,8 +3681,6 @@
+@@ -4569,8 +4546,6 @@
 #define $ac_tr_lib 1
 EOF
 
@ -41,18 +41,32 @@
 else
   echo "$ac_t""no" 1>&6
 fi
-@@ -3959,14 +3934,6 @@
- else
-   CFLAGS="$CFLAGS -DDBUG_OFF"
-   CXXFLAGS="$CXXFLAGS -DDBUG_OFF"
-  if test "$ac_cv_prog_gcc" = "yes"
-  then
-    CFLAGS="-O6 $CFLAGS"
-    CXXFLAGS="-O $CXXFLAGS"	# Should be -O3 with gcc or g++
-  else
-    CFLAGS="-O $CFLAGS"
-    CXXFLAGS="-O $CXXFLAGS"
-  fi
+@@ -4804,28 +4779,6 @@
 fi
 
- # Force static compilation to avoid linking probles/get more speed
+ 
+-# Build optimized or debug version ?
+-# First check for gcc and g++
+-if test "$ac_cv_prog_gcc" = "yes"
+-then
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC="-O"
+-  OPTIMIZE_CFLAGS="-O6"
+-else
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC=""
+-  OPTIMIZE_CFLAGS="-O"
+-fi
+-if test "$ac_cv_prog_cxx_g" = "yes"
+-then
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX="-O"
+-  OPTIMIZE_CXXFLAGS="-O3"
+-else
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX=""
+-  OPTIMIZE_CXXFLAGS="-O"
+-fi
+ # Check whether --with-debug or --without-debug was given.
+ if test "${with_debug+set}" = set; then
+   withval="$with_debug"
--- a/databases/mysql/pkg/DEINSTALL
+++ b/databases/mysql/pkg/DEINSTALL
@ -0,0 +1,22 @@
+# $OpenBSD: DEINSTALL,v 1.1 2000/01/01 05:54:13 brad Exp $
+#
+# MySQL de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+
+echo
+echo "+---------------"
+echo "| To completely deinstall the $1 package you need to perform"
+echo "| these steps as root:"
+echo "|"
+echo "|           rmuser mysql"
+echo "|           rmgroup mysql"
+echo "|"
+echo "| Do not do this if you plan on re-installing $1"
+echo "| at some future time."
+echo "+---------------"
+echo
+
+exit 0
--- a/databases/mysql/pkg/INSTALL
+++ b/databases/mysql/pkg/INSTALL
@ -0,0 +1,70 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/01/01 05:54:13 brad Exp $
+#
+# Pre/post-installation setup of MySQL
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+DB_DIR=${PKG_DB_DIR:-/var/mysql
+MYSQLGID=40
+MYSQLUID=40
+PASS=`dd if=/dev/urandom count=1 bs=12 2> /dev/null | encrypt -b 6`
+
+# Function: install the MySQL user account and group
+#	    and create the MySQL database directory
+#
+do_pre_install()
+{
+# Add group 'mysql' to /etc/group
+line=`egrep '^mysql:' /etc/group`
+if [ "$line" = "" ]; then
+      	echo "===> Creating mysql group, gid $MYSQLGID"
+        echo "mysql:*:${MYSQLGID}:" >> /etc/group
+fi
+
+# Add user 'mysql' in /etc/passwd
+line=`egrep '^mysql:' /etc/passwd`
+if [ "$line" = "" ]; then
+        echo "===> Creating MySQL user, uid $MYSQLUID"
+	adduser -batch mysql mysql "MySQL Account,,," ${PASS} > /dev/null 2>&1 /dev/null
+	if [ $? -eq 0 ]; then
+		echo "===> Using account mysql for MySQL, uid $MYSQLUID, gid $MYSQLGID"
+		echo "===> Account setup with random password. Use 'passwd mysql' to set a password."
+	else
+		echo "===> Problem creating account mysql"
+		exit 1
+	fi
+fi
+
+# Create Database Directory mode 775
+mkdir -p -m 775 ${DB_DIR}
+chown mysql.mysql ${DB_DIR}
+echo "===> Created ${DB_DIR} directory to store db files and mysql.sock"	
+}
+
+# Function: create inital database
+#
+do_post_install()
+{
+${PREFIX}/bin/mysql_install_db
+}
+
+# Verify/process the command
+#
+case $2 in 
+    PRE-INSTALL)
+	do_pre_install $1
+	;;
+    POST-INSTALL)
+	do_post_install $1
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;  
+esac
+
+exit 0
--- a/databases/mysql/pkg/PLIST
+++ b/databases/mysql/pkg/PLIST
@ -3,6 +3,7 @@ bin/isamchk
 bin/isamlog
 bin/msql2mysql
 bin/mysql
+bin/mysql_find_rows
 bin/mysql_fix_privilege_tables
 bin/mysql_install_db
 bin/mysql_setpermission
@ -37,10 +38,51 @@ lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient.so.6.0
+@exec /sbin/ldconfig -m %D/lib/mysql
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 libexec/mysqld
+share/doc/mysql/Img/australia.gif
+share/doc/mysql/Img/austria.gif
+share/doc/mysql/Img/brazil.gif
+share/doc/mysql/Img/bulgaria.gif
+share/doc/mysql/Img/canada.gif
+share/doc/mysql/Img/chile.gif
+share/doc/mysql/Img/china.gif
+share/doc/mysql/Img/croatia.gif
+share/doc/mysql/Img/czech-republic.gif
+share/doc/mysql/Img/denmark.gif
+share/doc/mysql/Img/estonia.gif
+share/doc/mysql/Img/finland.gif
+share/doc/mysql/Img/france.gif
+share/doc/mysql/Img/germany.gif
+share/doc/mysql/Img/great-britain.gif
+share/doc/mysql/Img/greece.gif
+share/doc/mysql/Img/html-fs.gif
+share/doc/mysql/Img/hungary.gif
+share/doc/mysql/Img/israel.gif
+share/doc/mysql/Img/italy.gif
+share/doc/mysql/Img/japan.gif
+share/doc/mysql/Img/kroatia.gif
+share/doc/mysql/Img/mysql5.gif
+share/doc/mysql/Img/mysql-logo.gif
+share/doc/mysql/Img/netherlands.gif
+share/doc/mysql/Img/poland.gif
+share/doc/mysql/Img/portugal.gif
+share/doc/mysql/Img/romania.gif
+share/doc/mysql/Img/russia.gif
+share/doc/mysql/Img/singapore.gif
+share/doc/mysql/Img/south-africa.gif
+share/doc/mysql/Img/south-africa1.gif
+share/doc/mysql/Img/south-korea.gif
+share/doc/mysql/Img/spain.gif
+share/doc/mysql/Img/sweden.gif
+share/doc/mysql/Img/switzerland.gif
+share/doc/mysql/Img/taiwan.gif
+share/doc/mysql/Img/tcxlogo3.gif
+share/doc/mysql/Img/ukraine.gif
+share/doc/mysql/Img/usa.gif
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.txt
@ -48,14 +90,20 @@ share/doc/mysql/manual_toc.html
 share/mysql/binary-configure
 share/mysql/czech/errmsg.sys
 share/mysql/czech/errmsg.txt
+share/mysql/danish/errmsg.sys
+share/mysql/danish/errmsg.txt
 share/mysql/dutch/errmsg.sys
 share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
+share/mysql/estonia/errmsg.sys
+share/mysql/estonia/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/greek/errmsg.sys
+share/mysql/greek/errmsg.txt
 share/mysql/hungarian/errmsg.sys
 share/mysql/hungarian/errmsg.txt
 share/mysql/italian/errmsg.sys
@ -66,7 +114,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.27.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
@ -87,12 +135,16 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
@dirrm include/mysql
@dirrm lib/mysql
+@dirrm share/doc/mysql/Img
@dirrm share/doc/mysql
@dirrm share/mysql/czech
+@dirrm share/mysql/danish
@dirrm share/mysql/dutch
@dirrm share/mysql/english
+@dirrm share/mysql/estonia
@dirrm share/mysql/french
@dirrm share/mysql/german
+@dirrm share/mysql/greek
@dirrm share/mysql/hungarian
@dirrm share/mysql/italian
@dirrm share/mysql/japanese
@ -107,5 +159,3 @@ share/mysql/swedish/errmsg.txt
@dirrm share/mysql/spanish
@dirrm share/mysql/swedish
@dirrm share/mysql
-@exec %D/bin/mysql_install_db
-@exec /sbin/ldconfig -m %D/lib/mysql
--- a/databases/mysql/pkg/PLIST.noshared
+++ b/databases/mysql/pkg/PLIST.noshared
@ -0,0 +1,159 @@
+bin/comp_err
+bin/isamchk
+bin/isamlog
+bin/msql2mysql
+bin/mysql
+bin/mysql_find_rows
+bin/mysql_fix_privilege_tables
+bin/mysql_install_db
+bin/mysql_setpermission
+bin/mysql_zap
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbug
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlshow
+bin/perror
+bin/replace
+bin/resolveip
+bin/safe_mysqld
+include/mysql/dbug.h
+include/mysql/errmsg.h
+include/mysql/m_ctype.h.in
+include/mysql/m_string.h
+include/mysql/my_list.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/startup.sh
+lib/mysql/libdbug.a
+lib/mysql/libheap.a
+lib/mysql/libmerge.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmystrings.a
+lib/mysql/libmysys.a
+lib/mysql/libnisam.a
+libexec/mysqld
+share/doc/mysql/Img/australia.gif
+share/doc/mysql/Img/austria.gif
+share/doc/mysql/Img/brazil.gif
+share/doc/mysql/Img/bulgaria.gif
+share/doc/mysql/Img/canada.gif
+share/doc/mysql/Img/chile.gif
+share/doc/mysql/Img/china.gif
+share/doc/mysql/Img/croatia.gif
+share/doc/mysql/Img/czech-republic.gif
+share/doc/mysql/Img/denmark.gif
+share/doc/mysql/Img/estonia.gif
+share/doc/mysql/Img/finland.gif
+share/doc/mysql/Img/france.gif
+share/doc/mysql/Img/germany.gif
+share/doc/mysql/Img/great-britain.gif
+share/doc/mysql/Img/greece.gif
+share/doc/mysql/Img/html-fs.gif
+share/doc/mysql/Img/hungary.gif
+share/doc/mysql/Img/israel.gif
+share/doc/mysql/Img/italy.gif
+share/doc/mysql/Img/japan.gif
+share/doc/mysql/Img/kroatia.gif
+share/doc/mysql/Img/mysql5.gif
+share/doc/mysql/Img/mysql-logo.gif
+share/doc/mysql/Img/netherlands.gif
+share/doc/mysql/Img/poland.gif
+share/doc/mysql/Img/portugal.gif
+share/doc/mysql/Img/romania.gif
+share/doc/mysql/Img/russia.gif
+share/doc/mysql/Img/singapore.gif
+share/doc/mysql/Img/south-africa.gif
+share/doc/mysql/Img/south-africa1.gif
+share/doc/mysql/Img/south-korea.gif
+share/doc/mysql/Img/spain.gif
+share/doc/mysql/Img/sweden.gif
+share/doc/mysql/Img/switzerland.gif
+share/doc/mysql/Img/taiwan.gif
+share/doc/mysql/Img/tcxlogo3.gif
+share/doc/mysql/Img/ukraine.gif
+share/doc/mysql/Img/usa.gif
+share/doc/mysql/manual.html
+share/doc/mysql/manual.ps
+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/danish/errmsg.sys
+share/mysql/danish/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
+share/mysql/english/errmsg.sys
+share/mysql/english/errmsg.txt
+share/mysql/estonia/errmsg.sys
+share/mysql/estonia/errmsg.txt
+share/mysql/french/errmsg.sys
+share/mysql/french/errmsg.txt
+share/mysql/german/errmsg.sys
+share/mysql/german/errmsg.txt
+share/mysql/greek/errmsg.sys
+share/mysql/greek/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+share/mysql/hungarian/errmsg.txt
+share/mysql/italian/errmsg.sys
+share/mysql/italian/errmsg.txt
+share/mysql/japanese/errmsg.sys
+share/mysql/japanese/errmsg.txt
+share/mysql/korean/errmsg.sys
+share/mysql/korean/errmsg.txt
+share/mysql/make_binary_distribution
+share/mysql/my-example.cnf
+share/mysql/mysql-3.22.27.spec
+share/mysql/mysql-log-rotate
+share/mysql/mysql.server
+share/mysql/norwegian-ny/errmsg.sys
+share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
+share/mysql/portuguese/errmsg.sys
+share/mysql/portuguese/errmsg.txt
+share/mysql/russian/errmsg.sys
+share/mysql/russian/errmsg.txt
+share/mysql/slovak/errmsg.sys
+share/mysql/slovak/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
+@dirrm include/mysql
+@dirrm lib/mysql
+@dirrm share/doc/mysql/Img
+@dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/danish
+@dirrm share/mysql/dutch
+@dirrm share/mysql/english
+@dirrm share/mysql/estonia
+@dirrm share/mysql/french
+@dirrm share/mysql/german
+@dirrm share/mysql/greek
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
+@dirrm share/mysql/japanese
+@dirrm share/mysql/korean
+@dirrm share/mysql/mysql
+@dirrm share/mysql/norwegian
+@dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
+@dirrm share/mysql/portuguese
+@dirrm share/mysql/russian
+@dirrm share/mysql/slovak
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
+@dirrm share/mysql
--- a/databases/mysql/scripts/check_old_version
+++ b/databases/mysql/scripts/check_old_version
@ -1,28 +0,0 @@
-#!/usr/bin/perl
-#
-# $OpenBSD: check_old_version,v 1.3 1999/12/02 00:44:42 brad Exp $
-# $FreeBSD: check_old_version,v 1.1.1.1 1997/06/18 19:35:30 jfitz Exp $
-#
-
-if( -d "/var/db/mysql" ) {
-	if( ! $ENV{OVERWRITE_DB} ) {
-		print <<END;
-
-You appear to already have a mysql database directory in /var/db/mysql.
-
-In order to preserve your existing data, you should:
-	- dump all your databases
-	- kill mysql if it is running
-	- delete the /var/db/mysql directory
-	- run 'make install'
-	- start up mysql
-	- re-create all of your database
-	- re-load your data
-
-If you understand the consequences of this upgrade, please re-build this
-port with the environment variable OVERWRITE_DB defined.
-
-END
-		exit 1;
-	}
-}