svn commit: r543782 - head/misc/patchutils

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Jul 30 09:54:27 2020
New Revision: 543782
URL: https://svnweb.freebsd.org/changeset/ports/543782

Log:
  Remove CONFLICTS by renaming svndiff to svndiff.patchutils
  
  - Bump PORTREVISION for package change
  
  PR:		248293
  Submitted by:	swills

Modified:
  head/misc/patchutils/Makefile
  head/misc/patchutils/pkg-plist

Modified: head/misc/patchutils/Makefile
==============================================================================
--- head/misc/patchutils/Makefile	Thu Jul 30 09:54:22 2020	(r543781)
+++ head/misc/patchutils/Makefile	Thu Jul 30 09:54:27 2020	(r543782)
@@ -3,6 +3,7 @@
 
 PORTNAME=	patchutils
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://cyberelk.net/tim/data/patchutils/stable/
 
@@ -19,9 +20,8 @@ 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>

Modified: head/misc/patchutils/pkg-plist
==============================================================================
--- head/misc/patchutils/pkg-plist	Thu Jul 30 09:54:22 2020	(r543781)
+++ head/misc/patchutils/pkg-plist	Thu Jul 30 09:54:27 2020	(r543782)
@@ -14,7 +14,7 @@ bin/patchview
 bin/recountdiff
 bin/rediff
 bin/splitdiff
-bin/svndiff
+bin/svndiff.patchutils
 bin/svndiffview
 bin/unwrapdiff
 share/man/man1/combinediff.1.gz