From nobody Sun Jun 11 08:27:10 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qf7Gr0vjqz4ccxF; Sun, 11 Jun 2023 08:27:32 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qf7Gq1TGpz3pC1; Sun, 11 Jun 2023 08:27:30 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Sun, 11 Jun 2023 10:27:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1686472043; bh=ADGb9S+K1VV7P1daRXuaRJuGFBPD0/tF8I94TvW5+6s=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=aWVSJeq/ziz53xVMG5QC3ceyxfICCMB1Co/+Az1ZVbSWIKdID87snMBiTi9JTEOxP f5RY7zZRbrSpsANszXHLb+jEONujTmM6pKtVIm2h8ohKhfTgNG976A6MayJhWSfOP9 v6FU3GOFkWRqpK/4pZtsh3DxcbHXvqiOvJEdsJRLfVDNWklDDQt85W+cLSXyQryOZC FIYaIVqwFrRr25l4/DWa17gjGJR3F1erOhgMBwsoMCkMoV9mu+c8ttZN8p99pbnCv6 meCK2k8h3RDcYI9PvmlZokfJIECdwbRnpVZd+lnoEAaFMNd+aZXx1oyy84PHADHeox lOAuCpwxJb/qg== Message-ID: <87y1kqflpd.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Michael Gmelin 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 In-Reply-To: <202306101006.35AA69It073982@gitrepo.freebsd.org> References: <202306101006.35AA69It073982@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/30.0 Mule/6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4Qf7Gq1TGpz3pC1 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sat, 10 Jun 2023 12:06:09 +0200, Michael Gmelin wrote: > > The branch main has been updated by grembo: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=637c0bace26138529a36232e948549ad59342ba9 > > commit 637c0bace26138529a36232e948549ad59342ba9 > Author: Michael Gmelin > AuthorDate: 2023-06-10 10:03:39 +0000 > Commit: Michael Gmelin > 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