ports/136852: [PATCH] sysutils/openupsd: USE_RC_SUBR != yes

[Philip M. Gollucci]

>Number:         136852
>Category:       ports
>Synopsis:       [PATCH] sysutils/openupsd: 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:05 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/openupsd.in

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

Port maintainer (tdb at FreeBSD.org) is cc'd.

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

--- openupsd-0.3.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/openupsd/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	1 Dec 2005 16:50:07 -0000	1.3
+++ Makefile	17 Jul 2009 07:14:55 -0000
@@ -7,24 +7,20 @@
 
 PORTNAME=	openupsd
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://frmb.org/download/
 
 MAINTAINER=	tdb at FreeBSD.org
 COMMENT=	A UPS daemon for some Belkin UPS's
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name= --bindir=${PREFIX}/sbin
 
-PLIST_FILES=	sbin/openupsd etc/openupsd.conf.sample etc/rc.d/openupsd.sh
-
-post-extract:
-	@${SED} -e 's#%%RC_SUBR%%#${RC_SUBR}#g' -e 's#%%PREFIX%%#${PREFIX}#g' \
-		${FILESDIR}/openupsd.sh > ${WRKDIR}/openupsd.sh
+PLIST_FILES=	sbin/openupsd etc/openupsd.conf.sample
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/openupsd.conf ${PREFIX}/etc/openupsd.conf.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/openupsd.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>
Index: files/openupsd.in
===================================================================
RCS file: files/openupsd.in
diff -N files/openupsd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/openupsd.in	17 Jul 2009 07:14:55 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/sysutils/openupsd/files/openupsd.sh,v 1.3 2006/02/20 20:47:43 dougb Exp $
+#
+# PROVIDE: openupsd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+openupsd_enable=${openupsd_enable:-"NO"}
+
+. %%RC_SUBR%%
+
+name="openupsd"
+rcvar=`set_rcvar`
+
+pidfile=/var/run/${name}.pid
+required_files=%%PREFIX%%/etc/${name}.conf
+
+command=%%PREFIX%%/sbin/openupsd
+command_args="-p ${pidfile}"
+
+load_rc_config $name
+run_rc_command "$1"
Index: files/openupsd.sh
===================================================================
RCS file: files/openupsd.sh
diff -N files/openupsd.sh
--- files/openupsd.sh	20 Feb 2006 20:47:43 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/sysutils/openupsd/files/openupsd.sh,v 1.3 2006/02/20 20:47:43 dougb Exp $
-#
-# PROVIDE: openupsd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-openupsd_enable=${openupsd_enable:-"NO"}
-
-. %%RC_SUBR%%
-
-name="openupsd"
-rcvar=`set_rcvar`
-
-pidfile=/var/run/${name}.pid
-required_files=%%PREFIX%%/etc/${name}.conf
-
-command=%%PREFIX%%/sbin/openupsd
-command_args="-p ${pidfile}"
-
-load_rc_config $name
-run_rc_command "$1"
--- openupsd-0.3.1_1.patch ends here ---

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