From nobody Thu May 9 17:04:03 2024 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 4VZyz81LQrz5K5ML; Thu, 09 May 2024 17:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VZyz80rc5z4Qwy; Thu, 9 May 2024 17:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715274244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxuK7bHoE9b3UHGex5ogfAJ74A0IBWTQlfOHPQGxyfU=; b=pIcdH3BJ6RtCGIe+qG3zgjA0VL/zqB09y3yyOIHkAT9cSL4cuDEcDZCJ3XZchvkc5Mdgc0 iJBcluk+1z3bebyS/a4Yze74uanDTMfiiMe5h2YIpm7UYcWp5EzlqqoLBgqe6PSmQi7pw0 3HsMBMWVrVMqZwgaH+HwZ+EPhW4FHNqT/Xx0j5Xvp7nGdNXH28l3QjrWHIjuIrd3lUBC0A ReSaR4NmeOHy3+DCA8akaW9az0eLJGHkOB76YmTrCUF8shUxvKNDLh8CPoGrmCjEYwFjCw 0AdilFmzB8hf3mUn7HAXzGnV9PlD8EYY/ujhvTSd0CFmuCxGSMRA3vJuNXqJow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715274244; a=rsa-sha256; cv=none; b=gqEj46l7mRgcUOPZPeT96bMoWO8QzVOg/2uf+DJNeJMdgqGd1ROnO7b3D722KyUvZGRc8C H9WI1Wx2kYvvMH3Mpk1L5r6HvqYsmyYBifia4HVHamBWahHHDFc7bMVw8nH1A5ttu4vFq+ RGHzUQ2/tTGJQjeZoQYgIRGJuCwqAT3vS6xay5APcPIBFhD0NVaUkFUdaN62Txz3P0kKZy 68W6w5KrOZFAUWIHOHWFEzoGCrbTHf58fR+zpN4TOet2infZi0V33gjc0/JjxEYMBgFJf4 yfSVYZaoFDCGmP4WGYhgznlWyK6ZmSzUIvlxB49PbRips8G/5OnoQMPxH0ASsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715274244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxuK7bHoE9b3UHGex5ogfAJ74A0IBWTQlfOHPQGxyfU=; b=ghAW2ReVCF/mc3DdoaXu7m9QBQZvSuH1moEy8lz/ayJeS3TauoRfn6bGkgEjtdaTHIwGOf DAm1MUW1kmtf7Xj9JoL/gw/8ddLMrh+317Py0vnTZmUyQnD705rWMWCqD1VMKSG76193tc IFnQzxnFZWMGyE6ecZGTvk1HFWFjZtTAYTbaBKIDOwbZ3goZIzUQ4mHxwhdXjfC15wurkZ ylfHXh8owLZwuDTlnxmn4eKGAY3wOl153wu3nAKLJUGkRTW80/kllG3KbBE3PmRVExw2zM XEfIeypPbUcrVxGROCFvefkXoCPkwMUjeb7VCsJwcfbt/pDxcJMPm3s7xIRJ4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VZyz80RZlz1GnD; Thu, 9 May 2024 17:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 449H43Bv020781; Thu, 9 May 2024 17:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449H43bX020778; Thu, 9 May 2024 17:04:03 GMT (envelope-from git) Date: Thu, 9 May 2024 17:04:03 GMT Message-Id: <202405091704.449H43bX020778@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: 03e9f0cdfac6 - main - net-mgmt/net-snmp: Fix freebsd15.h 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03e9f0cdfac68b11552c62cac1eaa27690fc0d32 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=03e9f0cdfac68b11552c62cac1eaa27690fc0d32 commit 03e9f0cdfac68b11552c62cac1eaa27690fc0d32 Author: Mark Johnston AuthorDate: 2024-04-29 20:39:49 +0000 Commit: Mark Johnston CommitDate: 2024-05-09 16:41:04 +0000 net-mgmt/net-snmp: Fix freebsd15.h It was copied from freebsd14.h without updating it. Also remove some bogus copying in the port makefile. 5.9.4 provides freebsdN.h for N up to 14, and we have a patch which adds freebsd15.h. So, get rid of the copying too. Approved by: zi Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D45029 --- net-mgmt/net-snmp/Makefile | 4 ---- net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index f4b7df20ef0b..9909de70e05f 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -244,10 +244,6 @@ post-patch: @${REINPLACE_CMD} -E -e 's|SSL_library_init|OPENSSL_init_ssl|g' \ ${WRKSRC}/configure .endif - @${CP} ${WRKSRC}/include/net-snmp/system/freebsd12.h \ - ${WRKSRC}/include/net-snmp/system/freebsd13.h - @${CP} ${WRKSRC}/include/net-snmp/system/freebsd14.h \ - ${WRKSRC}/include/net-snmp/system/freebsd15.h .for header in darwin7.h darwin8.h darwin9.h darwin10.h darwin11.h darwin12.h \ darwin13.h darwin14.h darwin15.h darwin16.h darwin17.h @${CP} ${WRKSRC}/include/net-snmp/system/darwin.h \ diff --git a/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h index d81ec27f83d5..90a4d4e2db1d 100644 --- a/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h +++ b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h @@ -1,6 +1,6 @@ --- include/net-snmp/system/freebsd15.h.orig 2024-03-02 16:01:17 UTC +++ include/net-snmp/system/freebsd15.h @@ -0,0 +1,3 @@ -+/* freebsd14 is a superset of freebsd13 */ -+#include "freebsd13.h" -+#define freebsd13 freebsd13 ++/* freebsd15 is a superset of freebsd14 */ ++#include "freebsd14.h" ++#define freebsd14 freebsd14