From 5f71c9ba77ace26b6a02292f6b34034865e4b950 Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Fri, 17 Jul 2009 18:42:32 +0000
Subject: - USE_RC_SUBR != yes   (rename .sh -> .in)

PR:             ports/136847
Approved by:    maintainer
Submitted by:   myself (pgollucci@)
---
 net-mgmt/openvmps/Makefile       |  9 ++-------
 net-mgmt/openvmps/files/vmpsd.sh | 28 ----------------------------
 net-mgmt/openvmps/files/vpmsd.in | 28 ++++++++++++++++++++++++++++
 net-mgmt/openvmps/pkg-plist      |  1 -
 4 files changed, 30 insertions(+), 36 deletions(-)
 delete mode 100644 net-mgmt/openvmps/files/vmpsd.sh
 create mode 100644 net-mgmt/openvmps/files/vpmsd.in

(limited to 'net-mgmt')

diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index 900586dba802..360a3ee2d059 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -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 @@ MAINTAINER=	craig@yekse.gank.org
 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 @@ CONFIGURE_ARGS=--bindir=${PREFIX}/sbin
 
 MAN1=		vmpsd.1
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
@@ -35,9 +33,6 @@ IGNORE=		does not run correctly on amd64 architecture, see ports/136376
 .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 \
diff --git a/net-mgmt/openvmps/files/vmpsd.sh b/net-mgmt/openvmps/files/vmpsd.sh
deleted file mode 100644
index d11753110e01..000000000000
--- a/net-mgmt/openvmps/files/vmpsd.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Start or stop vmpsd
-# $FreeBSD$
-
-# 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"
diff --git a/net-mgmt/openvmps/files/vpmsd.in b/net-mgmt/openvmps/files/vpmsd.in
new file mode 100644
index 000000000000..d11753110e01
--- /dev/null
+++ b/net-mgmt/openvmps/files/vpmsd.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Start or stop vmpsd
+# $FreeBSD$
+
+# 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"
diff --git a/net-mgmt/openvmps/pkg-plist b/net-mgmt/openvmps/pkg-plist
index 340d2c50b317..ceea0a3edce4 100644
--- a/net-mgmt/openvmps/pkg-plist
+++ b/net-mgmt/openvmps/pkg-plist
@@ -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
-- 
cgit v1.2.3