Index: head/devel/cvs2svn/Makefile
===================================================================
--- head/devel/cvs2svn/Makefile	(revision 457690)
+++ head/devel/cvs2svn/Makefile	(revision 457691)
@@ -1,81 +1,75 @@
 # Created by: Hye-Shik Chang
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
-PORTVERSION=	2.4.0
-PORTREVISION=	5
+PORTVERSION=	2.5.0
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/49237/ \
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/49543/ \
 		LOCAL/ohauer
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
-PATCH_SITES=	LOCAL/ohauer
-
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
 		cvs:devel/cvs
-
-# 2.4.0 -> svn r5392
-PATCHREV=	5433
 
 USES=			shebangfix python:2.7
 USE_PYTHON=		distutils autoplist
 NO_ARCH=		yes
 
 SHEBANG_FILES=		cvs2svn cvs2git cvs2bzr *.py \
 			contrib/* cvs2svn_lib/*.py \
 			svntest/* cvs2svn_rcsparse/*.py
 
 OPTIONS_MULTI=		SCM
 OPTIONS_MULTI_SCM=	SUBVERSION GIT BAZAAR
 OPTIONS_DEFAULT=	SUBVERSION
 
 SUBVERSION_DESC=	Build with subversion support
 GIT_DESC=		Build with git support
 BAZAAR_DESC=		Build with Bazaar support
 
 SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR}
 GIT_RUN_DEPENDS=	${LOCALBASE}/bin/git:devel/git
 BAZAAR_RUN_DEPENDS=	${LOCALBASE}/bin/bzr:devel/bzr
 
 # documents from ${WRKSRC}/doc
 DOCS1=		design-notes.txt making-releases.txt \
 		revision-reader.txt symbol-notes.txt
 
 # documents from ${WRKSRC}/www
 DOCS2=		cvs2bzr.html cvs2git.html cvs2svn.html \
 		faq.html features.html index.html issue_tracker.html \
 		project_license.html project_tools.html
 
 PORTDOCS:=	${DOCS1} ${DOCS2}
 
 PORTEXAMPLES=	cvs2bzr-example.options cvs2git-example.options \
 		cvs2hg-example.options cvs2svn-example.options
 
 MANPAGES=	cvs2svn.1.gz \
 		cvs2git.1.gz \
 		cvs2bzr.1.gz
 
 PLIST_FILES+=	${MANPAGES:S|^|man/man1/|}
 
 post-patch:
 # be consistent with PORTVERSION
 	@${REINPLACE_CMD} -e 's|2.5.0-dev|2.4.0|' \
 		${WRKSRC}/PKG-INFO \
 		${WRKSRC}/cvs2svn_lib/version.py
 
 post-build:
 	${MAKE} man -C ${WRKSRC}
 
 post-install:
 	@${INSTALL_MAN} ${MANPAGES:R:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DOCS1:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DOCS2:S|^|${WRKSRC}/www/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/devel/cvs2svn/distinfo
===================================================================
--- head/devel/cvs2svn/distinfo	(revision 457690)
+++ head/devel/cvs2svn/distinfo	(revision 457691)
@@ -1,4 +1,3 @@
-SHA256 (cvs2svn-2.4.0.tar.gz) = a6677fc3e7b4374020185c61c998209d691de0c1b01b53e59341057459f6f116
-SIZE (cvs2svn-2.4.0.tar.gz) = 514891
-SHA256 (cvs2svn-2.4.0-r5433.diff.bz2) = a20d854df3c3cbd6a554e99fd7f9bf33dab7520e577ca04dacd20b08a40a7c9f
-SIZE (cvs2svn-2.4.0-r5433.diff.bz2) = 57278
+TIMESTAMP = 1511674397
+SHA256 (cvs2svn-2.5.0.tar.gz) = 6409d118730722f439760d41c08a5bfd05e5d3ff4a666050741e4a5dc2076aea
+SIZE (cvs2svn-2.5.0.tar.gz) = 539332