Update to 3.23.59 snapshot:

- Switch to rcNG
- Add the possibility to specify the database directory in rc.conf
- Move database creation from post-install stage into startup script

10 files changed, 194 insertions, 231 deletions

diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 30c923d85c93..6ff8784c0c7f 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	3
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql323-scripts/Makefile b/databases/mysql323-scripts/Makefile
index 52789b347416..c3c60ecc7a29 100644
--- a/databases/mysql323-scripts/Makefile
+++ b/databases/mysql323-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 3b35727fc083..c43f33808ccf 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -6,24 +6,26 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	3.23.58
-PORTREVISION?=	3
+DISTVERSION=	3.23.59-nightly-20050301
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-3.23
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ale
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql323-client
-PKGINSTALL?=	${WRKDIR}/pkg-install
-DB_DIR?=	/var/db/mysql
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 
+.if ${PKGNAMESUFFIX} == "-server"
+USE_RC_SUBR=	mysql-server.sh
+.endif
+
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
+CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench \
@@ -94,13 +96,15 @@ LATEST_LINK=	mysql323-server
 
 CONFLICTS=	mysql-server-4.* mysql-server-5.*
 
-PLIST_SUB=	DB_DIR=${DB_DIR} \
-		MYSQL_VERSION=${PORTVERSION}
+PLIST_SUB=	VER=${DISTVERSION}
 
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		safe_mysqld.1 perror.1 replace.1
 
+.if !defined(NOPORTDOCS)
 DOCS=		manual.html manual.txt manual_toc.html
+PORTDOCS=	${DOCS} Flags
+.endif
 
 INFO=		mysql
 
@@ -111,12 +115,9 @@ pre-fetch:
 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
 	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
-	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
-	@${ECHO} "				(default is /var/db/mysql)."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
 	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
 	@${ECHO} "				(try it if you use libpthread)."
-	@${ECHO} "	OVERWRITE_DB=yes	Re-initialize default databases."
 	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
 	@${ECHO} "				(use it if you need speed)."
 	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
@@ -128,26 +129,15 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/libmysqld/lib_sql.cc ${WRKSRC}/sql/mysqld.cc
 .endif
 
-post-build:
-	@${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install
-
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no"
-	@${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true
-.endif
-.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
-	${PREFIX}/bin/mysql_install_db --ldata=${DB_DIR}
-.endif
-	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
-	@${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/Flags
 .for doc in ${DOCS}
diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index 48c00112bff5..7656c998860a 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-3.23.58.tar.gz) = 835a96c86132fbde0db36db60c5b34cd
-SIZE (mysql-3.23.58.tar.gz) = 12039843
+MD5 (mysql-3.23.59-nightly-20050301.tar.gz) = 042bf35b190c442dda810d9674e7c9a6
+SIZE (mysql-3.23.59-nightly-20050301.tar.gz) = 14267767
diff --git a/databases/mysql323-server/files/mysql-server.sh b/databases/mysql323-server/files/mysql-server.sh
deleted file mode 100644
index 6a5acb39a962..000000000000
--- a/databases/mysql323-server/files/mysql-server.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-DB_DIR=%%DB_DIR%%
-PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid
-
-case "$1" in
-	start)
-		if [ -x %%PREFIX%%/bin/safe_mysqld ]; then
-			/usr/bin/limits -U mysql \
-			%%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null &
-			echo -n ' mysqld'
-		fi
-		;;
-	stop)
-		if [ -f ${PIDFILE} ]; then
-			/bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld'
-		else
-			echo "mysql-server isn't running"
-		fi
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/databases/mysql323-server/files/mysql-server.sh.in b/databases/mysql323-server/files/mysql-server.sh.in
new file mode 100644
index 000000000000..d13f1af14de0
--- /dev/null
+++ b/databases/mysql323-server/files/mysql-server.sh.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: mysql
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MySQL.
+# mysql_limits (bool):	Set to "NO" by default.
+#			Set it to yes to run `limits -e -U mysql`
+#			just before mysql starts.
+# mysql_dbdir (str):	Default to "/var/db/mysql"
+#			Base database directory.
+#
+
+. %%RC_SUBR%%
+
+name="mysql"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_limits="NO"}
+: ${mysql_dbdir="/var/db/mysql"}
+
+mysql_user="mysql"
+mysql_limits_args="-e -U ${mysql_user}"
+pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+command="%%PREFIX%%/bin/safe_mysqld"
+command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--ldata=${mysql_dbdir}"
+
+mysql_create_auth_tables()
+{
+	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>&1
+        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	if checkyesno mysql_limits; then
+		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+	else
+		return 0
+	fi
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql323-server/files/patch-man::Makefile.in b/databases/mysql323-server/files/patch-man::Makefile.in
index ce45c659d000..9ce6d7e4a837 100644
--- a/databases/mysql323-server/files/patch-man::Makefile.in
+++ b/databases/mysql323-server/files/patch-man::Makefile.in
@@ -1,13 +1,13 @@
---- man/Makefile.in.orig	Thu Sep 11 13:49:30 2003
-+++ man/Makefile.in	Sun Feb 29 12:05:54 2004
-@@ -188,9 +188,7 @@
+--- man/Makefile.in.orig	Tue Mar  1 05:31:24 2005
++++ man/Makefile.in	Tue Mar 15 12:55:49 2005
+@@ -266,9 +266,7 @@
+ target_vendor = @target_vendor@
  thread_dirs = @thread_dirs@
  uname_prog = @uname_prog@
- 
 -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
 -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 -		perror.1 replace.1 safe_mysqld.1
 +man_MANS =
  
- 
  EXTRA_DIST = $(man_MANS)
+ all: all-am
diff --git a/databases/mysql323-server/files/patch-scripts::Makefile.in b/databases/mysql323-server/files/patch-scripts::Makefile.in
index 8e18b201ea5b..567359e28571 100644
--- a/databases/mysql323-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql323-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Thu Sep 11 13:49:32 2003
-+++ scripts/Makefile.in	Sun Feb 29 12:11:38 2004
-@@ -187,19 +187,7 @@
+--- scripts/Makefile.in.orig	Tue Mar  1 05:31:27 2005
++++ scripts/Makefile.in	Tue Mar 15 12:58:38 2005
+@@ -268,20 +268,7 @@
+ target_vendor = @target_vendor@
  thread_dirs = @thread_dirs@
  uname_prog = @uname_prog@
- 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -16,12 +16,13 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi
+-			mysqld_multi \
+-			make_win_src_distribution
 +bin_SCRIPTS =
  
- 
  EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -353,7 +341,7 @@
+ 			make_win_src_distribution.sh \
+@@ -451,7 +438,7 @@
  uninstall: uninstall-am
  
  install-am: all-am
diff --git a/databases/mysql323-server/pkg-install b/databases/mysql323-server/pkg-install
index 88a0b1c66915..586f846c5031 100644
--- a/databases/mysql323-server/pkg-install
+++ b/databases/mysql323-server/pkg-install
@@ -8,7 +8,6 @@ POST-INSTALL)
 	GROUP=${USER}
 	UID=88
 	GID=${UID}
