Mon Apr 14 00:02:50 2014 UTC ()
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.


(rodent)
diff -r1.30 -r1.31 pkgsrc/databases/mysql51-client/Makefile.common
diff -r1.20 -r1.21 pkgsrc/databases/mysql51-server/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/files/mysqld.sh
diff -r1.35 -r1.36 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.20 -r1.21 pkgsrc/databases/mysql55-server/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql55-server/files/mysqld.sh
diff -r1.14 -r1.15 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.14 -r1.15 pkgsrc/databases/mysql56-server/Makefile
diff -r1.1 -r1.2 pkgsrc/databases/mysql56-server/files/mysqld.sh
cvs diff -r1.30 -r1.31 pkgsrc/databases/mysql51-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile.common 2013/10/01 11:00:39 1.30
+++ pkgsrc/databases/mysql51-client/Attic/Makefile.common 2014/04/14 00:02:49 1.31
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1# $NetBSD: Makefile.common,v 1.30 2013/10/01 11:00:39 adam Exp $ 1# $NetBSD: Makefile.common,v 1.31 2014/04/14 00:02:49 rodent Exp $
2# 2#
3# used by databases/mysql51-client/Makefile 3# used by databases/mysql51-client/Makefile
4# used by databases/mysql51-server/Makefile 4# used by databases/mysql51-server/Makefile
5 5
6DISTNAME= mysql-5.1.72 6DISTNAME= mysql-5.1.72
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18.include "options.mk" 18.include "options.mk"
19 19
20EXTRACT_USING= bsdtar 20EXTRACT_USING= bsdtar
21 21
22# MYSQL_USER username of the database administrator 22# MYSQL_USER username of the database administrator
23# MYSQL_GROUP group of the database administrator 23# MYSQL_GROUP group of the database administrator
24# MYSQL_DATADIR home directory of the database administrator and 24# MYSQL_DATADIR home directory of the database administrator and
25# location of the databases 25# location of the databases
 26# MYSQL_PIDFILE process ID file
26MYSQL_USER?= mysql 27MYSQL_USER?= mysql
27MYSQL_GROUP?= mysql 28MYSQL_GROUP?= mysql
28MYSQL_DATADIR?= ${VARBASE}/mysql 29MYSQL_DATADIR?= ${VARBASE}/mysql
 30MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
29 31
30PKG_USERS_VARS+= MYSQL_USER 32PKG_USERS_VARS+= MYSQL_USER
31PKG_GROUPS_VARS+= MYSQL_GROUP 33PKG_GROUPS_VARS+= MYSQL_GROUP
32 34
33# MYSQL_CHARSET default character set 35# MYSQL_CHARSET default character set
34# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 36# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
35MYSQL_CHARSET?= latin1 37MYSQL_CHARSET?= latin1
36MYSQL_EXTRA_CHARSET?= all 38MYSQL_EXTRA_CHARSET?= all
37 39
38CONFIGURE_ARGS+= --enable-thread-safe-client 40CONFIGURE_ARGS+= --enable-thread-safe-client
39CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} 41CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
40CONFIGURE_ARGS+= --without-libwrap 42CONFIGURE_ARGS+= --without-libwrap
41CONFIG_SHELL= ${TOOLS_PATH.bash} 43CONFIG_SHELL= ${TOOLS_PATH.bash}
cvs diff -r1.20 -r1.21 pkgsrc/databases/mysql51-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/Makefile 2014/03/11 14:34:36 1.20
+++ pkgsrc/databases/mysql51-server/Attic/Makefile 2014/04/14 00:02:49 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2014/03/11 14:34:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:49 rodent Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 1 4PKGREVISION= 1
5SVR4_PKGNAME= mysqs 5SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 6COMMENT= MySQL 5, a free SQL database (server)
7 7
8CONFLICTS= mysql3-server-[0-9]* 8CONFLICTS= mysql3-server-[0-9]*
9 9
10.include "../../databases/mysql51-client/Makefile.common" 10.include "../../databases/mysql51-client/Makefile.common"
11 11
12CONFIGURE_ARGS+= --with-libwrap 12CONFIGURE_ARGS+= --with-libwrap
13CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} 13CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER}
14 14
@@ -45,31 +45,32 @@ PTHREAD_OPTS+= require @@ -45,31 +45,32 @@ PTHREAD_OPTS+= require
45CONFIGURE_ARGS+= --with-pthread 45CONFIGURE_ARGS+= --with-pthread
46 46
47PKG_GROUPS= ${MYSQL_GROUP} 47PKG_GROUPS= ${MYSQL_GROUP}
48PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} 48PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
49 49
50PKG_GECOS.${MYSQL_USER}= MySQL database administrator 50PKG_GECOS.${MYSQL_USER}= MySQL database administrator
51PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} 51PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
52PKG_SHELL.${MYSQL_USER}= ${SH} 52PKG_SHELL.${MYSQL_USER}= ${SH}
53 53
54RCD_SCRIPTS= mysqld 54RCD_SCRIPTS= mysqld
55SMF_NAME= mysql 55SMF_NAME= mysql
56SMF_METHODS= ${RCD_SCRIPTS} 56SMF_METHODS= ${RCD_SCRIPTS}
57 57
58FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ 58FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
59 MYSQL_DATADIR=${MYSQL_DATADIR} \ 59FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
60 MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 60FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
61MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ 61FILES_SUBST+= MYSQL_PIDFILE=${MYSQL_PIDFILE}
62 MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 62MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
 63MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
