<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/5bfdf862e7475a9860ff41c9c707bbc0745213aa">https://github.com/macports/macports-ports/commit/5bfdf862e7475a9860ff41c9c707bbc0745213aa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5bfdf862e7475a9860ff41c9c707bbc0745213aa
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Aug 20 23:54:32 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> thttpd: Use our CFLAGS; fix implicit func decls
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65700
</span>---
net/thttpd/Portfile | 6 +++--
net/thttpd/files/CFLAGS.patch | 11 +++++++++
net/thttpd/files/implicit.patch | 31 +++++++++++++++++++++++++
net/thttpd/files/patch-Makefile.in.diff | 1 +
net/thttpd/files/patch-cgi-src-Makefile.in.diff | 1 +
net/thttpd/files/patch-extras-Makefile.in.diff | 1 +
6 files changed, 49 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/Portfile b/net/thttpd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28eed246076..fda79ab4c07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/thttpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span>
name thttpd
version 2.29
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description simple, small, portable, fast, and secure HTTP server
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,9 @@ depends_build port:libtool
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.in.diff \
</span> patch-cgi-src-Makefile.in.diff \
patch-extras-Makefile.in.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/files/CFLAGS.patch b/net/thttpd/files/CFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8fb714c8855
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/files/CFLAGS.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;'>+Use MacPorts CFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2014-08-11 14:14:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-08-20 23:51:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,6 +870,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V_CCOPT="-O2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++V_CCOPT="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -f .devel ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V_CCOPT="-g $V_CCOPT -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/files/implicit.patch b/net/thttpd/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9de16deda4a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</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 'puts' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'getpagesize' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'rand' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'umask' 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;'>+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 'read' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'unlink' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2014-08-11 14:14:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-08-20 23:47:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -913,7 +913,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.$ac_ext <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 915 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *__progname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts(__progname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2046,6 +2047,9 @@
</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 <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mman.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 <stdlib.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;'>+ /* This mess was copied from the GNU getpagesize.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_GETPAGESIZE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/files/patch-Makefile.in.diff b/net/thttpd/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 30c4c93901e..aa6c95a286e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/thttpd/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Support DESTDIR and do not specify the user or group when installing.
</span> --- Makefile.in.orig 2005-05-20 15:10:24.000000000 -0400
+++ Makefile.in 2014-10-01 17:05:59.000000000 -0400
@@ -103,6 +103,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/files/patch-cgi-src-Makefile.in.diff b/net/thttpd/files/patch-cgi-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e28e57b9618..112a1e59df3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/thttpd/files/patch-cgi-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/files/patch-cgi-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Support DESTDIR.
</span> --- cgi-src/Makefile.in.orig 2005-05-20 15:10:25.000000000 -0400
+++ cgi-src/Makefile.in 2014-10-01 17:12:40.000000000 -0400
@@ -67,17 +67,17 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/thttpd/files/patch-extras-Makefile.in.diff b/net/thttpd/files/patch-extras-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 067326c96e4..e8a04e853e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/thttpd/files/patch-extras-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/thttpd/files/patch-extras-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Support DESTDIR.
</span> --- extras/Makefile.in.orig 2005-05-20 15:10:25.000000000 -0400
+++ extras/Makefile.in 2014-10-01 17:24:06.000000000 -0400
@@ -66,18 +66,19 @@
</pre><pre style='margin:0'>
</pre>