ports/116772: [PATCH] net/openntpd: new style of startup script install

[Alexander Logvinov]

>Number:         116772
>Category:       ports
>Synopsis:       [PATCH] net/openntpd: new style of startup script install
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 01 00:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
>Environment:

>Description:

  Use new style of startup script install
  
>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/openntpd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	8 Jul 2007 15:05:26 -0000	1.15
+++ Makefile	1 Oct 2007 00:38:27 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	openntpd
 PORTVERSION=	3.9p1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
@@ -17,7 +17,7 @@
 MAINTAINER=	naddy at FreeBSD.org
 COMMENT=	OpenBSD's Network Time Protocol daemon
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	openntpd
 GNU_CONFIGURE=	yes
 
 MAN5=		ntpd.conf.5
@@ -26,9 +26,6 @@
 pre-build:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8
-	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
-		-e 's:%%RC_SUBR%%:${RC_SUBR}:g' \
-		${FILESDIR}/openntpd.sh >${WRKDIR}/openntpd.sh
 
 do-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -37,7 +34,6 @@
 	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/man/man8
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/openntpd.sh ${PREFIX}/etc/rc.d
 	@if [ ! -f ${PREFIX}/etc/ntpd.conf ]; then \
 		${CP} -p ${EXAMPLESDIR}/ntpd.conf ${PREFIX}/etc; \
 	fi
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/openntpd/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	14 Aug 2004 17:06:01 -0000	1.2
+++ pkg-plist	1 Oct 2007 00:35:39 -0000
@@ -1,5 +1,4 @@
 @comment $FreeBSD: ports/net/openntpd/pkg-plist,v 1.2 2004/08/14 17:06:01 krion Exp $
-etc/rc.d/openntpd.sh
 sbin/ntpd
 @unexec if cmp -s %D/etc/ntpd.conf %D/%%EXAMPLESDIR%%/ntpd.conf; then rm -f %D/etc/ntpd.conf; fi
 %%EXAMPLESDIR%%/ntpd.conf
Index: files/openntpd.in
===================================================================
RCS file: files/openntpd.in
diff -N files/openntpd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/openntpd.in	1 Oct 2007 00:36:57 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/openntpd/files/openntpd.sh,v 1.2 2006/02/20 20:47:28 dougb Exp $
+#
+
+# PROVIDE: openntpd
+# REQUIRE: DAEMON
+# BEFORE:  LOGIN
+# KEYWORD: nojail
+
+. %%RC_SUBR%%
+
+name=openntpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/ntpd
+required_files=%%PREFIX%%/etc/ntpd.conf
+
+# set default
+openntpd_enable=${openntpd_enable:-"NO"}
+
+load_rc_config $name
+run_rc_command "$1"
Index: files/openntpd.sh
===================================================================
RCS file: files/openntpd.sh
diff -N files/openntpd.sh
--- files/openntpd.sh	20 Feb 2006 20:47:28 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/openntpd/files/openntpd.sh,v 1.2 2006/02/20 20:47:28 dougb Exp $
-#
-
-# PROVIDE: openntpd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-# KEYWORD: nojail
-
-. %%RC_SUBR%%
-
-name=openntpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/ntpd
-required_files=%%PREFIX%%/etc/ntpd.conf
-
-# set default
-openntpd_enable=${openntpd_enable:-"NO"}
-
-load_rc_config $name
-run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted: