<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/20874e9a5ff906001893ff058bacc54a8f1b1587">https://github.com/macports/macports-ports/commit/20874e9a5ff906001893ff058bacc54a8f1b1587</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20874e9a5ff906001893ff058bacc54a8f1b1587
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 11 20:21:09 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> epwutil: Fix implicit declaration of functions
</span>---
textproc/epwutil/Portfile | 8 ++---
.../{patch-catdump-getline.diff => getline.patch} | 13 ++------
textproc/epwutil/files/implicit.patch | 36 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/epwutil/Portfile b/textproc/epwutil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b2b0ee2778..198af7d47e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/epwutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/epwutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name epwutil
version 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories textproc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {amake @amake} openmaintainer
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +27,15 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-catdump-getline.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles getline.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
build.args CC="${configure.cc} [get_canonical_archflags cc]"
build.cmd make -f makefile.unx
pre-build {
foreach fileName [glob ${build.dir}/*.c] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exec iconv -f euc-jp -t utf-8 $fileName > $fileName-fixed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "iconv -f euc-jp -t utf-8 [shellescape ${fileName}] > [shellescape ${fileName}-fixed]"
</span> file rename -force $fileName-fixed $fileName
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/epwutil/files/patch-catdump-getline.diff b/textproc/epwutil/files/getline.patch
</span>similarity index 90%
rename from textproc/epwutil/files/patch-catdump-getline.diff
rename to textproc/epwutil/files/getline.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3f9578c0f3a..1e6aed5786d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/epwutil/files/patch-catdump-getline.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/epwutil/files/getline.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,8 @@ Date: Sat, 9 Jan 2010 20:40:44 +0200
</span> Subject: [PATCH] Rename getline() to getline2() to avoid clash
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
<span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catdump.c | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 files changed, 6 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/catdump.c b/catdump.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b40bb27..8874db8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/catdump.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/catdump.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- catdump.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ catdump.c
</span> @@ -201,7 +201,7 @@ void outhex();
void outstr();
void outjstr();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +60,3 @@ index b40bb27..8874db8 100644
</span> uchr *buf;
FILE *fp;
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1.6.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/epwutil/files/implicit.patch b/textproc/epwutil/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..18880a4128a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/epwutil/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'close' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'hex' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'isatty' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'read' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'write' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bookinfo.c.orig 2022-01-11 20:16:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bookinfo.c 2022-01-11 20:18:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uchr *dsplist();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uchr *dspstyle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uchr *idxinfo();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int hex();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(ac, av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- catdump.c.orig 2022-01-11 20:13:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ catdump.c 2022-01-11 20:15:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned char uchr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- squeeze.c.orig 2000-04-13 02:45:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ squeeze.c 2022-01-11 13:44:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "epw.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span></pre><pre style='margin:0'>
</pre>