- Use the rcNG script to kill MySQL on deinstallation [1]

- Set the new sequence for finding my.cnf files [2]:
  /etc, ${PREFIX}/etc, ${mysql_dbdir}
  (default to: /etc/my.cnf, /usr/local/etc/my.cnf, /var/db/mysql/my.cnf)

PR:		ports/79166 [1], ports/79597 [2]
Submitted by:	Sergey Prikhodko <sergey@network-asp.biz> [1],
		Vasil Dimov <vd@datamax.bg> [2]

4 files changed, 18 insertions, 3 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index f9c224f7166d..66a269cefc83 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.11
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-4.1
@@ -152,6 +152,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
 .endif
@@ -188,6 +189,7 @@ post-patch:
 	@${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
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
 .endif
diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.sh.in
index e5870bdc1c9a..93bd177f98b3 100644
--- a/databases/mysql41-server/files/mysql-server.sh.in
+++ b/databases/mysql41-server/files/mysql-server.sh.in
@@ -37,7 +37,7 @@ mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
 pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
 command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
+command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
 procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
diff --git a/databases/mysql41-server/files/patch-mysys_default.c b/databases/mysql41-server/files/patch-mysys_default.c
new file mode 100644
index 000000000000..5061f9df6801
--- /dev/null
+++ b/databases/mysql41-server/files/patch-mysys_default.c
@@ -0,0 +1,13 @@
+--- mysys/default.c.orig	Fri Apr  8 10:48:24 2005
++++ mysys/default.c	Fri Apr  8 10:53:25 2005
+@@ -49,9 +49,7 @@
+ "sys:/etc/",
+ #else
+ "/etc/",
+-#endif
+-#ifdef DATADIR
+-DATADIR,
++"%%PREFIX%%/etc/",
+ #endif
+ "",					/* Place for defaults_extra_dir */
+ #if !defined(__WIN__) && !defined(__NETWARE__)
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index cfc92415cc5f..703efc9ba701 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -194,4 +195,3 @@ libexec/mysqld
 @dirrm %%DATADIR%%/swedish
 @dirrm %%DATADIR%%/ukrainian
 @unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
-@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true