<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4b3ca56da01f0670e37c4b339f81348b62e952b">https://github.com/macports/macports-ports/commit/f4b3ca56da01f0670e37c4b339f81348b62e952b</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 f4b3ca5 mandoc man groff: Update conflicts between them. - mandoc: remove a pointless -nonewline - mandoc: put CC before CFLAGS and LDFLAGS
</span>f4b3ca5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4b3ca56da01f0670e37c4b339f81348b62e952b
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Fri Aug 11 09:22:03 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> mandoc man groff: Update conflicts between them.
</span><span style='display:block; white-space:pre;color:#404040;'> - mandoc: remove a pointless -nonewline
</span><span style='display:block; white-space:pre;color:#404040;'> - mandoc: put CC before CFLAGS and LDFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53902
</span>---
sysutils/groff/Portfile | 1 -
sysutils/man/Portfile | 2 +-
textproc/mandoc/Portfile | 5 +++--
3 files changed, 4 insertions(+), 4 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 6c66ca2..e9ad6ae 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;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
name groff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts mdocml
</span> version 1.22.3
revision 2
categories sysutils textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/man/Portfile b/sysutils/man/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index faa7ee1..2d53fae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/man/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/man/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ revision 1
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts man2html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts man2html mandoc
</span> license GPL-2
description The man page suite containing man, apropos, whatis, man2html
long_description The man page suite (man, apropos, and whatis) contains \
<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 a146824..1f93eaa 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;'>@@ -7,6 +7,7 @@ version 1.14.1
</span> description UNIX manpage compiler
homepage http://mdocml.bsd.lv/
categories textproc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts man
</span> license ISC
maintainers eitanadler.com:lists stare.cz:hans openmaintainer
platforms openbsd freebsd netbsd darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +60,7 @@ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span> } ]
set fd [open "${filename}" "w"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts -nonewline "${fd}" "${content}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts "${fd}" "${content}"
</span> close "${fd}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +71,6 @@ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span> # Kudos to jmr and ryandesign for explaining that.
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc}"
</span> build.env CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc}"
</span></pre><pre style='margin:0'>
</pre>