<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61627c173eca8ad53deeff95453e491b35744c2e">https://github.com/macports/macports-ports/commit/61627c173eca8ad53deeff95453e491b35744c2e</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 61627c173ec diffutils: fix bug with +universal variant (#18787)
</span>61627c173ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61627c173eca8ad53deeff95453e491b35744c2e
</span>Author: RobK88 <amtor@hotmail.com>
AuthorDate: Wed May 24 21:04:51 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> diffutils: fix bug with +universal variant (#18787)
</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/67475
</span><span style='display:block; white-space:pre;color:#404040;'> * Bump revision number
</span><span style='display:block; white-space:pre;color:#404040;'> * Add pre-configure{} code block to add the "--disable-year2038" configure flag for +universal builds
</span><span style='display:block; white-space:pre;color:#404040;'> * Change "configure.args" to "configure.args-append"
</span><span style='display:block; white-space:pre;color:#404040;'> * Add "--disable-silent-rules" flag to "configure.args-append"
</span><span style='display:block; white-space:pre;color:#404040;'> * Reformat Portfile
</span>---
sysutils/diffutils/Portfile | 75 ++++++++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/diffutils/Portfile b/sysutils/diffutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47d521a87df..2319eade6be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/diffutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/diffutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +1,31 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name diffutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name diffutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils textproc devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils textproc devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description GNU diff utilities
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- diffutils contains the GNU diff, diff3, sdiff, and cmp utilities. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Their features are a superset of the Unix features and they are \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- significantly faster.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description GNU diff utilities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description diffutils contains the GNU diff, diff3, sdiff, and cmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utilities. Their features are a superset of the Unix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ features and they are significantly faster.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.gnu.org/software/diffutils/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.gnu.org/software/diffutils/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnu
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 395b91c09409302f7e893ea362116737a3c01a01 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1624240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 395b91c09409302f7e893ea362116737a3c01a01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1624240
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
#------------------------------------------------------------------------------
# Avoid older Xcode Clang versions, which fail with errors like the following:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,20 +50,26 @@ use_xz yes
</span> # die (EXIT_TROUBLE, 0, "%s", _("write failed"));
# ^
#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { clang < 900 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append { clang < 900 }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:gettext
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext-runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gettext-runtime
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_system.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --program-prefix=g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src_system.h.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Bypass year 2038 awareness code that causes the universal variant to fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [variant_isset "universal"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-year2038
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --program-prefix=g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
post-patch {
# use older register names in 10.4 SDK https://trac.macports.org/ticket/66482
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +86,7 @@ platform darwin 10 {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span>
post-destroot {
xinstall -m 0755 -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +103,9 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://ftp.gnu.org/gnu/${name}/?C=M&O=D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://ftp.gnu.org/gnu/${name}/?C=M&O=D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span></pre><pre style='margin:0'>
</pre>