git: e35747787473 - main - net-mgmt/ng_ipacct: VIMAGE is now mandatory option

From: Vsevolod Stakhov <vsevolod_at_FreeBSD.org>
Date: Mon, 18 Oct 2021 19:21:17 UTC
The branch main has been updated by vsevolod:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e35747787473bd1b4abd82cfe6a33404a7ed93ac

commit e35747787473bd1b4abd82cfe6a33404a7ed93ac
Author:     Vsevolod Stakhov <vsevolod@FreeBSD.org>
AuthorDate: 2021-10-18 19:18:04 +0000
Commit:     Vsevolod Stakhov <vsevolod@FreeBSD.org>
CommitDate: 2021-10-18 19:20:50 +0000

    net-mgmt/ng_ipacct: VIMAGE is now mandatory option
    
    This option is unconditional since FreeBSD 12, so it is now removed to a
    static define.
    
    Reported by:            Eugene Kazarinov via private email
---
 net-mgmt/ng_ipacct/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-mgmt/ng_ipacct/Makefile b/net-mgmt/ng_ipacct/Makefile
index 64bd67a4ff58..33239c3547e4 100644
--- a/net-mgmt/ng_ipacct/Makefile
+++ b/net-mgmt/ng_ipacct/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ng_ipacct
 PORTVERSION=	20210316
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -23,7 +24,7 @@ MAKE_ENV+=	BINDIR="${PREFIX}/sbin"
 
 USE_RC_SUBR=	ng_ipacct
 SUB_FILES=	pkg-message
-CFLAGS+=	-DMEM_USE_ZONE
+CFLAGS+=	-DMEM_USE_ZONE -DVIMAGE
 
 post-patch:
 	@${REINPLACE_CMD} 's,{MANDIR},{DESTDIR}$$&,' ${WRKSRC}/man_ru/Makefile
@@ -34,8 +35,4 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/ng_ipacct.conf \
 		${STAGEDIR}${PREFIX}/etc/ng_ipacct.conf.sample
 
-OPTIONS_DEFINE=	VIMAGE
-VIMAGE_DESC=	VIMAGE virtual networking support
-VIMAGE_CFLAGS=	-DVIMAGE
-
 .include <bsd.port.mk>