3 files changed, 17 insertions, 38 deletions

diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile
index 71a515963fac..a7fafee1aec0 100644
--- a/net/cvsync/Makefile
+++ b/net/cvsync/Makefile
@@ -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,37 +16,26 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A portable CVS repository synchronization utility
 
 USE_GMAKE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	cvsyncd
+USE_OPENSSL=	yes
 
 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
+PORTDOCS=	COPYRIGHT ChangeLog FAQ TODO
+PORTEXAMPLES=	cvsync.conf cvsyncd-FreeBSD.conf \
+		cvsyncd-NetBSD.conf cvsyncd-OpenBSD.conf
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAKE_FLAGS=	OSVER="${OSVERSION}"
-
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL=	yes
-MAKE_FLAGS+=	HASH_TYPE=openssl
-.endif
-PLIST_SUB=	STARTUPDIR=${STARTUPDIR}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+MAKE_FLAGS=	OSVER="${OSVERSION}" HASH_TYPE=openssl
 
 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
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	cd ${WRKSRC}/samples && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/cvsync/files/cvsyncd.sh b/net/cvsync/files/cvsyncd.in
index 4f467f6c824a..ddfba1de8b8b 100644
--- a/net/cvsync/files/cvsyncd.sh
+++ b/net/cvsync/files/cvsyncd.in
@@ -20,23 +20,24 @@ load_rc_config ${name}
 case "${cvsyncd_flags}" in
 *-p\ *)
 	echo "Warning: \$cvsyncd_flags includes -p option." \
-		"Please use \$cvsyncd_pidfile instead."
+	    "Please use \$cvsyncd_pidfile instead."
 	;;
 *)
-	cvsyncd_flags="-p ${cvsyncd_pidfile} ${cvsyncd_flags}" ;;
+	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."
+	    "Please use \$cvsyncd_conffile instead."
 	;;
 *)
-	cvsyncd_flags="-c ${cvsyncd_conffile} ${cvsyncd_flags}" ;;
+	cvsyncd_flags="-c ${cvsyncd_conffile} ${cvsyncd_flags}"
+	;;
 esac
 
 pidfile=${cvsyncd_pidfile}
 required_files=${cvsyncd_conffile}
 
 run_rc_command "$1"
-
diff --git a/net/cvsync/pkg-plist b/net/cvsync/pkg-plist
index e96cc0be1118..638ec32c0769 100644
--- a/net/cvsync/pkg-plist
+++ b/net/cvsync/pkg-plist
@@ -6,14 +6,3 @@ bin/cvsync2cvsup
 bin/cvsyncd
 bin/rcscan
 bin/rcscmp
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/cvsync.conf
-%%EXAMPLESDIR%%/cvsyncd-FreeBSD.conf
-%%EXAMPLESDIR%%/cvsyncd-NetBSD.conf
-%%EXAMPLESDIR%%/cvsyncd-OpenBSD.conf
-%%STARTUPDIR%%/cvsyncd.sh
-@dirrm %%EXAMPLESDIR%%