ports/136847: [PATCH] net-mgmt/openvmps: USE_RC_SUBR != yes

[Philip M. Gollucci]

>Number:         136847
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/openvmps: 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:03 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/vpmsd.in

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

Port maintainer (craig at yekse.gank.org) is cc'd.

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

--- openvmps-1.3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/openvmps/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	8 Jul 2009 13:01:17 -0000	1.9
+++ Makefile	17 Jul 2009 07:13:28 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	openvmps
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vmps
@@ -16,7 +17,7 @@
 COMMENT=	A GPL implementation of the VMPS protocol
 
 WRKSRC=		${WRKDIR}/vmpsd
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	vpmsd
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -25,9 +26,6 @@
 
 MAN1=		vmpsd.1
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
@@ -35,9 +33,6 @@
 .endif
 
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/vmpsd.sh > ${PREFIX}/etc/rc.d/vmpsd.sh
-	@${CHMOD} 755 ${PREFIX}/etc/rc.d/vmpsd.sh
 	${INSTALL_DATA} -m 644 ${WRKSRC}/vlan.db \
 		${PREFIX}/etc/vmps.db.sample
 	@if [ ! -f ${PREFIX}/etc/vmps.db ]; then \
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/openvmps/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	8 Oct 2003 02:57:42 -0000	1.1
+++ pkg-plist	17 Jul 2009 07:13:28 -0000
@@ -1,4 +1,3 @@
-etc/rc.d/vmpsd.sh
 @unexec if cmp -s %D/etc/vmps.db %D/etc/vmps.db.sample; then rm -f %D/etc/vmps.db; fi
 etc/vmps.db.sample
 sbin/vmpsd
Index: files/vmpsd.sh
===================================================================
RCS file: files/vmpsd.sh
diff -N files/vmpsd.sh
--- files/vmpsd.sh	15 Jul 2009 16:55:59 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Start or stop vmpsd
-# $FreeBSD: ports/net-mgmt/openvmps/files/vmpsd.sh,v 1.3 2009/07/15 16:55:59 dougb Exp $
-
-# PROVIDE: vmpsd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-# Define these vmpsd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/vmpsd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE 
-#
-[ -z "$vmpsd_enable" ] && vmpsd_enable="NO" # Enable vmpsd
-#vmpsd_program="%%PREFIX%%/sbin/vmpsd"       # Location of vmpsd
-[ -z "$vmpsd_flags" ] && vmpsd_flags="-f /usr/local/etc/vmps.db"   # Flags to vmpsd program
-
-. %%RC_SUBR%%
-
-name="vmpsd"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-
-load_rc_config $name
-run_rc_command "$1"
Index: files/vpmsd.in
===================================================================
RCS file: files/vpmsd.in
diff -N files/vpmsd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/vpmsd.in	17 Jul 2009 07:13:28 -0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Start or stop vmpsd
+# $FreeBSD: ports/net-mgmt/openvmps/files/vmpsd.sh,v 1.3 2009/07/15 16:55:59 dougb Exp $
+
+# PROVIDE: vmpsd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+# Define these vmpsd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/vmpsd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE 
+#
+[ -z "$vmpsd_enable" ] && vmpsd_enable="NO" # Enable vmpsd
+#vmpsd_program="%%PREFIX%%/sbin/vmpsd"       # Location of vmpsd
+[ -z "$vmpsd_flags" ] && vmpsd_flags="-f /usr/local/etc/vmps.db"   # Flags to vmpsd program
+
+. %%RC_SUBR%%
+
+name="vmpsd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/${name}"
+
+load_rc_config $name
+run_rc_command "$1"
--- openvmps-1.3_1.patch ends here ---

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