ports/136840: [PATCH] japanese/ja-multiskkserv: USE_RC_SUBR != yes

[Philip M. Gollucci]

>Number:         136840
>Category:       ports
>Synopsis:       [PATCH] japanese/ja-multiskkserv: USE_RC_SUBR != yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 17 07:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC
>Description:

Added file(s):
- files/multiskkserv.in

Removed file(s):
- files/multiskkserv.sh

Port maintainer (freebsd at next-generation.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ja-multiskkserv-0.20020201_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/multiskkserv/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	9 May 2006 00:18:00 -0000	1.3
+++ Makefile	17 Jul 2009 07:11:23 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	multiskkserv
 PORTVERSION=	0.20020201
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www3.big.or.jp/~sian/linux/products/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.//g}
@@ -23,25 +24,13 @@
 SKKJISYO_TYPE?=	L
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/0.//g}
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-cdb=`cd ${PORTSDIR}/databases/cdb; ${MAKE} -V WRKSRC`
 
-post-extract:
-	${CP} ${FILESDIR}/multiskkserv.sh ${WRKDIR}/multiskkserv.sh
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%SKKDIR%%,${SKKDIR},g' \
-		-e 's,%%SKKJISYO_TYPE%%,${SKKJISYO_TYPE},g' \
-		${WRKDIR}/multiskkserv.sh
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/multiskkserv ${PREFIX}/sbin
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/multiskkserv-ctl ${PREFIX}/sbin
 	@${INSTALL_PROGRAM} ${WRKSRC}/tools/skkdic-p2cdb ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/multiskkserv.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/japanese/multiskkserv/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	8 Jan 2004 02:17:33 -0000	1.1
+++ pkg-plist	17 Jul 2009 07:11:23 -0000
@@ -1,4 +1,3 @@
 sbin/multiskkserv
 sbin/multiskkserv-ctl
 bin/skkdic-p2cdb
-etc/rc.d/multiskkserv.sh
Index: files/multiskkserv.in
===================================================================
RCS file: files/multiskkserv.in
diff -N files/multiskkserv.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/multiskkserv.in	17 Jul 2009 07:11:23 -0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/japanese/multiskkserv/files/multiskkserv.sh,v 1.3 2006/02/20 20:47:05 dougb Exp $
+#
+
+# PROVIDE: multiskkserv
+# REQUIRE: LOGIN
+
+#
+# Add the following lines to /etc/rc.conf to enable multiskkserv:
+#
+#multiskkserv_enable="YES"
+#
+# See `%%PREFIX%%/sbin/multiskkserv -h` for flags
+#
+
+. %%RC_SUBR%%
+
+name=multiskkserv
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/multiskkserv
+
+# set defaults
+
+multiskkserv_enable=${multiskkserv_enable:-"NO"}
+multiskkserv_flags=${multiskkserv_flags:-"%%PREFIX%%/%%SKKDIR%%/SKK-JISYO.%%SKKJISYO_TYPE%%.cdb &"}
+
+load_rc_config ${name}
+run_rc_command "$1"
Index: files/multiskkserv.sh
===================================================================
RCS file: files/multiskkserv.sh
diff -N files/multiskkserv.sh
--- files/multiskkserv.sh	20 Feb 2006 20:47:05 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/japanese/multiskkserv/files/multiskkserv.sh,v 1.3 2006/02/20 20:47:05 dougb Exp $
-#
-
-# PROVIDE: multiskkserv
-# REQUIRE: LOGIN
-
-#
-# Add the following lines to /etc/rc.conf to enable multiskkserv:
-#
-#multiskkserv_enable="YES"
-#
-# See `%%PREFIX%%/sbin/multiskkserv -h` for flags
-#
-
-. %%RC_SUBR%%
-
-name=multiskkserv
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/multiskkserv
-
-# set defaults
-
-multiskkserv_enable=${multiskkserv_enable:-"NO"}
-multiskkserv_flags=${multiskkserv_flags:-"%%PREFIX%%/%%SKKDIR%%/SKK-JISYO.%%SKKJISYO_TYPE%%.cdb &"}
-
-load_rc_config ${name}
-run_rc_command "$1"
--- ja-multiskkserv-0.20020201_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: