Attachment #61166 for bug #91695

Lines 24-29 Link Here

(-)mysql40-server/Makefile (-4 / +4 lines)
24	USE_RC_SUBR= mysql-server.sh	24	USE_RC_SUBR= mysql-server.sh
25	.endif	25	.endif
26		26
		27	.if ${PKGNAMESUFFIX} == "-client"
		28	USE_RC_SUBR= 000.mysql-client.sh
		29	.endif
		30
27	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	31	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
28	CONFIGURE_ARGS= --localstatedir=/var/db/mysql \	32	CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
29	--without-debug \	33	--without-debug \
Lines 163-172 Link Here
163	.if defined(WITH_PROC_SCOPE_PTH)	167	.if defined(WITH_PROC_SCOPE_PTH)
164	@${REINPLACE_CMD} -e "s\|PTHREAD_SCOPE_SYSTEM\|PTHREAD_SCOPE_PROCESS\|g" ${WRKSRC}/tools/mysqlmanager.c	168	@${REINPLACE_CMD} -e "s\|PTHREAD_SCOPE_SYSTEM\|PTHREAD_SCOPE_PROCESS\|g" ${WRKSRC}/tools/mysqlmanager.c
165	.endif	169	.endif
166
167	post-install:
168	@${SED} "s\|%%PREFIX%%\|${PREFIX}\|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
169	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh
170		170
171	.else	171	.else
172	# MySQL-Scripts part	172	# MySQL-Scripts part




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: mysql_client
# REQUIRE: ldconfig
#
# Add the following to /etc/rc.conf[.local] to enable this service
#
# mysql_client_enable="YES"
#

. %%RC_SUBR%%

name=mysql_client
rcvar=`set_rcvar`

command=%%LDCONFIG%%
command_args='-m %%PREFIX%%/lib/mysql'

load_rc_config ${name}
run_rc_command "$1"




#!/bin/sh

case "$1" in
	start)
		/sbin/ldconfig -m %%PREFIX%%/lib/mysql
		;;
	stop)
		;;
	*)
		echo ""
		echo "Usage: `basename $0` { start | stop }"
		echo ""
		exit 64
		;;
esac

Lines 11-17 Link Here

(-)mysql40-server/pkg-plist.client (-1 lines)
11	bin/mysqlmanagerc	11	bin/mysqlmanagerc
12	bin/mysqlshow	12	bin/mysqlshow
13	bin/mysqltest	13	bin/mysqltest
14	etc/rc.d/000.mysql-client.sh
15	include/mysql/errmsg.h	14	include/mysql/errmsg.h
16	include/mysql/m_ctype.h	15	include/mysql/m_ctype.h
17	include/mysql/m_string.h	16	include/mysql/m_string.h

Return to bug 91695

Line 0 Link Here

(-)mysql40-server/files/000.mysql-client.sh.in (+22 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5	# PROVIDE: mysql_client
	6	# REQUIRE: ldconfig
	7	#
	8	# Add the following to /etc/rc.conf[.local] to enable this service
	9	#
	10	# mysql_client_enable="YES"
	11	#
	12
	13	. %%RC_SUBR%%
	14
	15	name=mysql_client
	16	rcvar=`set_rcvar`
	17
	18	command=%%LDCONFIG%%
	19	command_args='-m %%PREFIX%%/lib/mysql'
	20
	21	load_rc_config ${name}
	22	run_rc_command "$1"

Lines 1-15 Link Here

(-)mysql40-server/files/mysql-client.sh (-15 lines)
1	#!/bin/sh
2
3	case "$1" in
4	start)
5	/sbin/ldconfig -m %%PREFIX%%/lib/mysql
6	;;
7	stop)
8	;;
9	*)
10	echo ""
11	echo "Usage: `basename $0` { start \| stop }"
12	echo ""
13	exit 64
14	;;
15	esac