ports/136843: [PATCH] net/cvsync: USE_RC_SUBR != yes

[Philip M. Gollucci]

>Number:         136843
>Category:       ports
>Synopsis:       [PATCH] net/cvsync: 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:02 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/cvsyncd.in

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

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

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

--- cvsync-0.24.19_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/cvsync/Makefile,v
retrieving revision 1.45
diff -u -u -r1.45 Makefile
--- Makefile	19 Sep 2005 17:13:33 -0000	1.45
+++ Makefile	17 Jul 2009 07:12:19 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsync
 PORTVERSION=	0.24.19
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.cvsync.org/pub/cvsync/ \
 		ftp://ftp.allbsd.org/pub/cvsync/
@@ -16,15 +16,13 @@
 COMMENT=	A portable CVS repository synchronization utility
 
 USE_GMAKE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	cvsyncd
 
 MAN1=		cvscan.1 cvsup2cvsync.1 cvsync.1 cvsync2cvsup.1 cvsyncd.1 \
 		rcscan.1 rcscmp.1
 DOCS=		doc/COPYRIGHT doc/ChangeLog doc/FAQ doc/TODO
 EXAMPLES=	samples/cvsync.conf samples/cvsyncd-FreeBSD.conf \
 		samples/cvsyncd-NetBSD.conf samples/cvsyncd-OpenBSD.conf
-STARTUPDIR=	etc/rc.d
-STARTUPFILES=	cvsyncd.sh
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_FLAGS=	OSVER="${OSVERSION}"
@@ -33,15 +31,8 @@
 USE_OPENSSL=	yes
 MAKE_FLAGS+=	HASH_TYPE=openssl
 .endif
-PLIST_SUB=	STARTUPDIR=${STARTUPDIR}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-install:
-.for file in ${STARTUPFILES}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${file} > ${WRKDIR}/${file}
-	${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/${STARTUPDIR}/${file}
-.endfor
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/cvsync/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist	11 May 2004 12:13:26 -0000	1.6
+++ pkg-plist	17 Jul 2009 07:12:19 -0000
@@ -15,5 +15,4 @@
 %%EXAMPLESDIR%%/cvsyncd-FreeBSD.conf
 %%EXAMPLESDIR%%/cvsyncd-NetBSD.conf
 %%EXAMPLESDIR%%/cvsyncd-OpenBSD.conf
-%%STARTUPDIR%%/cvsyncd.sh
 @dirrm %%EXAMPLESDIR%%
Index: files/cvsyncd.in
===================================================================
RCS file: files/cvsyncd.in
diff -N files/cvsyncd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/cvsyncd.in	17 Jul 2009 07:12:19 -0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/cvsync/files/cvsyncd.sh,v 1.3 2006/02/20 20:47:21 dougb Exp $
+#
+# PROVIDE: cvsyncd
+# REQUIRE: LOGIN
+#
+cvsyncd_enable=${cvsyncd_enable-"NO"}
+cvsyncd_pidfile=${cvsyncd_pidfile-"/var/run/cvsyncd.pid"}
+cvsyncd_conffile=${cvsyncd_conffile-"%%PREFIX%%/etc/cvsyncd.conf"}
+
+. %%RC_SUBR%%
+
+name=cvsyncd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config ${name}
+
+case "${cvsyncd_flags}" in
+*-p\ *)
+	echo "Warning: \$cvsyncd_flags includes -p option." \
+		"Please use \$cvsyncd_pidfile instead."
+	;;
+*)
+	cvsyncd_flags="-p ${cvsyncd_pidfile} ${cvsyncd_flags}" ;;
+esac
+
+case "${cvsyncd_flags}" in
+*-c\ *)
+	echo "Warning: \$cvsyncd_flags includes -c option." \
+		"Please use \$cvsyncd_conffile instead."
+	;;
+*)
+	cvsyncd_flags="-c ${cvsyncd_conffile} ${cvsyncd_flags}" ;;
+esac
+
+pidfile=${cvsyncd_pidfile}
+required_files=${cvsyncd_conffile}
+
+run_rc_command "$1"
+
Index: files/cvsyncd.sh
===================================================================
RCS file: files/cvsyncd.sh
diff -N files/cvsyncd.sh
--- files/cvsyncd.sh	20 Feb 2006 20:47:21 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/cvsync/files/cvsyncd.sh,v 1.3 2006/02/20 20:47:21 dougb Exp $
-#
-# PROVIDE: cvsyncd
-# REQUIRE: LOGIN
-#
-cvsyncd_enable=${cvsyncd_enable-"NO"}
-cvsyncd_pidfile=${cvsyncd_pidfile-"/var/run/cvsyncd.pid"}
-cvsyncd_conffile=${cvsyncd_conffile-"%%PREFIX%%/etc/cvsyncd.conf"}
-
-. %%RC_SUBR%%
-
-name=cvsyncd
-rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/${name}
-
-load_rc_config ${name}
-
-case "${cvsyncd_flags}" in
-*-p\ *)
-	echo "Warning: \$cvsyncd_flags includes -p option." \
-		"Please use \$cvsyncd_pidfile instead."
-	;;
-*)
-	cvsyncd_flags="-p ${cvsyncd_pidfile} ${cvsyncd_flags}" ;;
-esac
-
-case "${cvsyncd_flags}" in
-*-c\ *)
-	echo "Warning: \$cvsyncd_flags includes -c option." \
-		"Please use \$cvsyncd_conffile instead."
-	;;
-*)
-	cvsyncd_flags="-c ${cvsyncd_conffile} ${cvsyncd_flags}" ;;
-esac
-
-pidfile=${cvsyncd_pidfile}
-required_files=${cvsyncd_conffile}
-
-run_rc_command "$1"
-
--- cvsync-0.24.19_1.patch ends here ---

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