<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/eba06cf90ccf3a436467f14856627ae44073fa6e">https://github.com/macports/macports-ports/commit/eba06cf90ccf3a436467f14856627ae44073fa6e</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 eba06cf90cc macutil: Use MacPorts flags; add universal variant
</span>eba06cf90cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eba06cf90ccf3a436467f14856627ae44073fa6e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Nov 16 14:48:51 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> macutil: Use MacPorts flags; add universal variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use MacPorts flags, including optimization flags and -arch flags. This
</span><span style='display:block; white-space:pre;color:#404040;'> lets us add a universal variant.
</span>---
sysutils/macutil/Portfile | 23 +++++++++++++++++------
sysutils/macutil/files/patch-crc-makefile.diff | 12 ++++++++++++
2 files changed, 29 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/Portfile b/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1dcf78394d3..e11c3a8cebd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/macutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,11 @@ PortSystem 1.0
</span>
name macutil
version 2.0b3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5cf3b22d8bdd3a8fa61211e7a0d598ebac9bbfe4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e31e4c11a711d8fa5bfadd3ceacb11dfa48c45758325d9302f271941d8a74d28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 167565
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
# Distributing original source is OK, but it's very unclear when it comes to derivative works
license Restrictive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +52,13 @@ distname ${name}${version}.shar
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 2994c01ce0cf86ef6e76e0d88b6c0f3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-hexbin-buffer.c patch-macunpack-lzh.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H
</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;'>+patchfiles patch-crc-makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hexbin-buffer.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macunpack-lzh.h
</span>
extract.suffix .Z
extract.cmd uncompress
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +67,11 @@ extract.post_args "| sh"
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CF="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.destdir BINDIR=${destroot}${prefix}/bin
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +82,3 @@ post-destroot {
</span> xinstall -m 644 -W ${worksrcpath} {*}[glob ${worksrcpath}/doc/*] \
README ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args CF="-DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/macutil/files/patch-crc-makefile.diff b/sysutils/macutil/files/patch-crc-makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b1152098736
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/macutil/files/patch-crc-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use the right compiler and flags when building makecrc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- crc/makefile.orig 2020-11-16 13:51:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ crc/makefile 2020-11-16 13:55:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./makecrc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makecrc: makecrc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cc -O -o makecrc makecrc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) -o makecrc makecrc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arc.o: arc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ccitt.o: ccitt.c
</span></pre><pre style='margin:0'>
</pre>