63BUILD_DEFS+= MYSQL_DATADIR 64BUILD_DEFS+= MYSQL_DATADIR
64BUILD_DIRS= . man 65BUILD_DIRS= . man
65 66
66REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl \ 67REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl \
67 mysql-test/lib/v1/mysql-test-run.pl \ 68 mysql-test/lib/v1/mysql-test-run.pl \
68 mysql-test/mysql-stress-test.pl \ 69 mysql-test/mysql-stress-test.pl \
69 mysql-test/mysql-test-run.pl \ 70 mysql-test/mysql-test-run.pl \
70 mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl \ 71 mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl \
71 mysql-test/suite/funcs_1/lib/DataGen_local.pl \ 72 mysql-test/suite/funcs_1/lib/DataGen_local.pl \
72 mysql-test/suite/funcs_1/lib/DataGen_modify.pl \ 73 mysql-test/suite/funcs_1/lib/DataGen_modify.pl \
73 mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \ 74 mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
74 mysql-test/mtr \ 75 mysql-test/mtr \
75 scripts/mysqld_multi.sh 76 scripts/mysqld_multi.sh
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/files/Attic/mysqld.sh (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/files/Attic/mysqld.sh 2010/03/04 16:28:58 1.1.1.1
+++ pkgsrc/databases/mysql51-server/files/Attic/mysqld.sh 2014/04/14 00:02:49 1.2
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: mysqld.sh,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ 3# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:49 rodent Exp $
4# 4#
5# PROVIDE: mysqld 5# PROVIDE: mysqld
6# REQUIRE: DAEMON LOGIN mountall 6# REQUIRE: DAEMON LOGIN mountall
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8# 8#
9# You will need to set some variables in /etc/rc.conf to start MySQL: 9# You will need to set some variables in /etc/rc.conf to start MySQL:
10# 10#
11# mysqld=YES 11# mysqld=YES
12# 12#
13# The following variables are optional: 13# The following variables are optional:
14# 14#
15# mysqld_user="mysql" # user to run mysqld as 15# mysqld_user="mysql" # user to run mysqld as
16# mysqld_datadir="/path/to/home" # path to MySQL database directory 16# mysqld_datadir="/path/to/home" # path to MySQL database directory
17# 17# mysqld_pidfile="/path/to/p.pid" # path to MySQL PID file
18 18
19if [ -f /etc/rc.subr ]; then 19if [ -f /etc/rc.subr ]; then
20 . /etc/rc.subr 20 . /etc/rc.subr
21fi 21fi
22 22
23name="mysqld" 23name="mysqld"
24rcvar=${name} 24rcvar=${name}
25command="@PREFIX@/bin/mysqld_safe" 25command="@PREFIX@/bin/mysqld_safe"
26procname="@PREFIX@/libexec/${name}" 26procname="@PREFIX@/libexec/${name}"
27: ${mysqld_user:=@MYSQL_USER@} 27: ${mysqld_user:=@MYSQL_USER@}
28: ${mysqld_group:=@MYSQL_GROUP@} 28: ${mysqld_group:=@MYSQL_GROUP@}
29: ${mysqld_datadir:=@MYSQL_DATADIR@} 29: ${mysqld_datadir:=@MYSQL_DATADIR@}
 30: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
30 31
31extra_commands="initdb" 32extra_commands="initdb"
32initdb_cmd="mysqld_initdb" 33initdb_cmd="mysqld_initdb"
33start_precmd="mysqld_precmd" 34start_precmd="mysqld_precmd"
34start_cmd="mysqld_start" 35start_cmd="mysqld_start"
35 36
36# Don't drop thread priority unless on Linux or SunOS 37# Don't drop thread priority unless on Linux or SunOS
37# ref. http://bugs.mysql.com/bug.php?id=18526 38# ref. http://bugs.mysql.com/bug.php?id=18526
38case $(uname -s) in 39case $(uname -s) in
39 Linux|SunOS) thread_flags="";; 40 Linux|SunOS) thread_flags="";;
40 *) thread_flags="--skip-thread-priority" 41 *) thread_flags="--skip-thread-priority"
41esac 42esac
42 43
@@ -71,39 +72,39 @@ mysqld_start() @@ -71,39 +72,39 @@ mysqld_start()
71{ 72{
72 for f in $required_files; do 73 for f in $required_files; do
73 if [ ! -r "$f" ]; then 74 if [ ! -r "$f" ]; then
74 @ECHO@ 1>&2 "$0: WARNING: $f is not readable" 75 @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
75 if [ -z $rc_force ]; then 76 if [ -z $rc_force ]; then
76 return 1 77 return 1
77 fi 78 fi
78 fi 79 fi
79 done 80 done
80 @ECHO@ "Starting ${name}." 81 @ECHO@ "Starting ${name}."
81 ulimit -n 4096 82 ulimit -n 4096
82 cd @PREFIX@ 83 cd @PREFIX@
83 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \ 84 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
84 --pid-file=${pidfile} ${mysqld_flags} \ 85 --pid-file=${mysqld_pidfile} ${mysqld_flags} \
85 ${thread_flags} & 86 ${thread_flags} &
86} 87}
87 88
88if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then 89if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
89 load_rc_config $name 90 load_rc_config $name
90 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 91 pidfile="${mysqld_pidfile}"
91 run_rc_command "$1" 92 run_rc_command "$1"
92else 93else
93 if [ -f /etc/rc.conf ]; then 94 if [ -f /etc/rc.conf ]; then
94 . /etc/rc.conf 95 . /etc/rc.conf
95 fi 96 fi
96 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 97 pidfile="${mysqld_pidfile}"
97 case "$1" in 98 case "$1" in
98 initdb) 99 initdb)
99 eval ${initdb_cmd} 100 eval ${initdb_cmd}
100 ;; 101 ;;
101 stop) 102 stop)
102 if [ -r "${pidfile}" ]; then 103 if [ -r "${pidfile}" ]; then
103 @ECHO@ "Stopping ${name}." 104 @ECHO@ "Stopping ${name}."
104 kill `@CAT@ ${pidfile}` 105 kill `@CAT@ ${pidfile}`
105 fi 106 fi
106 ;; 107 ;;
107 *) 108 *)
108 eval ${start_precmd} 109 eval ${start_precmd}
109 eval ${start_cmd} 110 eval ${start_cmd}
cvs diff -r1.35 -r1.36 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2014/03/31 08:03:22 1.35
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2014/04/14 00:02:49 1.36
@@ -1,45 +1,47 @@ @@ -1,45 +1,47 @@
1# $NetBSD: Makefile.common,v 1.35 2014/03/31 08:03:22 adam Exp $ 1# $NetBSD: Makefile.common,v 1.36 2014/04/14 00:02:49 rodent Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.37 6DISTNAME= mysql-5.5.37
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25# MYSQL_USER username of the database administrator 25# MYSQL_USER username of the database administrator
26# MYSQL_GROUP group of the database administrator 26# MYSQL_GROUP group of the database administrator
27# MYSQL_DATADIR home directory (location of the databases) 27# MYSQL_DATADIR home directory (location of the databases)
 28# MYSQL_PIDFILE process ID file
