Date: Thu, 9 May 2024 17:04:03 GMT From: Mark Johnston <markj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 03e9f0cdfac6 - main - net-mgmt/net-snmp: Fix freebsd15.h Message-ID: <202405091704.449H43bX020778@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=03e9f0cdfac68b11552c62cac1eaa27690fc0d32 commit 03e9f0cdfac68b11552c62cac1eaa27690fc0d32 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-04-29 20:39:49 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405091704.449H43bX020778>