net/pkt-gen: Update to 2023.04.22 and add man pages

PR:		271004
Reported by:	Jose Luis Duran <jlduran@gmail.com>
Event:		Oslo Hackathon at Modirum

6 files changed, 18 insertions, 29 deletions

diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile
index 35bc8e6570a1..59edf653f94d 100644
--- a/net/pkt-gen/Makefile
+++ b/net/pkt-gen/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pkt-gen
-PORTVERSION=	g2023.03.22
-PORTREVISION=	1
+PORTVERSION=	g2023.04.22
 CATEGORIES=	net
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -13,7 +12,7 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	luigirizzo
 GH_PROJECT=	netmap
-GH_TAGNAME=	0a53f85
+GH_TAGNAME=	eea4f11
 MAKEFILE=	GNUmakefile
 
 OPTIONS_DEFINE=	PCAP
@@ -22,7 +21,9 @@ OPTIONS_DEFAULT=	PCAP
 PCAP_MAKE_ARGS=	WITH_PCAP=1
 
 PLIST_FILES=	bin/pkt-gen \
-		bin/nmreplay
+		bin/nmreplay \
+		share/man/man8/nmreplay.8.gz \
+		share/man/man8/pkt-gen.8.gz
 
 do-build:
 	cd ${WRKSRC}/libnetmap && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE}
@@ -34,5 +35,9 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/apps/nmreplay/nmreplay \
 		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/apps/pkt-gen/pkt-gen.8 \
+		${STAGEDIR}${PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/apps/nmreplay/nmreplay.8 \
+		${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/pkt-gen/distinfo b/net/pkt-gen/distinfo
index 0dae43868930..718b5c0050f9 100644
--- a/net/pkt-gen/distinfo
+++ b/net/pkt-gen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679702302
-SHA256 (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 11af9db132407c39828b7dbf4906e01eedf8f70bac9dc178bd3d6a90aace8292
-SIZE (luigirizzo-netmap-g2023.03.22-0a53f85_GH0.tar.gz) = 758416
+TIMESTAMP = 1682172247
+SHA256 (luigirizzo-netmap-g2023.04.22-eea4f11_GH0.tar.gz) = 2713a07c8a6f1b4ff51c2a20c7b73637a97b78363ccf9741dc20f7737235ba27
+SIZE (luigirizzo-netmap-g2023.04.22-eea4f11_GH0.tar.gz) = 759487
diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
index 01f487791835..3953cdab3ca8 100644
--- a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
+++ b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
@@ -1,12 +1,11 @@
---- apps/nmreplay/GNUmakefile.orig	2022-02-11 07:45:02 UTC
+--- apps/nmreplay/GNUmakefile.orig	2023-04-22 12:00:00 UTC
 +++ apps/nmreplay/GNUmakefile
-@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay
+@@ -10,7 +10,7 @@ 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_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
index f401d30bd9e8..bf8152ff5894 100644
--- a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
+++ b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
@@ -1,12 +1,11 @@
---- apps/pkt-gen/GNUmakefile.orig	2022-02-11 07:45:02 UTC
+--- apps/pkt-gen/GNUmakefile.orig	2023-04-22 12:00:00 UTC
 +++ apps/pkt-gen/GNUmakefile
-@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen
+@@ -10,7 +10,7 @@ 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
index ba04a18d3b2d..13bd39649afe 100644
--- a/net/pkt-gen/files/patch-libnetmap_GNUmakefile
+++ b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
@@ -1,11 +1,10 @@
---- libnetmap/GNUmakefile.orig	2022-02-11 07:45:02 UTC
+--- libnetmap/GNUmakefile.orig	2023-04-22 12:00:00 UTC
 +++ libnetmap/GNUmakefile
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  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