<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fbfb16992a0a46d6a3d6f10c04ee0ba06a514734">https://github.com/macports/macports-ports/commit/fbfb16992a0a46d6a3d6f10c04ee0ba06a514734</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fbfb16992a0a46d6a3d6f10c04ee0ba06a514734
</span>Author: Austin Ziegler <austin@zieglers.ca>
AuthorDate: Wed Nov 29 23:45:30 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> moar: Add +pager variant to install as moar-pager
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This implements the alternative route described in trac:68491 to enable
</span><span style='display:block; white-space:pre;color:#404040;'> a compatibility workaround to use both textproc/moar and lang/MoarVM
</span><span style='display:block; white-space:pre;color:#404040;'> since they both wish to install `moar` binaries.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously, #20930 marked moar and MoarVM as mutually conflicting. This
</span><span style='display:block; white-space:pre;color:#404040;'> conflict state remains, but a new `+pager` variant is added which
</span><span style='display:block; white-space:pre;color:#404040;'> installs `textproc/moar` as `moar-pager`. The manpage is also installed
</span><span style='display:block; white-space:pre;color:#404040;'> as `moar-pager.1` and the contents are patched to reflect the updated
</span><span style='display:block; white-space:pre;color:#404040;'> name.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This variant *removes* the `MoarVM` conflict marker.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68491
</span>---
textproc/moar/Portfile | 19 ++++++++--
textproc/moar/files/patch-moar-1.diff | 70 +++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/moar/Portfile b/textproc/moar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2886d6df1f7..08a4672bf13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/moar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/moar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup golang 1.0
</span> go.setup github.com/walles/moar 1.18.5 v
go.offline_build no
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
conflicts MoarVM
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +29,26 @@ maintainers {gmail.com:j.lopez.r @jlopezr} \
</span> {gmail.com:herby.gillot @herbygillot} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set install_name ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pager description {Install as moar-pager} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set install_name ${name}-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete MoarVM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-moar-1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.pre_args-append \
-ldflags \"-X main.versionString=${version}\"
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/${install_name}
</span>
xinstall -d ${destroot}${prefix}/share/man/man1
xinstall -m 0644 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1/${install_name}.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The pager variant is compatible with MoarVM for raku and nqp development.
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/moar/files/patch-moar-1.diff b/textproc/moar/files/patch-moar-1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e169036e8e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/moar/files/patch-moar-1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- moar.1.orig 2023-11-29 23:08:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ moar.1 2023-11-29 23:09:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,23 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.TH MOAR 1 2022-07-21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.TH MOAR-PAGER 1 2022-07-21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-moar \- the nice pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++moar-pager \- the nice pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH SYNOPSIS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IR file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B "moar \-\-help"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B "moar-pager \-\-help"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B "moar \-\-version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B "moar-pager \-\-version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH DESCRIPTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is a pager much like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .I less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (1), but with generally nicer out-of-the-box behavior.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ More information and screenshots: https://github.com/walles/moar#readme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Inside of \fBmoar\fR, press
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Inside of \fBmoar-pager\fR, press
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to access the built-in help.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ environment variable for persistent configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Doing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B moar --help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B moar-pager --help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ will also list these options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-\-colors\fR={\fBauto\fR | \fB8\fR | \fB16\fR | \fB256\fR | \fB16M\fR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B tail \-f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-\-no\-clear\-on\-exit\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Retain screen contents when exiting moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Retain screen contents when exiting moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-\-no\-linenumbers\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Hide line numbers on startup, press left arrow key to show
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,15 +101,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B 1234
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH ENVIRONMENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Having
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B PAGER=moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B PAGER=moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in your environment will make lots of different programs use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as their pager.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Additional options are read from the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B MOAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ environment variable if set, just as if those same options had been manually added to each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B moar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B moar-pager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ invocation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH BUGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Kindly report any bugs here: https://github.com/walles/moar/issues
</span></pre><pre style='margin:0'>
</pre>