git: fae2b9f3ed2a - main - sysutils/rsyslog8: switch to PATCHFILES/PATCH_SITES

The branch main has been updated by matthew:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fae2b9f3ed2a9487dd4adac08e56549b9105b7be

commit fae2b9f3ed2a9487dd4adac08e56549b9105b7be
Author:     Matthew Seaman <matthew@FreeBSD.org>
AuthorDate: 2025-06-14 07:57:17 +0000
Commit:     Matthew Seaman <matthew@FreeBSD.org>
CommitDate: 2025-06-14 08:04:07 +0000

    sysutils/rsyslog8: switch to PATCHFILES/PATCH_SITES
    
    This is the preferred means of adding specific git commits as patches
    to a release. No functional change.
    
    Reported by:    kevans, hellspawn (IRC/Slack)
---
 sysutils/rsyslog8/Makefile                     |  4 ++
 sysutils/rsyslog8/distinfo                     |  4 +-
 sysutils/rsyslog8/files/patch-tools_omusrmsg.c | 69 --------------------------
 3 files changed, 7 insertions(+), 70 deletions(-)

diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index e3f139c1fb60..b6af2312b2a5 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rsyslog
 PORTVERSION=	8.2506.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -7,6 +8,9 @@ MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
 WWW=		https://www.rsyslog.com/
 
+PATCH_SITES=	https://github.com/rgerhards/${PORTNAME}/commit/
+PATCHFILES=	72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch:-p1
+
 LICENSE=	GPLv3 LGPL3 APACHE20
 LICENSE_COMB=	multi
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index 5d7da6888fe6..02313e502df5 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1749796569
+TIMESTAMP = 1749886759
 SHA256 (rsyslog-8.2506.0.tar.gz) = 6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b
 SIZE (rsyslog-8.2506.0.tar.gz) = 3484506
+SHA256 (72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch) = f3cb29a469e28678086a81906fe823045563f9132c0a6f97bf887eba7fd1d31d
+SIZE (72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch) = 2585
diff --git a/sysutils/rsyslog8/files/patch-tools_omusrmsg.c b/sysutils/rsyslog8/files/patch-tools_omusrmsg.c
deleted file mode 100644
index 9eca33ebc1ce..000000000000
--- a/sysutils/rsyslog8/files/patch-tools_omusrmsg.c
+++ /dev/null
@@ -1,69 +0,0 @@
-# This is https://github.com/rgerhards/rsyslog/commit/72b8bcc05318f0a72ec828d1a5329fa98c021eb8
-# slightly reformatted for application by the ports.
-
---- tools/omusrmsg.c.orig	2025-06-10 09:49:19 UTC
-+++ tools/omusrmsg.c
-@@ -8,7 +8,7 @@
-  * File begun on 2007-07-20 by RGerhards (extracted from syslogd.c, which at the
-  * time of the fork from sysklogd was under BSD license)
-  *
-- * Copyright 2007-2018 Adiscon GmbH.
-+ * Copyright 2007-2025 Adiscon GmbH.
-  *
-  * This file is part of rsyslog.
-  *
-@@ -35,14 +35,27 @@
- #include <signal.h>
- #include <ctype.h>
- #include <sys/param.h>
--#ifdef HAVE_UTMP_H
--#  include <utmp.h>
--#  define STRUCTUTMP struct utmp
--#  define UTNAME ut_name
--#else
--#  include <utmpx.h>
--#  define STRUCTUTMP struct utmpx
--#  define UTNAME ut_user
-+#ifdef HAVE_UTMPX_H
-+# include <utmpx.h>
-+# define STRUCTUTMP struct utmpx
-+# define UTNAME ut_user
-+# define setutent setutxent
-+# define getutent getutxent
-+# define endutent endutxent
-+# ifndef UT_LINESIZE
-+/* __UT_LINESIZE for glibc; _UTX_LINESIZE common on Solaris */
-+#  ifdef __UT_LINESIZE
-+#   define UT_LINESIZE __UT_LINESIZE
-+#  elif defined(_UTX_LINESIZE)
-+#   define UT_LINESIZE _UTX_LINESIZE
-+#  else /* method of last resort */
-+#   define UT_LINESIZE 32
-+#  endif
-+# endif
-+#elif defined(HAVE_UTMP_H)
-+# include <utmp.h>
-+# define STRUCTUTMP struct utmp
-+# define UTNAME ut_name
- #endif
- #include <unistd.h>
- #include <sys/uio.h>
-@@ -173,9 +186,15 @@ ENDdbgPrintInstInfo
- #ifdef OS_BSD
- /* Since version 900007, FreeBSD has a POSIX compliant <utmpx.h> */
- #if defined(__FreeBSD__) && (__FreeBSD_version >= 900007)
--#  define setutent(void) setutxent(void)
--#  define getutent(void) getutxent(void)
--#  define endutent(void) endutxent(void)
-+#  ifndef setutent
-+#    define setutent() setutxent()
-+#  endif
-+#  ifndef getutent
-+#    define getutent() getutxent()
-+#  endif
-+#  ifndef endutent
-+#    define endutent() endutxent()
-+#  endif
- #else
- static FILE *BSD_uf = NULL;
- void setutent(void)