diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-07-30 09:54:27 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-07-30 09:54:27 +0000 |
| commit | e444ec818f005159f777795405bef3ff5e800398 (patch) | |
| tree | 91668d564869910df6dc9365803c2da38a264ac7 /misc/patchutils | |
| parent | e07e785785a333601789729fa0178c38d7c11159 (diff) | |
| download | ports-e444ec818f005159f777795405bef3ff5e800398.tar.gz ports-e444ec818f005159f777795405bef3ff5e800398.zip | |
Remove CONFLICTS by renaming svndiff to svndiff.patchutils
- Bump PORTREVISION for package change
PR: 248293
Submitted by: swills
Notes
Notes:
svn path=/head/; revision=543782
Diffstat (limited to 'misc/patchutils')
| -rw-r--r-- | misc/patchutils/Makefile | 4 | ||||
| -rw-r--r-- | misc/patchutils/pkg-plist | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile index f97ca12147b2..91f3127f73a4 100644 --- a/misc/patchutils/Makefile +++ b/misc/patchutils/Makefile @@ -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> diff --git a/misc/patchutils/pkg-plist b/misc/patchutils/pkg-plist index e971714efa31..975f7479712a 100644 --- a/misc/patchutils/pkg-plist +++ b/misc/patchutils/pkg-plist @@ -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 |