Re: git: 637c0bace261 - main - sysutils/pftop: Fix build on 14.0-CURRENT

From: Herbert J. Skuhra <herbert_at_gojira.at>
Date: Sun, 11 Jun 2023 08:27:10 UTC 
On Sat, 10 Jun 2023 12:06:09 +0200,
Michael Gmelin <grembo@FreeBSD.org> wrote:
> 
> The branch main has been updated by grembo:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=637c0bace26138529a36232e948549ad59342ba9
> 
> commit 637c0bace26138529a36232e948549ad59342ba9
> Author:     Michael Gmelin <grembo@FreeBSD.org>
> AuthorDate: 2023-06-10 10:03:39 +0000
> Commit:     Michael Gmelin <grembo@FreeBSD.org>
> CommitDate: 2023-06-10 10:03:39 +0000
> 
>     sysutils/pftop: Fix build on 14.0-CURRENT
> ---
>  sysutils/pftop/Makefile                   | 10 ++++++++--
>  sysutils/pftop/files/extra-patch-config.h |  6 +++++-
>  2 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
> index f3c6d879f637..cba2ecd65aeb 100644
> --- a/sysutils/pftop/Makefile
> +++ b/sysutils/pftop/Makefile
> @@ -1,6 +1,6 @@
>  PORTNAME=	pftop
>  PORTVERSION=	0.8
> -PORTREVISION=	2
> +PORTREVISION=	3
>  CATEGORIES=	sysutils net
>  
>  MAINTAINER=	grembo@FreeBSD.org
> @@ -22,7 +22,13 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bpf_dump.c \
>  		${FILESDIR}/extra-patch-sf-gencode.h
>  
>  MAKE_ARGS=	LOCALBASE="${PREFIX}" \
> -		OSLEVEL=45
> +
> +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400090
> +MAKE_ARGS+=	OSLEVEL=46
> +.else
> +MAKE_ARGS+=	OSLEVEL=45
> +.endif
> +
>  CFLAGS+=	-DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 \
>  		-DHAVE_FINE_GRAINED_LOCKING=1
>  
> diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/files/extra-patch-config.h
> index 6d2873c42ab1..d24f88179718 100644
> --- a/sysutils/pftop/files/extra-patch-config.h
> +++ b/sysutils/pftop/files/extra-patch-config.h
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $
>  --- config.h.orig	Tue Nov  6 22:34:18 2007
>  +++ config.h	Fri Dec 19 20:28:01 2008
> -@@ -74,11 +74,20 @@
> +@@ -74,11 +74,24 @@
>   #define HAVE_PFSYNC_STATE
>   #endif
>   
> @@ -11,7 +11,11 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 canacar Exp $
>  +#endif
>  +
>   #ifdef HAVE_PFSYNC_STATE
> ++#if OS_LEVEL > 45
> ++typedef struct pfsync_state_1400 pf_state_t;

Are you sure that this is correct?

If I replace pfsync_state_1400 with pfsync_state_1301 the port builds
and the output looks sane. 

--
Herbert