From 345cc9a7a40d7cf5cc785f41b8242f7240fdcf8e Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 22 Oct 2008 00:47:12 +0000
Subject: Make use of the new old world rc order, and install the slpd rc.d
 script properly.

PR:		126726
Submitted by:	"Joseph S. Atkinson" <jsa@dmz.wickedmachine.net>
---
 net/openslp/Makefile             |  8 ++------
 net/openslp/files/slpd.sh.sample | 26 --------------------------
 net/openslp/pkg-plist            |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 net/openslp/files/slpd.sh.sample

(limited to 'net/openslp')

diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 97fe77117cb2..56d170a78d4f 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openslp
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openslp
@@ -22,8 +22,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
 		--localstatedir=/var
 
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR=	slpd
 
 OPTIONS=	SLP_SECURITY "Turn on SLPv2 security support" off \
 		ASYNC_API "Enable asynchronous communication API" off
@@ -42,14 +41,11 @@ post-extract:
 	@(cd ${WRKSRC}; \
 		${FIND} doc -type f -path '*/CVS/*' -delete; \
 		${FIND} doc -type d -name CVS -delete)
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/slpd.sh.sample > ${WRKSRC}/slpd.sh
 
 post-install:
 .for FILE in slp.conf slp.reg slp.spi
 	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${PREFIX}/etc/openslp/${FILE}.default
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/slpd.sh ${PREFIX}/etc/rc.d/001slpd.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	(cd ${INSTALL_WRKSRC}/doc; \
diff --git a/net/openslp/files/slpd.sh.sample b/net/openslp/files/slpd.sh.sample
deleted file mode 100644
index 1ec3175a6d76..000000000000
--- a/net/openslp/files/slpd.sh.sample
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: slpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable slpd:
-#
-# slpd_enable="YES"
-#
-
-slpd_enable=${slpd_enable-"NO"}
-slpd_flags=${slpd_flags-"-p /var/run/slpd.pid"}
-
-. %%RC_SUBR%%
-
-name=slpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/slpd
-pidfile="/var/run/${name}.pid"
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/openslp/pkg-plist b/net/openslp/pkg-plist
index 586c3aee1877..427ded0b10dd 100644
--- a/net/openslp/pkg-plist
+++ b/net/openslp/pkg-plist
@@ -9,7 +9,6 @@ etc/openslp/slp.conf.default
 etc/openslp/slp.spi.default
 @exec [ -f %B/slp.spi ] || cp %B/%f %B/slp.spi
 @dirrm etc/openslp
-etc/rc.d/001slpd.sh
 include/slp.h
 lib/libslp.a
 lib/libslp.la
-- 
cgit v1.2.3