Remove CONFLICTS by renaming svndiff to svndiff.patchutils
- Bump PORTREVISION for package change PR: 248293 Submitted by: swills
This commit is contained in:
parent
e07e785785
commit
e444ec818f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=543782
2 changed files with 3 additions and 3 deletions
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue