<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e742efeadc9428b49fa9370c427a08b5ff175715">https://github.com/macports/macports-ports/commit/e742efeadc9428b49fa9370c427a08b5ff175715</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 e742efeadc9 man: Use MP flags; fix implicit function; add deps
</span>e742efeadc9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e742efeadc9428b49fa9370c427a08b5ff175715
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 14 10:13:04 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> man: Use MP flags; fix implicit function; add deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the CFLAGS and LDFLAGS supplied by MacPorts, including optimization
</span><span style='display:block; white-space:pre;color:#404040;'> flags and -arch flags. Allows a universal variant to be used.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/23108
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit function declaration which prevents build with Xcode 12 and
</span><span style='display:block; white-space:pre;color:#404040;'> later.
</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/61446
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add deps on lynx and xz because it opportunistically uses them.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change the deps from _run to _lib because the configure script needs to
</span><span style='display:block; white-space:pre;color:#404040;'> see them at build time.
</span>---
sysutils/man/Portfile | 27 ++++++++++++++++-----------
sysutils/man/files/CFLAGS-LDFLAGS.patch | 32 ++++++++++++++++++++++++++++++++
sysutils/man/files/implicit.patch | 13 +++++++++++++
3 files changed, 61 insertions(+), 11 deletions(-)
<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 f56069b6b5f..df98f296cb6 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;'>@@ -4,7 +4,11 @@ PortSystem 1.0
</span>
name man
version 1.6g
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f1a845bcf454424f49a3281a86217af0328d88e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 256906
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +26,8 @@ patchfiles patch-configure \
</span> patch-configure-prepath \
patch-man2html_Makefile.in \
configure.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS-LDFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span> PR3845474.diff \
PR3857969.diff \
PR3939085.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +41,7 @@ patchfiles patch-configure \
</span> src__manpath.c.diff \
src__util.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 ba154d5796928b841c9c69f0ae376660 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 ef9e1f36a1a536a31112d52c3f39340900b0d3cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f1a845bcf454424f49a3281a86217af0328d88e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Doesn't work, see ticket #23108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete --disable-dependency-tracking
</span>
configure.args --mandir=${prefix}/share/man \
-compatibility_mode_for_colored_groff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +51,12 @@ configure.args --mandir=${prefix}/share/man \
</span> # sed: RE error: illegal byte sequence, #37189
build.env-append LC_ALL=C LANG=C
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span> port:groff \
port:gzip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:less \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lynx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz
</span>
post-destroot {
file delete ${destroot}${prefix}/share/locale
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,11 +68,13 @@ variant man_all_lang {
</span>
# if libxcselect is available, also add Xcode man pages to search path
if {${os.platform} eq "darwin" && ${os.major} >= 13} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant xcode description {Look up additional man pages installed by Xcode} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant xcode conflicts universal description {Look up additional man pages installed by Xcode} {
</span> patchfiles-append PR11291804-xcode.diff
build.env-append LIBS=-lxcselect
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin 9 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/man/files/CFLAGS-LDFLAGS.patch b/sysutils/man/files/CFLAGS-LDFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0278487b772
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/man/files/CFLAGS-LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use the CFLAGS and LDFLAGS that were set at configure time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-11-14 08:33:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-11-14 09:26:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1308,6 +1308,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@EXEEXT@,$EXEEXT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@BUILD_CC@,$BUILD_CC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@INSTALL@,$INSTALL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++s,@CFLAGS@,$CFLAGS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++s%@LDFLAGS@%$LDFLAGS%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@DEFS@,$DEFS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@LIBS@,$LIBS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s,@LIBOBJS@,$LIBOBJS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- man2html/Makefile.in.orig 2020-11-14 08:33:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ man2html/Makefile.in 2020-11-14 09:27:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEEXT = @EXEEXT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2010-12-31 14:28:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2020-11-14 09:28:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_CC = @BUILD_CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEEXT = @EXEEXT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/man/files/implicit.patch b/sysutils/man/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6262597799
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/man/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: implicitly declaring library function 'strcmp' with type 'int (const char *, const char *)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/makemsg.c.orig 2006-08-02 13:11:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/makemsg.c 2020-11-14 09:51:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __QNX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unix.h>
</span></pre><pre style='margin:0'>
</pre>