Date: Sun, 11 Jun 2023 11:25:45 +0200 From: Michael Gmelin <grembo@freebsd.org> To: "Herbert J. Skuhra" <herbert@gojira.at> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 637c0bace261 - main - sysutils/pftop: Fix build on 14.0-CURRENT Message-ID: <DB3CC509-0FB4-40EE-BCAB-CB28EF8E771D@freebsd.org> In-Reply-To: <87y1kqflpd.wl-herbert@gojira.at> References: <87y1kqflpd.wl-herbert@gojira.at>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 11. Jun 2023, at 10:27, Herbert J. Skuhra <herbert@gojira.at> wrote: >=20 > =EF=BB=BFOn Sat, 10 Jun 2023 12:06:09 +0200, > Michael Gmelin <grembo@FreeBSD.org> wrote: >>=20 >> The branch main has been updated by grembo: >>=20 >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D637c0bace26138529a36232e= 948549ad59342ba9 >>=20 >> 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 >>=20 >> 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(-) >>=20 >> 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=3D pftop >> PORTVERSION=3D 0.8 >> -PORTREVISION=3D 2 >> +PORTREVISION=3D 3 >> CATEGORIES=3D sysutils net >>=20 >> MAINTAINER=3D grembo@FreeBSD.org >> @@ -22,7 +22,13 @@ EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-bpf_dump.= c \ >> ${FILESDIR}/extra-patch-sf-gencode.h >>=20 >> MAKE_ARGS=3D LOCALBASE=3D"${PREFIX}" \ >> - OSLEVEL=3D45 >> + >> +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} >=3D 1400090 >> +MAKE_ARGS+=3D OSLEVEL=3D46 >> +.else >> +MAKE_ARGS+=3D OSLEVEL=3D45 >> +.endif >> + >> CFLAGS+=3D -DHAVE_SNPRINTF=3D1 -DHAVE_VSNPRINTF=3D1 \ >> -DHAVE_FINE_GRAINED_LOCKING=3D1 >>=20 >> diff --git a/sysutils/pftop/files/extra-patch-config.h b/sysutils/pftop/f= iles/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 >>=20 >> @@ -11,7 +11,11 @@ $OpenBSD: patch-config_h,v 1.4 2008/12/20 04:36:11 can= acar Exp $ >> +#endif >> + >> #ifdef HAVE_PFSYNC_STATE >> ++#if OS_LEVEL > 45 >> ++typedef struct pfsync_state_1400 pf_state_t; >=20 > Are you sure that this is correct? >=20 > If I replace pfsync_state_1400 with pfsync_state_1301 the port builds > and the output looks sane.=20 Hi, thanks for reporting, could you please add some details (like, how the o= utput differs)? Thanks Michael
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DB3CC509-0FB4-40EE-BCAB-CB28EF8E771D>