diff --git a/security/fwlogwatch/files/patch-main.h b/security/fwlogwatch/files/patch-main.h index 888039c8e704..532b254b455a 100644 --- a/security/fwlogwatch/files/patch-main.h +++ b/security/fwlogwatch/files/patch-main.h @@ -1,28 +1,32 @@ --- main.h.orig 2016-02-19 06:57:49.938584000 -0800 -+++ main.h 2016-04-21 19:31:22.393058000 -0700 ++++ main.h 2021-11-01 08:41:34.443421000 -0700 @@ -10,9 +10,15 @@ /* Paths */ +#ifndef INSTALL_DIR #define INSTALL_DIR "/usr/local" +#endif +#ifndef CONF_DIR #define CONF_DIR "/etc" +#endif +#ifndef LOCALE_DIR #define LOCALE_DIR "/usr" +#endif /* i18n */ -@@ -377,7 +383,9 @@ +@@ -377,7 +383,13 @@ /* Data structures */ #include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL struct log_line { time_t time; diff --git a/security/fwlogwatch/files/patch-resolve.c b/security/fwlogwatch/files/patch-resolve.c index 29f2947a8b64..dd33eb27df8e 100644 --- a/security/fwlogwatch/files/patch-resolve.c +++ b/security/fwlogwatch/files/patch-resolve.c @@ -1,12 +1,16 @@ --- resolve.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ resolve.c 2016-04-21 19:32:37.383666000 -0700 -@@ -5,7 +5,9 @@ ++++ resolve.c 2021-11-01 08:44:17.362963000 -0700 +@@ -5,7 +5,13 @@ #include #include #include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include #include #include diff --git a/security/fwlogwatch/files/patch-utils.c b/security/fwlogwatch/files/patch-utils.c index 5a0374545271..1ddfd41c671b 100644 --- a/security/fwlogwatch/files/patch-utils.c +++ b/security/fwlogwatch/files/patch-utils.c @@ -1,13 +1,17 @@ --- utils.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ utils.c 2016-04-21 19:36:08.436094000 -0700 -@@ -9,7 +9,10 @@ ++++ utils.c 2021-11-01 08:45:07.736663000 -0700 +@@ -9,7 +9,14 @@ #include #include #include +#include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include #include #include "main.h" diff --git a/security/fwlogwatch/files/patch-whois.c b/security/fwlogwatch/files/patch-whois.c index 95bd9c3f7900..761baecabf16 100644 --- a/security/fwlogwatch/files/patch-whois.c +++ b/security/fwlogwatch/files/patch-whois.c @@ -1,12 +1,16 @@ --- whois.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ whois.c 2016-04-21 19:33:49.670304000 -0700 -@@ -14,7 +14,9 @@ ++++ whois.c 2021-11-01 08:45:36.119198000 -0700 +@@ -14,7 +14,13 @@ #include #endif +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include #include "main.h" #include "utils.h"