net/pkt-gen: Update to g2023.03.22

PR:		270440
Reported by:	Jose Luis Duran <jlduran@gmail.com>

7 files changed, 5 insertions, 64 deletions

diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile
index 04715383397c..c5e022560ced 100644
--- a/net/pkt-gen/Makefile
+++ b/net/pkt-gen/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pkt-gen
-PORTVERSION=	g2022.02.10
+PORTVERSION=	g2023.03.22
 CATEGORIES=	net
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -12,7 +12,7 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	luigirizzo
 GH_PROJECT=	netmap
-GH_TAGNAME=	278045b
+GH_TAGNAME=	0a53f85
 MAKEFILE=	GNUmakefile
 
 OPTIONS_DEFINE=	PCAP
diff --git a/net/pkt-gen/distinfo b/net/pkt-gen/distinfo
index 289aa5851c44..0dae43868930 100644
--- a/net/pkt-gen/distinfo
+++ b/net/pkt-gen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644949020
-SHA256 (luigirizzo-netmap-g2022.02.10-278045b_GH0.tar.gz) = 96715bf359ad49ef4ee1b70559e6e268af07d6ed605b0074ca885a55211f8cec
-SIZE (luigirizzo-netmap-g2022.02.10-278045b_GH0.tar.gz) = 746973
+TIMESTAMP = 1679702302
+SHA256 (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 11af9db132407c39828b7dbf4906e01eedf8f70bac9dc178bd3d6a90aace8292
+SIZE (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 758416
diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
deleted file mode 100644
index 01f487791835..000000000000
--- a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- apps/nmreplay/GNUmakefile.orig	2022-02-11 07:45:02 UTC
-+++ apps/nmreplay/GNUmakefile
-@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay
- 
- NO_MAN=
- CFLAGS = -O2 # -pipe -g
--CFLAGS += -Werror -Wall -Wunused-function
-+CFLAGS += -Wall -Wunused-function
-+CFLAGS += -Wall -Wunused-function
- CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
- CFLAGS += -Wextra
- 
diff --git a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
deleted file mode 100644
index 7fa0b0b52463..000000000000
--- a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/nmreplay/nmreplay.c.orig	2022-02-11 07:45:02 UTC
-+++ apps/nmreplay/nmreplay.c
-@@ -1273,7 +1273,7 @@ main(int argc, char **argv)
- 	D("exiting on abort");
- 	sleep(1);
- 
--	return (0);
-+	return (err);
- }
- 
- /* conversion factor for numbers.
diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
deleted file mode 100644
index f401d30bd9e8..000000000000
--- a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- apps/pkt-gen/GNUmakefile.orig	2022-02-11 07:45:02 UTC
-+++ apps/pkt-gen/GNUmakefile
-@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen
- 
- NO_MAN=
- CFLAGS = -O2 -pipe
--CFLAGS += -Werror -Wall -Wunused-function
-+CFLAGS += -Wall -Wunused-function
-+CFLAGS += -Wall -Wunused-function
- CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
- CFLAGS += -Wextra -Wno-address-of-packed-member
- 
diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
deleted file mode 100644
index b059e6c79370..000000000000
--- a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- apps/pkt-gen/pkt-gen.c.orig	2022-06-08 23:21:01 UTC
-+++ apps/pkt-gen/pkt-gen.c
-@@ -3251,8 +3251,8 @@ out:
- 		g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
- 	}
- 	if (g.td_type == TD_TYPE_SENDER)
--	    D("Sending %d packets every  %ld.%09ld s",
--			g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec);
-+	    D("Sending %d packets every  %lld.%09ld s",
-+			g.burst, (long long)g.tx_period.tv_sec, g.tx_period.tv_nsec);
- 	/* Install ^C handler. */
- 	global_nthreads = g.nthreads;
- 	sigemptyset(&ss);
diff --git a/net/pkt-gen/files/patch-libnetmap_GNUmakefile b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
deleted file mode 100644
index ba04a18d3b2d..000000000000
--- a/net/pkt-gen/files/patch-libnetmap_GNUmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnetmap/GNUmakefile.orig	2022-02-11 07:45:02 UTC
-+++ libnetmap/GNUmakefile
-@@ -1,6 +1,7 @@
- SRCDIR ?= ../
- PREFIX ?= usr/local
--CFLAGS=-O2 -pipe -Wall -Werror
-+CFLAGS=-O2 -pipe -Wall
-+CFLAGS=-O2 -pipe -Wall
- CFLAGS +=-g
- CFLAGS += -I $(SRCDIR)/sys
- VPATH = $(SRCDIR)/libnetmap