diff -ruN --exclude=CVS /usr/ports/devel/cvs2cl/Makefile /usr/ports/devel/cvs2cl.new/Makefile
--- /usr/ports/devel/cvs2cl/Makefile	2007-08-05 23:28:31.000000000 +0200
+++ /usr/ports/devel/cvs2cl.new/Makefile	2007-08-06 13:37:38.000000000 +0200
@@ -8,9 +8,11 @@
 PORTNAME=	cvs2cl
 PORTVERSION=	2.67
 CATEGORIES=	devel
-MASTER_SITES=	http://www.red-bean.com/cvs2cl/
+MASTER_SITES=	http://www.red-bean.com/cvs2cl/ \
+		http://www.sysfault.org/freebsd/${DIST_SUBDIR}/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.pl
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	mva@sysfault.org
@@ -29,8 +31,11 @@
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|exec ${PERL} -w -x|exec ${PERL} -w -x|" \
-		-e "s|#!${PERL} -w|#!${PERL} -w|" ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e "s|exec perl -w -x|exec ${PERL} -w -x|" \
+		-e "s|#!perl -w|#!${PERL} -w|" ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e \
+		"s|=item, B<--group-within-date>|=item B<--group-within-date>|" \
+		${WRKSRC}/${PORTNAME}
 
 do-install:
 	@pod2man ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.1
diff -ruN --exclude=CVS /usr/ports/devel/cvs2cl/distinfo /usr/ports/devel/cvs2cl.new/distinfo
--- /usr/ports/devel/cvs2cl/distinfo	2007-08-06 12:23:03.000000000 +0200
+++ /usr/ports/devel/cvs2cl.new/distinfo	2007-08-06 13:23:01.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (cvs2cl.pl) = cf85f85fdbb8d8d115895e955c46732c
-SHA256 (cvs2cl.pl) = c8762858a51a0ead8dcbc2bc566a5702267dc9a7285b4d0bb607a0ea7748732a
-SIZE (cvs2cl.pl) = 92626
+MD5 (cvs2cl/2.67/cvs2cl.pl) = cf85f85fdbb8d8d115895e955c46732c
+SHA256 (cvs2cl/2.67/cvs2cl.pl) = c8762858a51a0ead8dcbc2bc566a5702267dc9a7285b4d0bb607a0ea7748732a
+SIZE (cvs2cl/2.67/cvs2cl.pl) = 92626