<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/4450a8c244fc0d06c187dff237f11fa3d8e78105">https://github.com/macports/macports-ports/commit/4450a8c244fc0d06c187dff237f11fa3d8e78105</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 4450a8c gindent: update version to 2.2.12
</span>4450a8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4450a8c244fc0d06c187dff237f11fa3d8e78105
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Sun Oct 20 12:07:09 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> gindent: update version to 2.2.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - bump version to 2.2.12
</span><span style='display:block; white-space:pre;color:#404040;'> - remove gperf.patch (already upstream)
</span><span style='display:block; white-space:pre;color:#404040;'> - strdup(3) require _XOPEN_SOURCE=600 on macOS
</span>---
devel/gindent/Portfile | 23 ++++++++++-------------
devel/gindent/files/gperf.patch | 29 -----------------------------
devel/gindent/files/strdup.patch | 11 +++++++++++
3 files changed, 21 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gindent/Portfile b/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb47aff..6432684 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name gindent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.12
</span> categories devel
platforms darwin
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,24 +24,21 @@ installs_libs no
</span>
master_sites debian:i/indent
distname indent_${version}.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 98beafca62472805a3739d3867d5d70f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9b242528bbc4914464117c69ffae9df24d3fa4a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b2e472fe85ce386fe61ab23f92242dad5184a08d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a511a8f069b11c1539add0b99077942022e33c2a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b745a5dfc68f86a483d7f96dc1cda7aafd1e78ecba3c7d8ad304709e91e1defb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 620280
</span>
worksrcdir indent-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Force build to regenerate gperf code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/src/gperf.c ${worksrcpath}/src/gperf-cc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles no-html.patch \
respect-docdir.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gperf.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strdup.patch
</span>
configure.args --docdir=${prefix}/share/doc/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --program-prefix=g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-prefix=g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dependency-tracking
</span>
post-destroot {
# Documentation.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +46,7 @@ post-destroot {
</span> ${destroot}${prefix}/share/info/gindent.info
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS COPYING NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTHORS COPYING NEWS \
</span> ${destroot}${prefix}/share/doc/${name}
# Extras in libexec/gnubin.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gindent/files/gperf.patch b/devel/gindent/files/gperf.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1ec2d3a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gindent/files/gperf.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gindent: Fix type incompatibility introduced with gperf 3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The patch is based on the idea proposed by gnw3. I tried this on a clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build with macports 2.4.1 on El Capitan 10.11.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The problem was introduced with gperf 3.1 resulting in a build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-failure for gindent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see: https://trac.macports.org/ticket/54466
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/lexi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===============================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lexi.c.orig 2017-08-27 18:33:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lexi.c 2017-08-27 18:35:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--templ_ty *is_reserved (const char *str, unsigned int len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+templ_ty *is_reserved (const char *str, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gperf.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--templ_ty *is_reserved_cc (register const char *str, register unsigned int len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+templ_ty *is_reserved_cc (register const char *str, register size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gperf-cc.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gindent/files/strdup.patch b/devel/gindent/files/strdup.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99e2025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gindent/files/strdup.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/args.c.orig 2019-10-20 13:04:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/args.c 2019-10-20 13:04:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * here as well. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _XOPEN_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define _XOPEN_SOURCE 500 /* strdup(3) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _XOPEN_SOURCE 600 /* strdup(3) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span></pre><pre style='margin:0'>
</pre>