28# MYSQL_CHARSET default character set 29# MYSQL_CHARSET default character set
29# MYSQL_EXTRA_CHARSET additional character set to be compiled in 30# MYSQL_EXTRA_CHARSET additional character set to be compiled in
30MYSQL_USER?= mysql 31MYSQL_USER?= mysql
31MYSQL_GROUP?= mysql 32MYSQL_GROUP?= mysql
32MYSQL_DATADIR?= ${VARBASE}/mysql 33MYSQL_DATADIR?= ${VARBASE}/mysql
 34MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
33MYSQL_CHARSET?= latin1 35MYSQL_CHARSET?= latin1
34MYSQL_COLLATION?= latin1_swedish_ci 36MYSQL_COLLATION?= latin1_swedish_ci
35MYSQL_EXTRA_CHARSET?= all 37MYSQL_EXTRA_CHARSET?= all
36 38
37PKG_USERS_VARS+= MYSQL_USER 39PKG_USERS_VARS+= MYSQL_USER
38PKG_GROUPS_VARS+= MYSQL_GROUP 40PKG_GROUPS_VARS+= MYSQL_GROUP
39 41
40CONFIG_SHELL= ${TOOLS_PATH.bash} 42CONFIG_SHELL= ${TOOLS_PATH.bash}
41 43
42.if ${OPSYS} == "IRIX" 44.if ${OPSYS} == "IRIX"
43CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 45CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
44.endif 46.endif
45 47
cvs diff -r1.20 -r1.21 pkgsrc/databases/mysql55-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/Makefile 2014/03/31 08:03:22 1.20
+++ pkgsrc/databases/mysql55-server/Attic/Makefile 2014/04/14 00:02:50 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2014/03/31 08:03:22 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2014/04/14 00:02:50 rodent Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
5COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
6 6
7CONFLICTS= mysql3-server-[0-9]* 7CONFLICTS= mysql3-server-[0-9]*
8 8
9.include "../../databases/mysql55-client/Makefile.common" 9.include "../../databases/mysql55-client/Makefile.common"
10 10
11CMAKE_ARGS+= -DWITH_LIBWRAP=ON 11CMAKE_ARGS+= -DWITH_LIBWRAP=ON
12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} 12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
13 13
14.if !empty(PKG_OPTIONS:Membedded-server) 14.if !empty(PKG_OPTIONS:Membedded-server)
@@ -40,26 +40,27 @@ PKG_GROUPS= ${MYSQL_GROUP} @@ -40,26 +40,27 @@ PKG_GROUPS= ${MYSQL_GROUP}
40PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} 40PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
41 41
42PKG_GECOS.${MYSQL_USER}= MySQL database administrator 42PKG_GECOS.${MYSQL_USER}= MySQL database administrator
43PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} 43PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
44PKG_SHELL.${MYSQL_USER}= ${SH} 44PKG_SHELL.${MYSQL_USER}= ${SH}
45 45
46RCD_SCRIPTS= mysqld 46RCD_SCRIPTS= mysqld
47SMF_NAME= mysql 47SMF_NAME= mysql
48SMF_METHODS= ${RCD_SCRIPTS} 48SMF_METHODS= ${RCD_SCRIPTS}
49 49
50FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 50FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
51FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 51FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
52FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 52FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 53FILES_SUBST+= MYSQL_PIDFILE=${MYSQL_PIDFILE}
53MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 54MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
54MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 55MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
55BUILD_DEFS+= MYSQL_DATADIR 56BUILD_DEFS+= MYSQL_DATADIR
56 57
57REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl 58REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl
58REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl 59REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl
59REPLACE_PERL+= mysql-test/mysql-stress-test.pl 60REPLACE_PERL+= mysql-test/mysql-stress-test.pl
60REPLACE_PERL+= mysql-test/mysql-test-run.pl 61REPLACE_PERL+= mysql-test/mysql-test-run.pl
61REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl 62REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl
62REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl 63REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
63REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl 64REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl
64REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl 65REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl
65REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl 66REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql55-server/files/Attic/mysqld.sh (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/files/Attic/mysqld.sh 2011/04/25 21:12:15 1.1.1.1
+++ pkgsrc/databases/mysql55-server/files/Attic/mysqld.sh 2014/04/14 00:02:50 1.2
@@ -1,42 +1,44 @@ @@ -1,42 +1,44 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: mysqld.sh,v 1.1.1.1 2011/04/25 21:12:15 adam Exp $ 3# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
4# 4#
5# PROVIDE: mysqld 5# PROVIDE: mysqld
6# REQUIRE: DAEMON LOGIN mountall 6# REQUIRE: DAEMON LOGIN mountall
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8# 8#
9# You will need to set some variables in /etc/rc.conf to start MySQL: 9# You will need to set some variables in /etc/rc.conf to start MySQL:
10# 10#
11# mysqld=YES 11# mysqld=YES
12# 12#
13# The following variables are optional: 13# The following variables are optional:
14# 14#
15# mysqld_user="mysql" # user to run mysqld as 15# mysqld_user="mysql" # user to run mysqld as
16# mysqld_datadir="/path/to/home" # path to MySQL database directory 16# mysqld_datadir="/path/to/home" # path to MySQL database directory
 17# mysqld_pidfile="/path/to/p.pid" # path to MySQL PID file
17# 18#
18 19
19if [ -f /etc/rc.subr ]; then 20if [ -f /etc/rc.subr ]; then
20 . /etc/rc.subr 21 . /etc/rc.subr
21fi 22fi
22 23
23name="mysqld" 24name="mysqld"
24rcvar=${name} 25rcvar=${name}
25command="@PREFIX@/bin/mysqld_safe" 26command="@PREFIX@/bin/mysqld_safe"
26procname="@PREFIX@/sbin/${name}" 27procname="@PREFIX@/sbin/${name}"
27: ${mysqld_user:=@MYSQL_USER@} 28: ${mysqld_user:=@MYSQL_USER@}
28: ${mysqld_group:=@MYSQL_GROUP@} 29: ${mysqld_group:=@MYSQL_GROUP@}
29: ${mysqld_datadir:=@MYSQL_DATADIR@} 30: ${mysqld_datadir:=@MYSQL_DATADIR@}
 31: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
30 32
31extra_commands="initdb" 33extra_commands="initdb"
32initdb_cmd="mysqld_initdb" 34initdb_cmd="mysqld_initdb"
33start_precmd="mysqld_precmd" 35start_precmd="mysqld_precmd"
34start_cmd="mysqld_start" 36start_cmd="mysqld_start"
35 37
36mysqld_precmd() 38mysqld_precmd()
37{ 39{
38 if [ ! -d ${mysqld_datadir}/mysql ]; then 40 if [ ! -d ${mysqld_datadir}/mysql ]; then
39 ${initdb_cmd} 41 ${initdb_cmd}
40 fi 42 fi
41} 43}
42 44
@@ -64,39 +66,39 @@ mysqld_start() @@ -64,39 +66,39 @@ mysqld_start()
64{ 66{
65 for f in $required_files; do 67 for f in $required_files; do
66 if [ ! -r "$f" ]; then 68 if [ ! -r "$f" ]; then
67 @ECHO@ 1>&2 "$0: WARNING: $f is not readable" 69 @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
68 if [ -z $rc_force ]; then 70 if [ -z $rc_force ]; then
69 return 1 71 return 1
70 fi 72 fi
71 fi 73 fi
72 done 74 done
73 @ECHO@ "Starting ${name}." 75 @ECHO@ "Starting ${name}."
74 ulimit -n 4096 76 ulimit -n 4096
75 cd @PREFIX@ 77 cd @PREFIX@
76 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \ 78 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
77 --pid-file=${pidfile} ${mysqld_flags} \ 79 --pid-file=${mysqld_pidfile} ${mysqld_flags} \
78 ${thread_flags} & 80 ${thread_flags} &
79} 81}
80 82
81if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then 83if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
82 load_rc_config $name 84 load_rc_config $name
83 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 85 pidfile="${mysqld_pidfile}"
84 run_rc_command "$1" 86 run_rc_command "$1"
85else 87else
86 if [ -f /etc/rc.conf ]; then 88 if [ -f /etc/rc.conf ]; then
87 . /etc/rc.conf 89 . /etc/rc.conf
88 fi 90 fi
89 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 91 pidfile="${mysqld_pidfile}"
90 case "$1" in 92 case "$1" in
91 initdb) 93 initdb)
92 eval ${initdb_cmd} 94 eval ${initdb_cmd}
93 ;; 95 ;;
94 stop) 96 stop)
95 if [ -r "${pidfile}" ]; then 97 if [ -r "${pidfile}" ]; then
96 @ECHO@ "Stopping ${name}." 98 @ECHO@ "Stopping ${name}."
97 kill `@CAT@ ${pidfile}` 99 kill `@CAT@ ${pidfile}`
98 fi 100 fi
99 ;; 101 ;;
100 *) 102 *)
101 eval ${start_precmd} 103 eval ${start_precmd}
102 eval ${start_cmd} 104 eval ${start_cmd}
cvs diff -r1.14 -r1.15 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2014/03/31 10:32:13 1.14
+++ pkgsrc/databases/mysql56-client/Makefile.common 2014/04/14 00:02:50 1.15
@@ -1,45 +1,47 @@ @@ -1,45 +1,47 @@
1# $NetBSD: Makefile.common,v 1.14 2014/03/31 10:32:13 adam Exp $ 1# $NetBSD: Makefile.common,v 1.15 2014/04/14 00:02:50 rodent Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.17 6DISTNAME= mysql-5.6.17
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25# MYSQL_USER username of the database administrator 25# MYSQL_USER username of the database administrator
26# MYSQL_GROUP group of the database administrator 26# MYSQL_GROUP group of the database administrator
27# MYSQL_DATADIR home directory (location of the databases) 27# MYSQL_DATADIR home directory (location of the databases)
 28# MYSQL_PIDFILE process ID file
