Don't hardcode PID file. Instead, give the user the option to set it. The

rc.d script overrides my.cnf directives. Hardcoding the PID can cause a
problem on systems transitioning to MySQL packages from pkgsrc.

9 files changed, 38 insertions, 25 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 03b0b8aa62f..76a8f15616d 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2013/10/01 11:00:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2014/04/14 00:02:49 rodent Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
@@ -23,9 +23,11 @@ EXTRACT_USING=		bsdtar
 # MYSQL_GROUP		group of the database administrator
 # MYSQL_DATADIR		home directory of the database administrator and
 #			location of the databases
+# MYSQL_PIDFILE		process ID file
 MYSQL_USER?=		mysql
 MYSQL_GROUP?=		mysql
 MYSQL_DATADIR?=		${VARBASE}/mysql
+MYSQL_PIDFILE?=		${MYSQL_DATADIR}/${HOST}.pid
 
 PKG_USERS_VARS+=	MYSQL_USER
 PKG_GROUPS_VARS+=	MYSQL_GROUP
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 4a54acadeba..8ec9494f62d 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/03/11 14:34:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:49 rodent Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 PKGREVISION=	1
@@ -55,11 +55,12 @@ RCD_SCRIPTS=		mysqld
 SMF_NAME=		mysql
 SMF_METHODS=		${RCD_SCRIPTS}
 
-FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
-			MYSQL_DATADIR=${MYSQL_DATADIR} \
-			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
-MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
-			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
+FILES_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+=		MYSQL_PIDFILE=${MYSQL_PIDFILE}
+MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
+MESSAGE_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
 BUILD_DIRS=		. man
 
diff --git a/databases/mysql51-server/files/mysqld.sh b/databases/mysql51-server/files/mysqld.sh
index a4b262074bd..d392aed7b0a 100644
--- a/databases/mysql51-server/files/mysqld.sh
+++ b/databases/mysql51-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:49 rodent Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -14,7 +14,7 @@
 #
 #       mysqld_user="mysql"		# user to run mysqld as
 #       mysqld_datadir="/path/to/home"	# path to MySQL database directory
-#
+#	mysqld_pidfile="/path/to/p.pid"	# path to MySQL PID file
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -27,6 +27,7 @@ procname="@PREFIX@/libexec/${name}"
 : ${mysqld_user:=@MYSQL_USER@}
 : ${mysqld_group:=@MYSQL_GROUP@}
 : ${mysqld_datadir:=@MYSQL_DATADIR@}
+: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
 
 extra_commands="initdb"
 initdb_cmd="mysqld_initdb"
@@ -81,19 +82,19 @@ mysqld_start()
 	ulimit -n 4096
 	cd @PREFIX@
 	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
-		   --pid-file=${pidfile} ${mysqld_flags} \
+		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} &
 }
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	run_rc_command "$1"
 else
 	if [ -f /etc/rc.conf ]; then
 		. /etc/rc.conf
 	fi
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	case "$1" in
 	initdb)
 		eval ${initdb_cmd}
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index d05c38cd907..d1ea803147c 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2014/03/31 08:03:22 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2014/04/14 00:02:49 rodent Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
@@ -25,11 +25,13 @@ USE_TOOLS+=		bash gmake perl:run
 # MYSQL_USER		username of the database administrator
 # MYSQL_GROUP		group of the database administrator
 # MYSQL_DATADIR		home directory (location of the databases)
+# MYSQL_PIDFILE		process ID file
 # MYSQL_CHARSET		default character set
 # MYSQL_EXTRA_CHARSET	additional character set to be compiled in
 MYSQL_USER?=		mysql
 MYSQL_GROUP?=		mysql
 MYSQL_DATADIR?=		${VARBASE}/mysql
+MYSQL_PIDFILE?=		${MYSQL_DATADIR}/${HOST}.pid
 MYSQL_CHARSET?=		latin1
 MYSQL_COLLATION?=	latin1_swedish_ci
 MYSQL_EXTRA_CHARSET?=	all
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 1616ec2cdca..3d51976b012 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/03/31 08:03:22 adam Exp $
+# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:50 rodent Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=	mysqs
@@ -50,6 +50,7 @@ SMF_METHODS=		${RCD_SCRIPTS}
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 FILES_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+=		MYSQL_PIDFILE=${MYSQL_PIDFILE}
 MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 MESSAGE_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
