From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 25 06:10:22 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7620916A41F for ; Mon, 25 Jul 2005 06:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0260843D53 for ; Mon, 25 Jul 2005 06:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6P6ALgK075828 for ; Mon, 25 Jul 2005 06:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6P6AL92075827; Mon, 25 Jul 2005 06:10:21 GMT (envelope-from gnats) Resent-Date: Mon, 25 Jul 2005 06:10:21 GMT Resent-Message-Id: <200507250610.j6P6AL92075827@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hideyuki KURASHINA Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6A7B16A420 for ; Mon, 25 Jul 2005 06:08:13 +0000 (GMT) (envelope-from rushani@FreeBSD.org) Received: from wasley.bl.mmtr.or.jp (wasley.bl.mmtr.or.jp [210.228.173.142]) by mx1.FreeBSD.org (Postfix) with SMTP id BDD5C43D5C for ; Mon, 25 Jul 2005 06:08:12 +0000 (GMT) (envelope-from rushani@FreeBSD.org) Received: (qmail 1352 invoked from network); 25 Jul 2005 15:08:11 +0900 Received: from unknown (HELO localhost) (202.229.143.11) by wasley.bl.mmtr.or.jp with SMTP; 25 Jul 2005 15:08:11 +0900 Message-Id: <20050725.150741.31655922.rushani@FreeBSD.org> Date: Mon, 25 Jul 2005 15:07:41 +0900 (JST) From: Hideyuki KURASHINA To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: knu@FreeBSD.org Subject: ports/84036: [PATCH] japanese/rskkserv: Conver start script to rcNG style X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2005 06:10:22 -0000 >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: