Date: Mon, 25 Jul 2005 15:07:41 +0900 (JST) From: Hideyuki KURASHINA <rushani@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: knu@FreeBSD.org Subject: ports/84036: [PATCH] japanese/rskkserv: Conver start script to rcNG style Message-ID: <20050725.150741.31655922.rushani@FreeBSD.org> Resent-Message-ID: <200507250610.j6P6AL92075827@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84036
>Category: ports
>Synopsis: [PATCH] japanese/rskkserv: Conver start script to rcNG style
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 25 06:10:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Hideyuki KURASHINA
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD *****.*******.jp 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Sat Jul 23 11:55:13 JST 2005 hideyuki@*****.*******.jp:/usr/obj/usr/src/sys/***** i386
>Description:
Conver start script to rcNG style.
>How-To-Repeat:
Check ${PREFIX}/etc/rc.d/rskkserv.sh.
>Fix:
Apply following patch after applying a patch in ports/84000,
diff -urN rskkserv.2.95.4/Makefile rskkserv/Makefile
--- rskkserv.2.95.4/Makefile Mon Jul 25 14:14:13 2005
+++ rskkserv/Makefile Mon Jul 25 14:09:39 2005
@@ -30,6 +30,7 @@
USE_RUBY= yes
USE_AUTOCONF_VER= 213
USE_GMAKE= yes
+USE_RC_SUBR= rskkserv.sh
CONFIGURE_ARGS= --with-ruby="${RUBY}" \
--with-dicfile="${SKKJISYO_BASE}/${SKKJISYO}" \
@@ -43,8 +44,6 @@
SKKJISYO= SKK-JISYO.${SKKJISYO_SIZE}
SKK_MASTERDIR= ${PORTSDIR}/japanese/skk-jisyo
-STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/rskkserv.sh
-
MAN1= rskkserv.1
MANLANG= "" ja
@@ -68,33 +67,6 @@
${WRKSRC}/doc/conf-o2n.rb
post-install:
- @if [ ! -f ${STARTUP_SCRIPT} ]; then \
- ${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
- ( \
- ${ECHO_CMD} "#!/bin/sh"; \
- ${ECHO_CMD} "case \$$1 in"; \
- ${ECHO_CMD} "start)"; \
- ${ECHO_CMD} " if [ -f ${PREFIX}/sbin/rskkserv ]; then"; \
- ${ECHO_CMD} " ${ECHO_CMD} -n ' rskkserv: '"; \
- ${ECHO_CMD} " ${PREFIX}/sbin/rskkserv"; \
- ${ECHO_CMD} " fi"; \
- ${ECHO_CMD} " ;;"; \
- ${ECHO_CMD} "stop)"; \
- ${ECHO_CMD} " pidfile=/var/run/rskkserv.pid"; \
- ${ECHO_CMD} " if [ -f \$$pidfile ]; then"; \
- ${ECHO_CMD} " kill \`cat \$$pidfile\` && echo -n ' rskkserv'"; \
- ${ECHO_CMD} " ${RM} -f \$$pidfile"; \
- ${ECHO_CMD} " else"; \
- ${ECHO_CMD} " ${ECHO_CMD} ' rskkserv: not running'"; \
- ${ECHO_CMD} " fi"; \
- ${ECHO_CMD} " ;;"; \
- ${ECHO_CMD} "*)"; \
- ${ECHO_CMD} " ${ECHO_CMD} \"usage: \$$0 {start|stop}\" 1>&2"; \
- ${ECHO_CMD} " ;;"; \
- ${ECHO_CMD} "esac"; \
- ) > ${STARTUP_SCRIPT}; \
- ${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
- fi
.if !defined(NOPORTDOCS)
${MKDIR} ${RUBY_MODDOCDIR}/ja
.for f in ${DOCS_EN}
diff -urN rskkserv.2.95.4/files/rskkserv.sh.in rskkserv/files/rskkserv.sh.in
--- rskkserv.2.95.4/files/rskkserv.sh.in Thu Jan 1 09:00:00 1970
+++ rskkserv/files/rskkserv.sh.in Mon Jul 25 14:52:56 2005
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: rskkserv
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+prefix=%%PREFIX%%
+
+rskkserv_enable=${rskkserv_enable:-"NO"}
+rskkserv_flags=${rskkserv_flags:-""}
+
+. %%RC_SUBR%%
+
+name="rskkserv"
+rcvar=`set_rcvar`
+command="${prefix}/sbin/${name}"
+command_interpreter="${prefix}/bin/ruby"
+pidfile="/var/run/${name}.pid"
+required_files="${prefix}/etc/${name}.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff -urN rskkserv.2.95.4/pkg-plist rskkserv/pkg-plist
--- rskkserv.2.95.4/pkg-plist Mon Jul 25 14:14:13 2005
+++ rskkserv/pkg-plist Mon Jul 25 14:09:39 2005
@@ -1,4 +1,3 @@
-etc/rc.d/rskkserv.sh
@unexec if cmp -s %D/etc/rskkserv.conf %D/%%EXAMPLESDIR%%/rskkserv.conf; then rm -f %D/etc/rskkserv.conf; fi
%%RUBY_SITEARCHLIBDIR%%/skkserv/skkdic.so
@dirrm %%RUBY_SITEARCHLIBDIR%%/skkserv
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050725.150741.31655922.rushani>