5 files changed, 176 insertions, 204 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index ba26268943c8..e1c0cb7f793a 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.5
+PORTVERSION=	4.1.6
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
@@ -32,6 +32,7 @@ DB_DIR?=	/var/db/mysql
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_RC_SUBR=	yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
@@ -60,7 +61,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .if defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
@@ -117,7 +118,9 @@ PLIST_SUB=	DB_DIR=${DB_DIR} \
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
 
-DOCS=		manual.html manual.txt manual_toc.html
+.if !defined(NOPORTDOCS)
+PORTDOCS=	manual.html manual.txt manual_toc.html
+.endif
 
 INFO=		mysql
 
@@ -170,14 +173,13 @@ post-install:
 .endif
 	@${SETENV} DB_DIR=${DB_DIR} ${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
+	@${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;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}
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
 .endif
 
 .else
@@ -195,7 +197,7 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 070c5df59655..4dbf48f576cc 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.5-gamma.tar.gz) = 93ad89451363586634679458acd11625
-SIZE (mysql-4.1.5-gamma.tar.gz) = 19436415
+MD5 (mysql-4.1.6-gamma.tar.gz) = 4d57b36e4d5bc68cad89f88222245a1d
+SIZE (mysql-4.1.6-gamma.tar.gz) = 19669475
diff --git a/databases/mysql41-server/files/mysql-server.sh b/databases/mysql41-server/files/mysql-server.sh
index 5180b9c0c1eb..708ad57df4b3 100644
--- a/databases/mysql41-server/files/mysql-server.sh
+++ b/databases/mysql41-server/files/mysql-server.sh
@@ -1,27 +1,51 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-DB_DIR=%%DB_DIR%%
-PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid
-
-case "$1" in
-	start)
-		if [ -x %%PREFIX%%/bin/mysqld_safe ]; then
-			/usr/bin/limits -U mysql \
-			%%PREFIX%%/bin/mysqld_safe --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
+# 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.
+# mysqllimits_enable (bool):	Set to "NO" by default.
+#				Set it to yes to run `limits $limits_args`
+#				just before mysql starts.
+# mysqllimits_args (str):	Default to "-e -U mysql"
+#				Arguments of pre-start limits run.
+#
+
+. %%RC_SUBR%%
+
+name="mysql"
+rcvar=`set_rcvar`
+mysql_dbdir="%%DB_DIR%%"
+mysql_user="mysql"
+pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+command="%%PREFIX%%/bin/mysqld_safe"
+command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+
+[ -z "$mysql_enable" ]		&& mysql_enable="NO"
+[ -z "$mysqllimits_enable" ]	&& mysqllimits_enable="NO"
+[ -z "$mysqllimits_args" ]	&& mysqllimits_args="-e -U ${mysql_user}"
+
+mysql_prestart()
+{
+	if checkyesno mysqllimits_enable; then
+		eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null
+	else
+		return 0
+	fi
+}
+
+required_dirs="${mysql_dbdir}"
+required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index d9b414c536c8..e4cf25bba15a 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -67,178 +67,124 @@ libexec/mysqld
 libexec/ndb_cpcd
 libexec/ndb_mgmd
 libexec/ndbd
-%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.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/costa-rica.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/israel.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.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/slovenia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.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/turkey.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/Description.plist
-share/mysql/Info.plist
-share/mysql/MySQL-shared-compat.spec
-share/mysql/StartupParameters.plist
-share/mysql/postinstall
-share/mysql/preinstall
-share/mysql/charsets/Index.xml
-share/mysql/charsets/README
-share/mysql/charsets/armscii8.xml
-share/mysql/charsets/ascii.xml
-share/mysql/charsets/cp1250.xml
-share/mysql/charsets/cp1251.xml
-share/mysql/charsets/cp1256.xml
-share/mysql/charsets/cp1257.xml
-share/mysql/charsets/cp850.xml
-share/mysql/charsets/cp852.xml
-share/mysql/charsets/cp866.xml
-share/mysql/charsets/dec8.xml
-share/mysql/charsets/geostd8.xml
-share/mysql/charsets/greek.xml
-share/mysql/charsets/hebrew.xml
-share/mysql/charsets/hp8.xml
-share/mysql/charsets/keybcs2.xml
-share/mysql/charsets/koi8r.xml
-share/mysql/charsets/koi8u.xml
-share/mysql/charsets/latin1.xml
-share/mysql/charsets/latin2.xml
-share/mysql/charsets/latin5.xml
-share/mysql/charsets/latin7.xml
-share/mysql/charsets/macce.xml
-share/mysql/charsets/macroman.xml
-share/mysql/charsets/swe7.xml
-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/fill_help_tables.sql
-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-innodb-heavy-4G.cnf
-share/mysql/my-large.cnf
-share/mysql/my-medium.cnf
-share/mysql/my-small.cnf
-share/mysql/mysql-%%VER%%.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/serbian/errmsg.sys
-share/mysql/serbian/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%%/Description.plist
+%%DATADIR%%/Info.plist
+%%DATADIR%%/MySQL-shared-compat.spec
+%%DATADIR%%/StartupParameters.plist
+%%DATADIR%%/postinstall
+%%DATADIR%%/preinstall
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%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%%/fill_help_tables.sql
+%%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-innodb-heavy-4G.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%%/serbian/errmsg.sys
+%%DATADIR%%/serbian/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
 @dirrm include/mysql/ndb/mgmapi
 @dirrm include/mysql/ndb/ndbapi
 @dirrm include/mysql/ndb
 @unexec rmdir %D/include/mysql 2> /dev/null || true
 @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/serbian
-@dirrm share/mysql/slovak
-@dirrm share/mysql/spanish
-@dirrm share/mysql/swedish
-@dirrm share/mysql/ukrainian
-@unexec rmdir %D/share/mysql 2> /dev/null || true
+@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%%/serbian
+@dirrm %%DATADIR%%/slovak
+@dirrm %%DATADIR%%/spanish
+@dirrm %%DATADIR%%/swedish
+@dirrm %%DATADIR%%/ukrainian
+@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
 @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%%
 @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
index 802930b61958..ab0454713675 100644
--- a/databases/mysql41-server/pkg-plist.client
+++ b/databases/mysql41-server/pkg-plist.client
@@ -48,7 +48,7 @@ lib/mysql/libmysqlclient.so.14
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.14
-share/mysql/mysql_fix_privilege_tables.sql
+%%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
-@dirrm share/mysql
+@dirrm %%DATADIR%%