On 2021/07/29 13:50, Marc Espie wrote:
> Well, a lot of porters, myself included, have aliases and scripts to edit
> files that make use of the .orig suffix, so there will be a lot of individual
> churn in the second case.
>
> I expect rust to be a Special Needs language, so I'm not sure the second
> solution is worth it.
Some of these are rust, but most are not
cad/netgen/Makefile:27:PATCHORIG = .patch.orig
devel/angr/vex/Makefile:17:PATCHORIG = .pat.orig
devel/cbindgen/Makefile:77:PATCHORIG = .ports.orig
devel/electron/Makefile:46:PATCHORIG= .orig.port
devel/git/Makefile:102:PATCHORIG = .pat.orig
devel/rats/Makefile:21:PATCHORIG= .orig.port
editors/libreoffice/Makefile:277:PATCHORIG= .orig.port
editors/scintilla/Makefile:21:PATCHORIG= .orig.port
games/0ad/base/Makefile:55:PATCHORIG = .orig.port
games/libgdx/Makefile:44:PATCHORIG = .orig.port
games/vegastrike/engine/Makefile:20:PATCHORIG = .orig.port
lang/rust/Makefile:173:PATCHORIG = .openbsd.orig
mail/mlmmj/Makefile:22:PATCHORIG= .pat.orig
math/graphviz/Makefile:15:PATCHORIG= .orig2
net/bore/Makefile:18:PATCHORIG = .openbsd.orig
net/isc-dhcp/Makefile:17:PATCHORIG= .orig.port
print/ghostscript/gnu/Makefile:139:PATCHORIG= .pat.orig
security/fwbuilder/Makefile:27:PATCHORIG = .orig.port
security/hydra/Makefile:40:PATCHORIG= .orig.port
security/py-passlib/Makefile:22:PATCHORIG= .orig.port
security/sn0int/Makefile:38:PATCHORIG = .openbsd.orig
sysutils/bacula/Makefile:50:PATCHORIG= .orig.port
sysutils/flashrom/Makefile:29:PATCHORIG= .orig.port
textproc/latex2html/Makefile:16:PATCHORIG= .pat.orig
textproc/py-sphinx-notfound-page/Makefile:18:PATCHORIG =
.orig.port
textproc/ripgrep/Makefile:89:PATCHORIG = .openbsd.orig
textproc/tree-sitter/Makefile:123:PATCHORIG = .openbsd.orig
www/chromium/Makefile:51:PATCHORIG= .orig.port
www/httrack/Makefile:50:PATCHORIG = .ports.orig
www/iridium/Makefile:52:PATCHORIG= .orig.port
www/nextcloud_notify_push/Makefile:26:PATCHORIG = .openbsd.orig
www/tor-browser/browser/Makefile:16:PATCHORIG = .pat.orig
www/zola/Makefile:329:PATCHORIG = .openbsd.orig
x11/cegui/Makefile:9:PATCHORIG = .orig.port
x11/qt5/qtwebengine/Makefile:103:PATCHORIG= .orig.port
x11/tigervnc/Makefile:55:PATCHORIG= .orig.port
This is what I have now to deal with it, which works OK if I can run
it from the /usr/ports directory with a full path, but a lot of my real
world editing is done after "make patch" via "find . -name rej" in
wrksrc so the suffix isn't available easily. So a one-time change
that avoids the special cases would be quite welcome to me ..
function vibak {
local _orig=.orig
pwd|grep -q ^/usr/ports && [ -r distinfo ] && _orig=`make
show=PATCHORIG`
for i; do [ -f "$i$_orig" ] || doas -u _pbuild cp "$i" "$i$_orig";
done; doas -u _pbuild env HOME=/home/pbuild $EDITOR "$@" ; }
