<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/61344f51139982bcc031ea12e27dea57a003dc31">https://github.com/macports/macports-ports/commit/61344f51139982bcc031ea12e27dea57a003dc31</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 61344f51139 convertlit: Fix some implicit function declarations
</span>61344f51139 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61344f51139982bcc031ea12e27dea57a003dc31
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 6 18:19:53 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> convertlit: Fix some implicit function declarations
</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/61278
</span>---
textproc/convertlit/Portfile | 29 ++++----
textproc/convertlit/files/implicit.patch | 81 ++++++++++++++++++++++
.../convertlit/files/patch-clit-hexdump.c.diff | 10 ---
3 files changed, 96 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/convertlit/Portfile b/textproc/convertlit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5971d3e792..b3808356859 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/convertlit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/convertlit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,14 @@ PortSystem 1.0
</span> name convertlit
version 1.8
revision 2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6104a7d951ed60ea73705e401be8b55633ea2d47 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 135120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set my_version [strsed ${version} {g/\.//}]
categories textproc
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2
description converts Microsoft Reader eBooks into open format
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +27,6 @@ master_sites ${homepage}
</span> distname ${name}${my_version}src
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 0fa9aead468bd8640c49374d46d78d2a3e79489f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6104a7d951ed60ea73705e401be8b55633ea2d47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:libtommath
extract.mkdir yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +35,17 @@ post-extract {
</span> copy ${filespath}/Makefile ${worksrcpath}
# DOS to UNIX line endings so we can patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\r||g" ${worksrcpath}/clit/Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|\r||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clit/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clit/drm5.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clit/explode.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clit/manifest.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/newlzx/lzxglue.c
</span> }
patchfiles patch-clit-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-clit-hexdump.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span> patch-lib-Makefile.diff
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,20 +53,15 @@ use_configure no
</span> configure.cppflags-append -I${prefix}/include/libtommath
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archflags ${configure.universal_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archflags ${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} ${archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc} [get_canonical_archflags]" \
</span> CPPFLAGS="${configure.cppflags}" \
LDFLAGS="${configure.ldflags}"
destroot {
xinstall ${worksrcpath}/clit/clit ${destroot}${prefix}/bin
xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/convertlit/files/implicit.patch b/textproc/convertlit/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..badd93b9377
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/convertlit/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicitly declaring library function 'isalnum' with type 'int (int)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicitly declaring library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicitly declaring library function 'memset' with type 'void *(void *, int, unsigned long)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicit declaration of function 'mkdir' is invalid in C99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicitly declaring library function 'strcmp' with type 'int (const char *, const char *)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/display.c.orig 2004-07-02 07:19:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/display.c 2020-10-06 18:09:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "litlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void hexdump( unsigned char * ptr, int size );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/drm5.c.orig 2004-07-04 16:19:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/drm5.c 2020-10-06 18:16:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Note that the July 4th update added only a trivial amount of complexity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to this process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <ctype.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 <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/explode.c.orig 2004-07-04 06:33:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/explode.c 2020-10-06 18:11:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.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 "clit.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "litlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "manifest.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/hexdump.c.orig 2004-05-14 23:09:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/hexdump.c 2010-11-01 17:46:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned char byte;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/manifest.c.orig 2004-07-04 06:02:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/manifest.c 2020-10-06 18:02:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "litlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "manifest.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clit/transmute.c.orig 2003-07-05 19:40:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clit/transmute.c 2020-10-06 18:01:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "litlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char * writingFilename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/newlzx/lzxglue.c.orig 2004-07-04 09:38:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/newlzx/lzxglue.c 2020-10-06 18:13:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "litlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mspack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "lzx.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/convertlit/files/patch-clit-hexdump.c.diff b/textproc/convertlit/files/patch-clit-hexdump.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 060ad640a61..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/convertlit/files/patch-clit-hexdump.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- clit/hexdump.c.orig 2004-05-14 23:09:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ clit/hexdump.c 2010-11-01 17:46:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned char byte;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>