<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e435697755d41b541d21bc8919aa26a7ce724f9">https://github.com/macports/macports-ports/commit/9e435697755d41b541d21bc8919aa26a7ce724f9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9e43569 mandoc: rename files to not conflict with groff
</span>9e43569 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e435697755d41b541d21bc8919aa26a7ce724f9
</span>Author: Jan StarĂ½ <hans@stare.cz>
AuthorDate: Wed Apr 18 09:19:09 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> mandoc: rename files to not conflict with groff
</span>---
sysutils/groff/Portfile | 1 -
textproc/mandoc/Portfile | 10 ++++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/groff/Portfile b/sysutils/groff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7c4004..03f261e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/groff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/groff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ name groff
</span> version 1.22.3
revision 4
categories sysutils textproc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts mandoc
</span> platforms darwin
maintainers nomaintainer
license GPL-3+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/mandoc/Portfile b/textproc/mandoc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ca352c7..15c8e80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/mandoc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/mandoc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span>
name mandoc
version 1.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> description UNIX manpage compiler
homepage https://mandoc.bsd.lv/
categories textproc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts man groff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts man
</span> license ISC
maintainers {grimreaper @grimreaper} stare.cz:hans openmaintainer
platforms openbsd freebsd netbsd darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,12 @@ MANDIR="${prefix}/share/man"
</span> MANPATH_DEFAULT="${prefix}/share/man:/usr/local/share/man:/usr/share/man"
MANPATH_BASE="/usr/share/man"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The following files are in conflict with groff:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bin/soelim, share/man/man1/soelim.1.gz, share/man/man7/roff.7.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Rename them so that mandoc and groff can coexist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BINM_SOELIM="msoelim"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MANM_ROFF="mandoc_roff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> INSTALL_LIBMANDOC=0
BUILD_CGI=0
BUILD_CATMAN=0
</pre><pre style='margin:0'>
</pre>