<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/ccdb2539719d5d9eef5ef4b3adbdb82dc01a9af7">https://github.com/macports/macports-ports/commit/ccdb2539719d5d9eef5ef4b3adbdb82dc01a9af7</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 ccdb253 libiconv: No longer use -p1 for patches
</span>ccdb253 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ccdb2539719d5d9eef5ef4b3adbdb82dc01a9af7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 24 06:12:46 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> libiconv: No longer use -p1 for patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is no longer needed now that the cp932fix patch is gone.
</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/58523
</span>---
textproc/libiconv/Portfile | 2 --
textproc/libiconv/files/patch-Makefile.devel | 6 +++---
textproc/libiconv/files/patch-c99.diff | 4 ++--
textproc/libiconv/files/patch-src-Makefile.in-darwin.diff | 4 ++--
textproc/libiconv/files/patch-utf8mac.diff | 12 ++++++------
5 files changed, 13 insertions(+), 15 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 eec78c5..6dc7dec 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;'>@@ -28,8 +28,6 @@ long_description \
</span>
depends_build port:gperf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use -p1 to accommodate the cp932fix patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span> patchfiles \
patch-src-Makefile.in-darwin.diff \
patch-c99.diff
<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 c1c4e76..21809b7 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.devel 2017-01-01 17:00:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.devel 2017-02-03 19:30:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.devel.orig 2019-04-26 14:00:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.devel 2019-06-24 06:10:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +118,7 @@
</span> $(CC) $(CFLAGS) lib/genaliases.c -o genaliases
./genaliases lib/aliases.gperf canonical.sh canonical_local.sh
$(RM) genaliases
<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 dea7a9c..04c2dcf 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 2016-11-19 10:09:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/iconv.c 2017-02-03 16:21:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/iconv.c.orig 2016-11-19 10:09:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 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;color:#808080;'>diff --git a/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff b/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bd11d04..206b2ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/files/patch-src-Makefile.in-darwin.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/src/Makefile.in.orig 2009-06-21 06:17:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Makefile.in 2010-01-20 19:07:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2009-06-21 06:17:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2010-01-20 19:07:40.000000000 -0600
</span> @@ -113,6 +113,7 @@
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
<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 b59b532..f82c27a 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/converters.h 2016-10-13 19:31:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/converters.h 2017-02-03 19:27:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/converters.h.orig 2016-10-13 19:31:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/converters.h 2017-02-03 19:27:47.000000000 -0600
</span> @@ -122,6 +122,7 @@
/* General multi-byte encodings */
#include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@
</span> #include "ucs2be.h"
#include "ucs2le.h"
#include "ucs4.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/encodings.def 2014-01-02 16:23:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/encodings.def 2017-02-03 19:27:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/encodings.def.orig 2014-01-02 16:23:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/encodings.def 2017-02-03 19:27:47.000000000 -0600
</span> @@ -68,6 +68,12 @@
utf8)
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,8 @@
</span> DEFENCODING(( "UCS-2", /* glibc */
"ISO-10646-UCS-2", /* IANA */
"csUnicode", /* IANA */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/utf8mac.h 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/utf8mac.h 2007-11-13 17:42:39.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/utf8mac.h.orig 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/utf8mac.h 2007-11-13 17:42:39.000000000 +0900
</span> @@ -0,0 +1,1608 @@
+/*
+ * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
</pre><pre style='margin:0'>
</pre>