diff --git a/net-mgmt/ipgen/Makefile b/net-mgmt/ipgen/Makefile index e2e33b19c453..9d88aea513e9 100644 --- a/net-mgmt/ipgen/Makefile +++ b/net-mgmt/ipgen/Makefile @@ -1,33 +1,32 @@ PORTNAME= ipgen -PORTVERSION= 1.30.20240527 -PORTREVISION= 1 +PORTVERSION= 1.31.20250410 CATEGORIES= net-mgmt MAINTAINER= hrs@FreeBSD.org COMMENT= Interactive Packet Generator and Benchmarking Utility WWW= https://github.com/iij/ipgen LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:devel/libevent USES= gmake perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= iij -GH_TAGNAME= 9e649f4 +GH_TAGNAME= 121ac92 SHEBANG_FILES= gen/layout_generator MAKEFILE= GNUmakefile PORTDOCS= README.md OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT=DOCS pre-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f ${MAKEFILE} depend pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} post-install-DOCS-on: cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/net-mgmt/ipgen/distinfo b/net-mgmt/ipgen/distinfo index a53baadb7b0d..fa65bba9c467 100644 --- a/net-mgmt/ipgen/distinfo +++ b/net-mgmt/ipgen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731024085 -SHA256 (iij-ipgen-1.30.20240527-9e649f4_GH0.tar.gz) = 03303932fca65a9073b6372c0133e9958f26c0a44fa192846fea2019076e5aa6 -SIZE (iij-ipgen-1.30.20240527-9e649f4_GH0.tar.gz) = 267985 +TIMESTAMP = 1782505502 +SHA256 (iij-ipgen-1.31.20250410-121ac92_GH0.tar.gz) = 458c122e89fa0f9420fca33db410bab5937c384ca7c896120e3ae5fff6877854 +SIZE (iij-ipgen-1.31.20250410-121ac92_GH0.tar.gz) = 268257 diff --git a/net-mgmt/ipgen/files/patch-Makefile.inc b/net-mgmt/ipgen/files/patch-Makefile.inc deleted file mode 100644 index b6942a9ff93f..000000000000 --- a/net-mgmt/ipgen/files/patch-Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.inc.orig 2024-05-27 06:59:46 UTC -+++ Makefile.inc -@@ -1,3 +1,10 @@ MANDIR?= ${PREFIX}/share/man - PREFIX?= /usr/local - LOCALBASE?= ${PREFIX} - MANDIR?= ${PREFIX}/share/man -+ -+BSD_INSTALL_CMD?= install -o root -g wheel -+BSD_INSTALL_PROGRAM?= ${BSD_INSTALL_CMD} -m 555 -+BSD_INSTALL_MAN?= ${BSD_INSTALL_CMD} -m 444 -+BSD_INSTALL_SCRIPT?= ${BSD_INSTALL_CMD} -m 444 -+BSD_INSTALL_DATA?= ${BSD_INSTALL_CMD} -m 444 -+BSD_INSTALL_DIR?= ${BSD_INSTALL_CMD} -d -m 755 diff --git a/net-mgmt/ipgen/files/patch-gen-GNUmakefile b/net-mgmt/ipgen/files/patch-gen-GNUmakefile index 8d4fac3c53e6..b4d577e19505 100644 --- a/net-mgmt/ipgen/files/patch-gen-GNUmakefile +++ b/net-mgmt/ipgen/files/patch-gen-GNUmakefile @@ -1,15 +1,18 @@ ---- gen/GNUmakefile.orig 2024-05-27 06:59:46 UTC +--- gen/GNUmakefile.orig 2025-04-11 02:11:10 UTC +++ gen/GNUmakefile -@@ -46,9 +46,9 @@ install: - rm -f .depend GPATH GRTAGS GSYMS GTAGS +@@ -1,6 +1,6 @@ include ../Makefile.inc + include ../Makefile.inc + +-PROG= ipgen webserv ++PROG= ipgen + SRCS= gen.c util.c webserv.c pbuf.c sequencecheck.c seqtable.c item.c genscript.c flowparse.c pktgen_item.c + CFLAGS+= -I.. -I${LOCALBASE}/include -g -DHTDOCS=\"${PREFIX}/share/ipgen/htdocs\" + CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith +@@ -47,7 +47,6 @@ install: install: -- install -o root -g wheel -m 550 ipgen ${DESTDIR}${PREFIX}/bin/ -- install -o root -g wheel -m 755 -d ${DESTDIR}${MANDIR}/man1 -- install -o root -g wheel -m 444 ipgen.1 ${DESTDIR}${MANDIR}/man1 -+ ${BSD_INSTALL_PROGRAM} ipgen ${DESTDIR}${PREFIX}/bin/ -+ ${BSD_INSTALL_DIR} -d ${DESTDIR}${MANDIR}/man1 -+ ${BSD_INSTALL_MAN} ipgen.1 ${DESTDIR}${MANDIR}/man1 + ${INSTALL_PROGRAM} ipgen ${DESTDIR}${PREFIX}/bin/ +- ${INSTALL_PROGRAM} webserv ${DESTDIR}${PREFIX}/bin/ + ${INSTALL} -d ${DESTDIR}${MANDIR}/man1 + ${INSTALL_MAN} ipgen.1 ${DESTDIR}${MANDIR}/man1 - sequencecheck: sequencecheck.c seqcheck_test.c - $(CC) -o $@ sequencecheck.c $(CFLAGS) -DTEST diff --git a/net-mgmt/ipgen/files/patch-htdocs-GNUmakefile b/net-mgmt/ipgen/files/patch-htdocs-GNUmakefile deleted file mode 100644 index 6d0071b1769d..000000000000 --- a/net-mgmt/ipgen/files/patch-htdocs-GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- htdocs/GNUmakefile.orig 2024-05-27 06:59:46 UTC -+++ htdocs/GNUmakefile -@@ -12,5 +12,5 @@ install: - depend: - - install: -- install -o root -g wheel -m 755 -d ${DESTDIR}${PREFIX}/share/ipgen/htdocs -- install -o root -g wheel -m 444 ${FILES} ${DESTDIR}${PREFIX}/share/ipgen/htdocs -+ ${BSD_INSTALL_DIR} ${DESTDIR}${PREFIX}/share/ipgen/htdocs -+ ${BSD_INSTALL_DATA} ${FILES} ${DESTDIR}${PREFIX}/share/ipgen/htdocs diff --git a/net-mgmt/ipgen/files/patch-script-GNUmakefile b/net-mgmt/ipgen/files/patch-script-GNUmakefile deleted file mode 100644 index 4040df97081c..000000000000 --- a/net-mgmt/ipgen/files/patch-script-GNUmakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- script/GNUmakefile.orig 2024-05-27 06:59:46 UTC -+++ script/GNUmakefile -@@ -26,6 +26,6 @@ install: - depend: - - install: -- install -o root -g wheel -m 555 log2graph ${DESTDIR}${PREFIX}/bin/ipgen_log2graph -- install -o root -g wheel -m 755 -d ${DESTDIR}${PREFIX}/share/ipgen/script -- install -o root -g wheel -m 444 ${FILES} ${DESTDIR}${PREFIX}/share/ipgen/script -+ ${BSD_INSTALL_SCRIPT} log2graph ${DESTDIR}${PREFIX}/bin/ipgen_log2graph -+ ${BSD_INSTALL_DIR} ${DESTDIR}${PREFIX}/share/ipgen/script -+ ${BSD_INSTALL_SCRIPT} ${FILES} ${DESTDIR}${PREFIX}/share/ipgen/script