diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index b160bd88c9ad..815a01d92e75 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -1,89 +1,89 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
 
 PORTNAME=	pmacct
 DISTVERSION=	1.7.7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.pmacct.net/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Accounting and aggregation tool for IPv4 and IPv6 traffic
 
 LICENSE=	GPLv2
 
-USES=		libtool pkgconfig localbase autoreconf
+USES=		gmake libtool pkgconfig localbase autoreconf
 USE_RC_SUBR=	pmacctd nfacctd sfacctd
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3 LAYER2 DEBUG GEOIP2 \
 		DOCS RABBITMQ REDIS KAFKA AVRO EXAMPLES
 OPTIONS_DEFAULT=LAYER2
 OPTIONS_SUB=	yes
 
 AVRO_DESC=	Enable avro support
 GEOIP2_DESC=	Enable GeoIPv2 (libmaxminddb) support
 KAFKA_DESC=	Enable Kafka support
 LAYER2_DESC=	Enable Layer-2 support: MAC addresses and VLANs
 RABBITMQ_DESC=	Enable RabbitMQ/AMQP support
 REDIS_DESC=	Enable Redis support
 SQLITE3_DESC=	Enable SQLite3 support
 
 SQLDOC=		"@comment "
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_VARS+=	SQLDOC=""
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 PGSQL_VARS+=		WANT_PGSQL=client
 PGSQL_VARS+=		SQLDOC=""
 
 SQLITE3_USES=		sqlite
 SQLITE3_CONFIGURE_ENABLE=	sqlite3
 SQLITE3_VARS=		SQLDOC=""
 
 LAYER2_CONFIGURE_ENABLE=	l2
 DEBUG_CONFIGURE_ENABLE=		debug
 
 RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c-devel
 RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
 
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_CONFIGURE_ENABLE=		redis
 
 KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
 KAFKA_CONFIGURE_ENABLE=		kafka
 
 AVRO_LIB_DEPENDS=		libavro.so:devel/avro-c
 AVRO_CONFIGURE_ENABLE=		avro
 
 GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 GEOIP2_CONFIGURE_ENABLE=	geoipv2
 
 .include <bsd.port.options.mk>
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386
 .endif
 
 PLIST_SUB+=	SQLDOC=${SQLDOC}
 
 .if ${PORT_OPTIONS:MRABBITMQ} || ${PORT_OPTIONS:MKAFKA}
 LIB_DEPENDS+=	libjansson.so:devel/jansson
 CONFIGURE_ARGS+=--enable-jansson
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/[A-Z]* ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART UPGRADE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/pmacct/files/patch-configure.ac b/net-mgmt/pmacct/files/patch-configure.ac
new file mode 100644
index 000000000000..c917463ca363
--- /dev/null
+++ b/net-mgmt/pmacct/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2021-11-05 16:03:23.000000000 +0100
++++ configure.ac	2022-04-15 16:15:06.250117000 +0200
+@@ -404,9 +404,14 @@
+     AC_CHECK_HEADERS([mysql.h mysql/mysql.h])
+     CFLAGS="$_save_CFLAGS"
+ 
+-    AC_CHECK_LIB([numa], [numa_bind], [], [AC_MSG_ERROR([
+-      ERROR: missing libnuma. Requirement for building MySQL.
+-    ])])
++    case "$host_os" in
++    linux*)
++      AC_CHECK_LIB([numa], [numa_bind], [], [AC_MSG_ERROR([
++        ERROR: missing libnuma. Requirement for building MySQL.
++      ])])
++    ;;
++    esac
++
+     ;;
+   no)
+     AC_MSG_RESULT(no)
diff --git a/net-mgmt/pmacct/files/patch-src_bgp_bgp.c b/net-mgmt/pmacct/files/patch-src_bgp_bgp.c
new file mode 100644
index 000000000000..3c500325b54d
--- /dev/null
+++ b/net-mgmt/pmacct/files/patch-src_bgp_bgp.c
@@ -0,0 +1,14 @@
+--- src/bgp/bgp.c.orig	2022-05-28 08:30:21 UTC
++++ src/bgp/bgp.c
+@@ -830,9 +830,9 @@ void skinny_bgp_daemon_online()
+ 		bgp_peer_close(&peers[peers_check_idx], FUNC_TYPE_BGP, FALSE, FALSE, FALSE, FALSE, NULL);
+ 	      }
+ 	      else {
+-		Log(LOG_WARNING, "WARN ( %s/%s ): [%s] Refusing new connection from existing peer (residual holdtime: %ld).\n",
++		Log(LOG_WARNING, "WARN ( %s/%s ): [%s] Refusing new connection from existing peer (residual holdtime: %lld).\n",
+ 			config.name, bgp_misc_db->log_str, bgp_peer_str,
+-			(peers[peers_check_idx].ht - ((long)now - peers[peers_check_idx].last_keepalive)));
++			(long long)(peers[peers_check_idx].ht - ((long)now - peers[peers_check_idx].last_keepalive)));
+ 		FD_CLR(peer->fd, &bkp_read_descs);
+ 		bgp_peer_close(peer, FUNC_TYPE_BGP, FALSE, FALSE, FALSE, FALSE, NULL);
+ 		goto read_data;
diff --git a/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am b/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am
new file mode 100644
index 000000000000..aac851998bc8
--- /dev/null
+++ b/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am
@@ -0,0 +1,16 @@
+--- src/external_libs/Makefile.am.orig	2021-11-05 15:03:23.000000000 +0000
++++ src/external_libs/Makefile.am	2022-04-15 12:37:36.692736000 +0000
+@@ -45,11 +45,12 @@
+ 		fi;\
+ 		echo "[dep: libcdada] Building...";\
+ 		mkdir -p $(abs_builddir)/libcdada/build || true; \
++		unset LIBS; \
+ 		cd $(abs_srcdir)/libcdada/ && \
+ 		./autogen.sh &&\
+ 		cd $(abs_builddir)/libcdada/build && \
+ 		$(abs_srcdir)/libcdada/configure --disable-shared --host=$(host_alias) @configure_silent_rules_val@ \
+-		--prefix=$(abs_builddir)/rootfs && make $(MAKE_JOBS) install;\
++		--prefix=$(abs_builddir)/rootfs && gmake $(MAKE_JOBS) install;\
+ 		if [ $$? != 0 ]; then exit 1; fi; \
+ 		echo "`cd $(abs_srcdir)/libcdada && git rev-parse HEAD 2> /dev/null`" > $(abs_builddir)/.libcdada_mark;\
+ 		if [ $$? != 0 ]; then exit 1; fi; \