Index: head/misc/patchutils/Makefile
===================================================================
--- head/misc/patchutils/Makefile	(revision 543781)
+++ head/misc/patchutils/Makefile	(revision 543782)
@@ -1,27 +1,27 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	patchutils
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://cyberelk.net/tim/data/patchutils/stable/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small collection of programs that operate on patch files
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		perl5 python:run shebangfix tar:xz
 
 SHEBANG_FILES=	patchview/gitdiff scripts/*.in
 
 GNU_CONFIGURE=	yes
 
-CONFLICTS=	devel/subversion
-
 post-install:
+	${MV} ${STAGEDIR}${PREFIX}/bin/svndiff ${STAGEDIR}${PREFIX}/bin/svndiff.patchutils
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
Index: head/misc/patchutils/pkg-plist
===================================================================
--- head/misc/patchutils/pkg-plist	(revision 543781)
+++ head/misc/patchutils/pkg-plist	(revision 543782)
@@ -1,34 +1,34 @@
 bin/combinediff
 bin/dehtmldiff
 bin/editdiff
 bin/espdiff
 bin/filterdiff
 bin/fixcvsdiff
 bin/flipdiff
 bin/gitdiff
 bin/gitdiffview
 bin/grepdiff
 bin/interdiff
 bin/lsdiff
 bin/patchview
 bin/recountdiff
 bin/rediff
 bin/splitdiff
-bin/svndiff
+bin/svndiff.patchutils
 bin/svndiffview
 bin/unwrapdiff
 share/man/man1/combinediff.1.gz
 share/man/man1/dehtmldiff.1.gz
 share/man/man1/editdiff.1.gz
 share/man/man1/espdiff.1.gz
 share/man/man1/filterdiff.1.gz
 share/man/man1/fixcvsdiff.1.gz
 share/man/man1/flipdiff.1.gz
 share/man/man1/grepdiff.1.gz
 share/man/man1/interdiff.1.gz
 share/man/man1/lsdiff.1.gz
 share/man/man1/patchview.1.gz
 share/man/man1/recountdiff.1.gz
 share/man/man1/rediff.1.gz
 share/man/man1/splitdiff.1.gz
 share/man/man1/unwrapdiff.1.gz