28# MYSQL_CHARSET default character set 29# MYSQL_CHARSET default character set
29# MYSQL_EXTRA_CHARSET additional character set to be compiled in 30# MYSQL_EXTRA_CHARSET additional character set to be compiled in
30MYSQL_USER?= mysql 31MYSQL_USER?= mysql
31MYSQL_GROUP?= mysql 32MYSQL_GROUP?= mysql
32MYSQL_DATADIR?= ${VARBASE}/mysql 33MYSQL_DATADIR?= ${VARBASE}/mysql
 34MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
33MYSQL_CHARSET?= latin1 35MYSQL_CHARSET?= latin1
34MYSQL_COLLATION?= latin1_swedish_ci 36MYSQL_COLLATION?= latin1_swedish_ci
35MYSQL_EXTRA_CHARSET?= all 37MYSQL_EXTRA_CHARSET?= all
36 38
37PKG_USERS_VARS+= MYSQL_USER 39PKG_USERS_VARS+= MYSQL_USER
38PKG_GROUPS_VARS+= MYSQL_GROUP 40PKG_GROUPS_VARS+= MYSQL_GROUP
39 41
40CONFIG_SHELL= ${TOOLS_PATH.bash} 42CONFIG_SHELL= ${TOOLS_PATH.bash}
41 43
42.if ${OPSYS} == "IRIX" 44.if ${OPSYS} == "IRIX"
43CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 45CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
44.endif 46.endif
45 47
cvs diff -r1.14 -r1.15 pkgsrc/databases/mysql56-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/Makefile 2014/03/11 14:34:36 1.14
+++ pkgsrc/databases/mysql56-server/Makefile 2014/04/14 00:02:50 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2014/03/11 14:34:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.15 2014/04/14 00:02:50 rodent Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
5COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
6 6
7CONFLICTS= mysql3-server-[0-9]* 7CONFLICTS= mysql3-server-[0-9]*
8 8
9.include "../../databases/mysql56-client/Makefile.common" 9.include "../../databases/mysql56-client/Makefile.common"
10 10
11CMAKE_ARGS+= -DWITH_LIBWRAP=ON 11CMAKE_ARGS+= -DWITH_LIBWRAP=ON
12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} 12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
13 13
14.if !empty(PKG_OPTIONS:Membedded-server) 14.if !empty(PKG_OPTIONS:Membedded-server)
@@ -41,26 +41,27 @@ PKG_GROUPS= ${MYSQL_GROUP} @@ -41,26 +41,27 @@ PKG_GROUPS= ${MYSQL_GROUP}
41PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} 41PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
42 42
43PKG_GECOS.${MYSQL_USER}= MySQL database administrator 43PKG_GECOS.${MYSQL_USER}= MySQL database administrator
44PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} 44PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
45PKG_SHELL.${MYSQL_USER}= ${SH} 45PKG_SHELL.${MYSQL_USER}= ${SH}
46 46
47RCD_SCRIPTS= mysqld 47RCD_SCRIPTS= mysqld
48SMF_NAME= mysql 48SMF_NAME= mysql
49SMF_METHODS= ${RCD_SCRIPTS} 49SMF_METHODS= ${RCD_SCRIPTS}
50 50
51FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 51FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
52FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 52FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
53FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 53FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 54FILES_SUBST+= MYSQL_PIDFILE=${MYSQL_PIDFILE}
54MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 55MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
55MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 56MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
56BUILD_DEFS+= MYSQL_DATADIR 57BUILD_DEFS+= MYSQL_DATADIR
57 58
58REPLACE_PERL+= sql-bench/*.sh 59REPLACE_PERL+= sql-bench/*.sh
59REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl 60REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl
60REPLACE_PERL+= mysql-test/mysql-stress-test.pl 61REPLACE_PERL+= mysql-test/mysql-stress-test.pl
61REPLACE_PERL+= mysql-test/mysql-test-run.pl 62REPLACE_PERL+= mysql-test/mysql-test-run.pl
62REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl 63REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl
63REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl 64REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
64REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl 65REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl
65REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl 66REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl
66REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl 67REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
cvs diff -r1.1 -r1.2 pkgsrc/databases/mysql56-server/files/mysqld.sh (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/files/mysqld.sh 2013/02/13 21:00:10 1.1
+++ pkgsrc/databases/mysql56-server/files/mysqld.sh 2014/04/14 00:02:50 1.2
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: mysqld.sh,v 1.1 2013/02/13 21:00:10 adam Exp $ 3# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
4# 4#
5# PROVIDE: mysqld 5# PROVIDE: mysqld
6# REQUIRE: DAEMON LOGIN mountall 6# REQUIRE: DAEMON LOGIN mountall
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8# 8#
9# You will need to set some variables in /etc/rc.conf to start MySQL: 9# You will need to set some variables in /etc/rc.conf to start MySQL:
10# 10#
11# mysqld=YES 11# mysqld=YES
12# 12#
13# The following variables are optional: 13# The following variables are optional:
14# 14#
15# mysqld_user="mysql" # user to run mysqld as 15# mysqld_user="mysql" # user to run mysqld as
16# mysqld_datadir="/path/to/home" # path to MySQL database directory 16# mysqld_datadir="/path/to/home" # path to MySQL database directory
17# 17# mysqld_pidfile="/path/to/p.pid" # path to MySQL PID file
18 18
19if [ -f /etc/rc.subr ]; then 19if [ -f /etc/rc.subr ]; then
20 . /etc/rc.subr 20 . /etc/rc.subr
21fi 21fi
22 22
23name="mysqld" 23name="mysqld"
24rcvar=${name} 24rcvar=${name}
25command="@PREFIX@/bin/mysqld_safe" 25command="@PREFIX@/bin/mysqld_safe"
26procname="@PREFIX@/sbin/${name}" 26procname="@PREFIX@/sbin/${name}"
27: ${mysqld_user:=@MYSQL_USER@} 27: ${mysqld_user:=@MYSQL_USER@}
28: ${mysqld_group:=@MYSQL_GROUP@} 28: ${mysqld_group:=@MYSQL_GROUP@}
29: ${mysqld_datadir:=@MYSQL_DATADIR@} 29: ${mysqld_datadir:=@MYSQL_DATADIR@}
 30: ${mysqld_pidfile:=@MYSQL_PIDFILE@}
30 31
31extra_commands="initdb" 32extra_commands="initdb"
32initdb_cmd="mysqld_initdb" 33initdb_cmd="mysqld_initdb"
33start_precmd="mysqld_precmd" 34start_precmd="mysqld_precmd"
34start_cmd="mysqld_start" 35start_cmd="mysqld_start"
35 36
36mysqld_precmd() 37mysqld_precmd()
37{ 38{
38 if [ ! -d ${mysqld_datadir}/mysql ]; then 39 if [ ! -d ${mysqld_datadir}/mysql ]; then
39 ${initdb_cmd} 40 ${initdb_cmd}
40 fi 41 fi
41} 42}
42 43
@@ -64,39 +65,39 @@ mysqld_start() @@ -64,39 +65,39 @@ mysqld_start()
64{ 65{
65 for f in $required_files; do 66 for f in $required_files; do
66 if [ ! -r "$f" ]; then 67 if [ ! -r "$f" ]; then
67 @ECHO@ 1>&2 "$0: WARNING: $f is not readable" 68 @ECHO@ 1>&2 "$0: WARNING: $f is not readable"
68 if [ -z $rc_force ]; then 69 if [ -z $rc_force ]; then
69 return 1 70 return 1
70 fi 71 fi
71 fi 72 fi
72 done 73 done
73 @ECHO@ "Starting ${name}." 74 @ECHO@ "Starting ${name}."
74 ulimit -n 4096 75 ulimit -n 4096
75 cd @PREFIX@ 76 cd @PREFIX@
76 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \ 77 ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
77 --pid-file=${pidfile} ${mysqld_flags} \ 78 --pid-file=${mysqld_pidfile} ${mysqld_flags} \
78 ${thread_flags} & 79 ${thread_flags} &
79} 80}
80 81
81if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then 82if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
82 load_rc_config $name 83 load_rc_config $name
83 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 84 pidfile="${mysqld_pidfile}"
84 run_rc_command "$1" 85 run_rc_command "$1"
85else 86else
86 if [ -f /etc/rc.conf ]; then 87 if [ -f /etc/rc.conf ]; then
87 . /etc/rc.conf 88 . /etc/rc.conf
88 fi 89 fi
89 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" 90 pidfile="${mysqld_pidfile}"
90 case "$1" in 91 case "$1" in
91 initdb) 92 initdb)
92 eval ${initdb_cmd} 93 eval ${initdb_cmd}
93 ;; 94 ;;
94 stop) 95 stop)
95 if [ -r "${pidfile}" ]; then 96 if [ -r "${pidfile}" ]; then
96 @ECHO@ "Stopping ${name}." 97 @ECHO@ "Stopping ${name}."
97 kill `@CAT@ ${pidfile}` 98 kill `@CAT@ ${pidfile}`
98 fi 99 fi
99 ;; 100 ;;
100 *) 101 *)
101 eval ${start_precmd} 102 eval ${start_precmd}
102 eval ${start_cmd} 103 eval ${start_cmd}