Re: git: 79997380a6d1 - main - net-mgmt/tcpreplay: Update 4.5.1 => 4.5.2

29.08.2025 22:54, Vladimir Druzenko пишет:
> The branch main has been updated by vvd:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=79997380a6d165c777b75849cc64a0f499e87c23
>
> commit 79997380a6d165c777b75849cc64a0f499e87c23
> Author:     Martin Filla <freebsd@sysctl.cz>
Correct author is: mew14930xvi <mew14930xvi@inbox.lv>
Copy&paste from incorrect window/PR.
> AuthorDate: 2025-08-29 19:52:04 +0000
> Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
> CommitDate: 2025-08-29 19:52:04 +0000
>
>      net-mgmt/tcpreplay: Update 4.5.1 => 4.5.2
>      
>      Changelog:
>      https://github.com/appneta/tcpreplay/releases/tag/v4.5.2
>      
>      Switch from patch file to REINPLACE_CMD.
>      
>      PR:     289124
> ---
>   net-mgmt/tcpreplay/Makefile                        | 14 ++++++++++----
>   net-mgmt/tcpreplay/distinfo                        |  6 +++---
>   net-mgmt/tcpreplay/files/patch-Makefile.in         | 11 -----------
>   net-mgmt/tcpreplay/files/patch-lib_queue.h         | 18 ++++++++++++++++++
>   net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c | 15 ---------------
>   net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h | 13 -------------
>   6 files changed, 31 insertions(+), 46 deletions(-)
>
> diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
> index bfe73313f623..bc0869086eb6 100644
> --- a/net-mgmt/tcpreplay/Makefile
> +++ b/net-mgmt/tcpreplay/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	tcpreplay
> -DISTVERSION=	4.5.1
> +DISTVERSION=	4.5.2
>   CATEGORIES=	net-mgmt
>   MASTER_SITES=	https://github.com/appneta/${PORTNAME}/releases/download/v${DISTVERSION}/
>   
> @@ -23,10 +23,16 @@ CONFIGURE_ARGS=	--disable-libopts-install \
>   
>   TEST_TARGET=	test
>   
> -OPTIONS_DEFINE=			LIBPCAP_PORTS
> -LIBPCAP_PORTS_DESC=		Build with net/libpcap instead of from the base OS
> -# needs .so version (see: 262976)
> +OPTIONS_DEFINE=		LIBPCAP_PORTS
> +OPTIONS_DEFAULT=	LIBPCAP_PORTS
> +LIBPCAP_PORTS_DESC=	Build with net/libpcap instead of from the base OS
> +
> +# needs .so version (libpcap.so:net/libpcap uses libpcap from the base system)
>   LIBPCAP_PORTS_LIB_DEPENDS=	libpcap.so.1:net/libpcap
>   LIBPCAP_PORTS_CONFIGURE_OFF=	--with-libpcap=/usr/lib
>   
> +post-patch:
> +	@${REINPLACE_CMD} -e '/make test/s|make|${MAKE_CMD}|' \
> +		${WRKSRC}/Makefile.in
> +
>   .include <bsd.port.mk>
> diff --git a/net-mgmt/tcpreplay/distinfo b/net-mgmt/tcpreplay/distinfo
> index fc9e9a47463a..7675ec8b79ba 100644
> --- a/net-mgmt/tcpreplay/distinfo
> +++ b/net-mgmt/tcpreplay/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1721131125
> -SHA256 (tcpreplay-4.5.1.tar.xz) = 5126613f783062b43f514b05ad981376050a8fee35b03c8de4445ddeefd95049
> -SIZE (tcpreplay-4.5.1.tar.xz) = 809628
> +TIMESTAMP = 1756274419
> +SHA256 (tcpreplay-4.5.2.tar.xz) = 2df15bc6d49f96a77617d137049f998193bbae95c1a31b04ca02856a24cbf384
> +SIZE (tcpreplay-4.5.2.tar.xz) = 818824
> diff --git a/net-mgmt/tcpreplay/files/patch-Makefile.in b/net-mgmt/tcpreplay/files/patch-Makefile.in
> deleted file mode 100644
> index 9d6e23e9e94a..000000000000
> --- a/net-mgmt/tcpreplay/files/patch-Makefile.in
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- Makefile.in.orig	2024-07-12 17:15:27 UTC
> -+++ Makefile.in
> -@@ -900,7 +900,7 @@ test:
> -
> - test:
> - 	echo Making test in $(TEST_DIR)
> --	cd $(TEST_DIR) && make test
> -+	cd $(TEST_DIR) && gmake test
> -
> - dlt_names:
> - 	cat @SAVEFILE_C@ | $(top_builddir)/scripts/dlt2name.pl src/dlt_names.h
> diff --git a/net-mgmt/tcpreplay/files/patch-lib_queue.h b/net-mgmt/tcpreplay/files/patch-lib_queue.h
> new file mode 100644
> index 000000000000..8159c28745ae
> --- /dev/null
> +++ b/net-mgmt/tcpreplay/files/patch-lib_queue.h
> @@ -0,0 +1,18 @@
> +--- lib/queue.h.orig	2025-08-27 06:21:35 UTC
> ++++ lib/queue.h
> +@@ -36,7 +36,8 @@
> +  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
> +  */
> +
> +-#pragma once
> ++#ifndef	_SYS_QUEUE_H_
> ++#define	_SYS_QUEUE_H_
> +
> + /*
> +  * This file defines five types of data structures: singly-linked lists,
> +@@ -506,3 +507,5 @@ struct {								\
> + 	else								\
> + 		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
> + } while (0)
> ++
> ++#endif /* !_SYS_QUEUE_H_ */
> diff --git a/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c b/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c
> deleted file mode 100644
> index d4eb02fa98b1..000000000000
> --- a/net-mgmt/tcpreplay/files/patch-src_fragroute_mod.c
> +++ /dev/null
> @@ -1,15 +0,0 @@
> ---- src/fragroute/mod.c.orig	2023-12-31 18:39:02 UTC
> -+++ src/fragroute/mod.c
> -@@ -8,11 +8,11 @@
> -  */
> -
> - #include "mod.h"
> -+#include "lib/queue.h"
> - #include "defines.h"
> - #include "config.h"
> - #include "common.h"
> - #include "argv.h"
> --#include "lib/queue.h"
> - #include <ctype.h>
> - #include <stdio.h>
> - #include <stdlib.h>
> diff --git a/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h b/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h
> deleted file mode 100644
> index ec36392985f8..000000000000
> --- a/net-mgmt/tcpreplay/files/patch-src_fragroute_pkt.h
> +++ /dev/null
> @@ -1,13 +0,0 @@
> ---- src/fragroute/pkt.h.orig	2023-12-31 18:39:02 UTC
> -+++ src/fragroute/pkt.h
> -@@ -8,9 +8,9 @@
> -
> - #pragma once
> -
> -+#include "lib/queue.h"
> - #include "defines.h"
> - #include "config.h"
> --#include "lib/queue.h"
> - #include <sys/time.h>
> -
> - #ifdef HAVE_LIBDNET


-- 
Best regards,
Vladimir Druzenko