<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/434330c6c82d69e1a009ac797381b4a62387d2bb">https://github.com/macports/macports-ports/commit/434330c6c82d69e1a009ac797381b4a62387d2bb</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 434330c libiconv: Update to 1.15
</span>434330c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 434330c6c82d69e1a009ac797381b4a62387d2bb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 3 19:33:53 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> libiconv: Update to 1.15
</span>---
textproc/libiconv/Portfile | 12 +++++-------
textproc/libiconv/files/patch-Makefile.devel | 8 ++++----
textproc/libiconv/files/patch-c99.diff | 8 ++++----
textproc/libiconv/files/patch-utf8mac.diff | 12 ++++++------
4 files changed, 19 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6c226e..7be48aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.15
</span> set cp932fix_version 1.13
set cp932fix_patchfile ${name}-${cp932fix_version}-cp932-devel.patch.gz
categories textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,11 @@ long_description \
</span> conversion.
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 be7d67e50d72ff067b2c0291311bc283add36965 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 87c36ba3f8ad1a49eb0d06f71856c856893bb52e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 35fc57cc9366bf09d9bbf6763d80d4a59ea14c2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 \
</span> ${cp932fix_patchfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8384da4114d62018b6bed2d8973237a423c1cbf1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 62852bd1cd22f0be0280c4f64bd6d256b4b00917
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 62852bd1cd22f0be0280c4f64bd6d256b4b00917 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7ac7133de0549316a98504ec1b50c751de69f8df91f99a92465a9eeb187f0147
</span>
depends_build port:gperf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +71,6 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant enable_cp932fix requires cp932fix description {Legacy compatibility variant} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant cp932fix description {Apply a patch to fix the conversion problem between Shift-JIS and Unicode (See Microsoft KB Q170559)} {
patchfiles-append ${cp932fix_patchfile}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/files/patch-Makefile.devel b/textproc/libiconv/files/patch-Makefile.devel
</span><span style='display:block; white-space:pre;color:#808080;'>index 21e641f..c1c4e76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/files/patch-Makefile.devel
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/files/patch-Makefile.devel
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.devel.orig 2009-06-21 06:17:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.devel 2010-01-20 19:17:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.devel 2017-01-01 17:00:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.devel 2017-02-03 19:30:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span> $(CC) $(CFLAGS) lib/genaliases.c -o genaliases
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ./genaliases > lib/aliases.gperf 3> canonical.sh 4> canonical_local.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./genaliases lib/aliases.gperf canonical.sh canonical_local.sh
</span> $(RM) genaliases
- $(GPERF) -m 10 lib/aliases.gperf > tmp.h
+ $(GPERF) lib/aliases.gperf > tmp.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/files/patch-c99.diff b/textproc/libiconv/files/patch-c99.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 55e8355..dea7a9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/files/patch-c99.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/files/patch-c99.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/iconv.c.orig 2011-01-29 11:28:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/iconv.c 2011-08-14 00:54:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/iconv.c 2016-11-19 10:09:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/iconv.c 2017-02-03 16:21:47.000000000 -0600
</span> @@ -176,7 +176,9 @@
#include "aliases2.h"
#undef S
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,5 +9,5 @@
</span> +static inline
+#elif defined(__GNUC__)
__inline
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const struct alias *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/files/patch-utf8mac.diff b/textproc/libiconv/files/patch-utf8mac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d58c1a1..b59b532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/files/patch-utf8mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/files/patch-utf8mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/converters.h 2009-06-21 06:17:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/converters.h 2010-01-20 19:54:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,6 +119,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/converters.h 2016-10-13 19:31:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/converters.h 2017-02-03 19:27:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,7 @@
</span> /* General multi-byte encodings */
#include "utf8.h"
#include "ucs2.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,9 +8,9 @@
</span> #include "ucs2be.h"
#include "ucs2le.h"
#include "ucs4.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/encodings.def 2009-06-12 01:19:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/encodings.def 2009-06-12 01:20:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +69,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/encodings.def 2014-01-02 16:23:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/encodings.def 2017-02-03 19:27:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +68,12 @@
</span> utf8)
#endif
</pre><pre style='margin:0'>
</pre>