FreeBSD Bugzilla – Attachment 216800 Details for
Bug 248293
misc/patchutils: avoid conflict with subversion
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch
patchutils-svndiffrename-rev0.diff (text/plain), 818 bytes, created by
Steve Wills
on 2020-07-27 13:12:20 UTC
(
hide
)
Description:
proposed patch
Filename:
MIME Type:
Creator:
Steve Wills
Created:
2020-07-27 13:12:20 UTC
Size:
818 bytes
patch
obsolete
>diff --git misc/patchutils/Makefile misc/patchutils/Makefile >index f97ca12147b2..4c8636f04361 100644 >--- misc/patchutils/Makefile >+++ misc/patchutils/Makefile >@@ -19,9 +19,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 misc/patchutils/pkg-plist misc/patchutils/pkg-plist >index e971714efa31..975f7479712a 100644 >--- misc/patchutils/pkg-plist >+++ 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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=216800">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 248293
: 216800