-	DB_DIR=%%DB_DIR%%
 
 	if pw group show "${GROUP}" 2>/dev/null; then
 		echo "You already have a group \"${GROUP}\", so I will use it."
@@ -23,16 +22,9 @@ POST-INSTALL)
 
 	if pw user show "${USER}" 2>/dev/null; then
 		echo "You already have a user \"${USER}\", so I will use it."
-		if pw usermod ${USER} -d ${DB_DIR}
-		then
-			echo "Changed home directory of \"${USER}\" to \"${DB_DIR}\""
-		else
-			echo "Changing home directory of \"${USER}\" to \"${DB_DIR}\" failed..."
-			exit 1
-		fi
 	else
 		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d ${DB_DIR} -s /sbin/nologin -c "MySQL Daemon"
+			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
 		then
 			echo "Added user \"${USER}\"."
 		else
@@ -40,7 +32,5 @@ POST-INSTALL)
 			exit 1
 		fi
 	fi
-
-	chown -R ${USER}:${GROUP} ${DB_DIR}
 	;;
 esac
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 695b3f197fdc..2c2a2663babe 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -12,7 +12,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 bin/safe_mysqld
-etc/rc.d/mysql-server.sh
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -22,156 +21,107 @@ lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 libexec/mysqld
-%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/island.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/kroatia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa1.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
-share/mysql/binary-configure
-share/mysql/charsets/Index
-share/mysql/charsets/README
-share/mysql/charsets/cp1251.conf
-share/mysql/charsets/cp1257.conf
-share/mysql/charsets/croat.conf
-share/mysql/charsets/danish.conf
-share/mysql/charsets/dec8.conf
-share/mysql/charsets/dos.conf
-share/mysql/charsets/estonia.conf
-share/mysql/charsets/german1.conf
-share/mysql/charsets/greek.conf
-share/mysql/charsets/hebrew.conf
-share/mysql/charsets/hp8.conf
-share/mysql/charsets/hungarian.conf
-share/mysql/charsets/koi8_ru.conf
-share/mysql/charsets/koi8_ukr.conf
-share/mysql/charsets/latin1.conf
-share/mysql/charsets/latin2.conf
-share/mysql/charsets/latin5.conf
-share/mysql/charsets/swe7.conf
-share/mysql/charsets/usa7.conf
-share/mysql/charsets/win1250.conf
-share/mysql/charsets/win1251.conf
-share/mysql/charsets/win1251ukr.conf
-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/estonian/errmsg.sys
-share/mysql/estonian/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/mi_test_all
-share/mysql/mi_test_all.res
-share/mysql/my-huge.cnf
-share/mysql/my-large.cnf
-share/mysql/my-medium.cnf
-share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.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/romanian/errmsg.sys
-share/mysql/romanian/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
-share/mysql/ukrainian/errmsg.sys
-share/mysql/ukrainian/errmsg.txt
+%%DATADIR%%/binary-configure
+%%DATADIR%%/charsets/Index
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/cp1251.conf
+%%DATADIR%%/charsets/cp1257.conf
+%%DATADIR%%/charsets/croat.conf
+%%DATADIR%%/charsets/danish.conf
+%%DATADIR%%/charsets/dec8.conf
+%%DATADIR%%/charsets/dos.conf
+%%DATADIR%%/charsets/estonia.conf
+%%DATADIR%%/charsets/german1.conf
+%%DATADIR%%/charsets/greek.conf
+%%DATADIR%%/charsets/hebrew.conf
+%%DATADIR%%/charsets/hp8.conf
+%%DATADIR%%/charsets/hungarian.conf
+%%DATADIR%%/charsets/koi8_ru.conf
+%%DATADIR%%/charsets/koi8_ukr.conf
+%%DATADIR%%/charsets/latin1.conf
+%%DATADIR%%/charsets/latin2.conf
+%%DATADIR%%/charsets/latin5.conf
+%%DATADIR%%/charsets/swe7.conf
+%%DATADIR%%/charsets/usa7.conf
+%%DATADIR%%/charsets/win1250.conf
+%%DATADIR%%/charsets/win1251.conf
+%%DATADIR%%/charsets/win1251ukr.conf
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/czech/errmsg.txt
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/danish/errmsg.txt
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/dutch/errmsg.txt
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/english/errmsg.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/estonian/errmsg.txt
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/french/errmsg.txt
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/german/errmsg.txt
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/greek/errmsg.txt
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.txt
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/italian/errmsg.txt
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/japanese/errmsg.txt
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/korean/errmsg.txt
+%%DATADIR%%/mi_test_all
+%%DATADIR%%/mi_test_all.res
+%%DATADIR%%/my-huge.cnf
+%%DATADIR%%/my-large.cnf
+%%DATADIR%%/my-medium.cnf
+%%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql-%%VER%%.spec
+%%DATADIR%%/mysql-log-rotate
+%%DATADIR%%/mysql.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian-ny/errmsg.txt
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.txt
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/polish/errmsg.txt
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.txt
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/romanian/errmsg.txt
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/russian/errmsg.txt
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/slovak/errmsg.txt
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/spanish/errmsg.txt
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.txt
+%%DATADIR%%/ukrainian/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.txt
 @unexec rmdir %D/lib/mysql 2> /dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/mysql/charsets