diff --git a/databases/mysql55-server/files/mysqld.sh b/databases/mysql55-server/files/mysqld.sh
index 58e29854b95..ce2124c391e 100644
--- a/databases/mysql55-server/files/mysqld.sh
+++ b/databases/mysql55-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1.1.1 2011/04/25 21:12:15 adam Exp $
+# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -14,6 +14,7 @@
 #
 #       mysqld_user="mysql"		# user to run mysqld as
 #       mysqld_datadir="/path/to/home"	# path to MySQL database directory
+#	mysqld_pidfile="/path/to/p.pid"	# path to MySQL PID file
 #
 
 if [ -f /etc/rc.subr ]; then
@@ -27,6 +28,7 @@ procname="@PREFIX@/sbin/${name}"
 : ${mysqld_user:=@MYSQL_USER@}
 : ${mysqld_group:=@MYSQL_GROUP@}
 : ${mysqld_datadir:=@MYSQL_DATADIR@}
+: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
 
 extra_commands="initdb"
 initdb_cmd="mysqld_initdb"
@@ -74,19 +76,19 @@ mysqld_start()
 	ulimit -n 4096
 	cd @PREFIX@
 	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
-		   --pid-file=${pidfile} ${mysqld_flags} \
+		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} &
 }
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	run_rc_command "$1"
 else
 	if [ -f /etc/rc.conf ]; then
 		. /etc/rc.conf
 	fi
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	case "$1" in
 	initdb)
 		eval ${initdb_cmd}
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index b01afdf6a25..e70fba47327 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2014/03/31 10:32:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2014/04/14 00:02:50 rodent Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -25,11 +25,13 @@ USE_TOOLS+=		bash gmake perl:run
 # MYSQL_USER		username of the database administrator
 # MYSQL_GROUP		group of the database administrator
 # MYSQL_DATADIR		home directory (location of the databases)
+# MYSQL_PIDFILE		process ID file
 # MYSQL_CHARSET		default character set
 # MYSQL_EXTRA_CHARSET	additional character set to be compiled in
 MYSQL_USER?=		mysql
 MYSQL_GROUP?=		mysql
 MYSQL_DATADIR?=		${VARBASE}/mysql
+MYSQL_PIDFILE?=		${MYSQL_DATADIR}/${HOST}.pid
 MYSQL_CHARSET?=		latin1
 MYSQL_COLLATION?=	latin1_swedish_ci
 MYSQL_EXTRA_CHARSET?=	all
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index c734bd677a4..0d7c5bc506e 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/03/11 14:34:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2014/04/14 00:02:50 rodent Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=	mysqs
@@ -51,6 +51,7 @@ SMF_METHODS=		${RCD_SCRIPTS}
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 FILES_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+=		MYSQL_PIDFILE=${MYSQL_PIDFILE}
 MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
 MESSAGE_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
diff --git a/databases/mysql56-server/files/mysqld.sh b/databases/mysql56-server/files/mysqld.sh
index 0fe15094f81..2088c5675ea 100644
--- a/databases/mysql56-server/files/mysqld.sh
+++ b/databases/mysql56-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1 2013/02/13 21:00:10 adam Exp $
+# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -14,7 +14,7 @@
 #
 #       mysqld_user="mysql"		# user to run mysqld as
 #       mysqld_datadir="/path/to/home"	# path to MySQL database directory
-#
+#	mysqld_pidfile="/path/to/p.pid"	# path to MySQL PID file
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -27,6 +27,7 @@ procname="@PREFIX@/sbin/${name}"
 : ${mysqld_user:=@MYSQL_USER@}
 : ${mysqld_group:=@MYSQL_GROUP@}
 : ${mysqld_datadir:=@MYSQL_DATADIR@}
+: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
 
 extra_commands="initdb"
 initdb_cmd="mysqld_initdb"
@@ -74,19 +75,19 @@ mysqld_start()
 	ulimit -n 4096
 	cd @PREFIX@
 	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
-		   --pid-file=${pidfile} ${mysqld_flags} \
+		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} &
 }
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	run_rc_command "$1"
 else
 	if [ -f /etc/rc.conf ]; then
 		. /etc/rc.conf
 	fi
-	pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+	pidfile="${mysqld_pidfile}"
 	case "$1" in
 	initdb)
 		eval ${initdb_cmd}