<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/347c9f3b0e7e91162dd659a066039c1fa63da067">https://github.com/macports/macports-ports/commit/347c9f3b0e7e91162dd659a066039c1fa63da067</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 347c9f3b0e7 httping: update to 3.6, use cmake PG
</span>347c9f3b0e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 347c9f3b0e7e91162dd659a066039c1fa63da067
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Fri May 10 16:36:26 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> httping: update to 3.6, use cmake PG
</span>---
net/httping/Portfile | 28 +++++++++++----------------
net/httping/files/LOCALEDIR.patch | 35 ----------------------------------
net/httping/files/patch-configure.diff | 23 ----------------------
net/httping/files/patch-tcp.c.diff | 20 +++++++++++++++++++
net/httping/files/unistd.patch | 13 -------------
5 files changed, 31 insertions(+), 88 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/httping/Portfile b/net/httping/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b377559736c..12fe28623c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/httping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/httping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup folkertvanheusden HTTPing 2.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup folkertvanheusden HTTPing 3.6 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 49891c45e04e92aa83ea22038ea1c32b55f04c59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 37da3c89b917611d2ff81e2f6c9e9de39d160ef0ca2cb6ffec0bebcb9b45ef5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 83674
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8b6bc14a6d09461ef7dea606d7a2059ea6b12284 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d332fc5436bcf8290bcb4fe75b7019b90facfb64264dc3c7bc3407da27c18d77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 83122
</span>
name httping
categories net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,18 +34,11 @@ depends_lib port:fftw-3 \
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append unistd.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append LOCALEDIR.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-tcp.c.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-fftw3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lintl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DCMAKE_EXE_LINKER_FLAGS="-lintl"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args {*}${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/build/httping ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/httping.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/httping/files/LOCALEDIR.patch b/net/httping/files/LOCALEDIR.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6631044ea17..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/httping/files/LOCALEDIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2022-10-29 14:34:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2023-05-31 15:10:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET=httping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LOCALEDIR=/usr/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX?=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LOCALEDIR=$(PREFIX)/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WFLAGS=-Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +40,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS+=-lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PACKAGE=$(TARGET)-$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX?=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR=$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDIR=$(PREFIX)/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOCDIR=$(PREFIX)/share/doc/$(TARGET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,10 +121,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(NO_GETTEXT),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(LOCALEDIR)/nl/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp nl.mo $(DESTDIR)$(LOCALEDIR)/nl/LC_MESSAGES/httping.mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(LOCALEDIR)/ru/LC_MESSAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp ru.mo $(DESTDIR)$(LOCALEDIR)/ru/LC_MESSAGES/httping.mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/httping/files/patch-configure.diff b/net/httping/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03369ea71a3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/httping/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-10-29 14:34:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-05-31 14:56:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #! /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FILE=`mktemp`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FILE2=`mktemp`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TMPDIR="${TMPDIR:-/tmp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FILE="`mktemp "$TMPDIR/httping.XXXXXX"`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FILE2="`mktemp "$TMPDIR/httping.XXXXXX"`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo \*\*\* HTTPing v`grep VERSION version | cut -d = -f 2` configure script \*\*\*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,6 +87,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- > makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "CC=$CC" >> makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "CFLAGS=$CFLAGS" >> makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "LDFLAGS=$LDFLAGS" >> makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $NC >> makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $SSL >> makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $TFO >> makefile.inc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/httping/files/patch-tcp.c.diff b/net/httping/files/patch-tcp.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dae5b57d87d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/httping/files/patch-tcp.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tcp.c.orig 2024-05-08 01:54:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tcp.c 2024-05-10 16:16:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,14 +161,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* connect to peer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tfo && *tfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #if defined(__FreeBSD__) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int enable = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setsockopt(fd, IPPROTO_TCP, TCP_FASTOPEN, &enable, sizeof(enable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = sendto(fd, msg, msg_len, 0, ai->ai_addr, ai->ai_addrlen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = sendto(fd, msg, msg_len, MSG_FASTOPEN, ai -> ai_addr, ai -> ai_addrlen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rc == msg_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *msg_accepted = 1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/httping/files/unistd.patch b/net/httping/files/unistd.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2f88e3ca4c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/httping/files/unistd.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: unknown type name 'useconds_t'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/folkertvanheusden/HTTPing/commit/aad3c275686344fe9a235faeac4ee3832f3aa8d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nc.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +8,7 @@
</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;'>- #include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ncurses.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>