-@dirrm share/mysql/czech
-@dirrm share/mysql/danish
-@dirrm share/mysql/dutch
-@dirrm share/mysql/english
-@dirrm share/mysql/estonian
-@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/norwegian
-@dirrm share/mysql/norwegian-ny
-@dirrm share/mysql/polish
-@dirrm share/mysql/portuguese
-@dirrm share/mysql/romanian
-@dirrm share/mysql/russian
-@dirrm share/mysql/slovak
-@dirrm share/mysql/spanish
-@dirrm share/mysql/swedish
-@dirrm share/mysql/ukrainian
-@dirrm share/mysql
-@exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%%
+@dirrm %%DATADIR%%/charsets
+@dirrm %%DATADIR%%/czech
+@dirrm %%DATADIR%%/danish
+@dirrm %%DATADIR%%/dutch
+@dirrm %%DATADIR%%/english
+@dirrm %%DATADIR%%/estonian
+@dirrm %%DATADIR%%/french
+@dirrm %%DATADIR%%/german
+@dirrm %%DATADIR%%/greek
+@dirrm %%DATADIR%%/hungarian
+@dirrm %%DATADIR%%/italian
+@dirrm %%DATADIR%%/japanese
+@dirrm %%DATADIR%%/korean
+@dirrm %%DATADIR%%/norwegian
+@dirrm %%DATADIR%%/norwegian-ny
+@dirrm %%DATADIR%%/polish
+@dirrm %%DATADIR%%/portuguese
+@dirrm %%DATADIR%%/romanian
+@dirrm %%DATADIR%%/russian
+@dirrm %%DATADIR%%/slovak
+@dirrm %%DATADIR%%/spanish
+@dirrm %%DATADIR%%/swedish
+@dirrm %%DATADIR%%/ukrainian
+@dirrm %%DATADIR%%
 @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true