rsyslog: adjust formatting, per pkglint

5 files changed, 16 insertions, 14 deletions

diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index dbd6a7619d2..954c51f455b 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2022/08/07 14:15:28 gutteridge Exp $
+# $NetBSD: Makefile,v 1.32 2022/08/07 16:01:17 gutteridge Exp $
 #
 
 BUILDLINK_DEPMETHOD.libestr=	full
@@ -9,10 +9,10 @@ PKGREVISION= 13
 
 COMMENT=		The enhanced syslogd for Unix
 
-CONFIGURE_ARGS+=	--disable-testbench					\
-			--enable-diagtools --enable-usertools --enable-uuid	\
-			--enable-imdiag --enable-imfile	--enable-impstats	\
-			--enable-mail --enable-mmjsonparse --enable-mmnormalize	\
+CONFIGURE_ARGS+=	--disable-testbench				\
+			--enable-diagtools --enable-usertools --enable-uuid \
+			--enable-imdiag --enable-imfile	--enable-impstats \
+			--enable-mail --enable-mmjsonparse --enable-mmnormalize \
 			--enable-omstdout
 
 PLIST_VARS+=		klog solaris
@@ -55,7 +55,7 @@ SUBST_SED.ldargs=	-e '/whole-archive.*librsyslog/d'
 
 RCD_SCRIPTS=		rsyslogd
 
-CONF_FILES+=		share/examples/rsyslog/rsyslog.conf 			\
+CONF_FILES+=		share/examples/rsyslog/rsyslog.conf \
 			${PKG_SYSCONFDIR}/rsyslog.conf
 
 post-install:
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index eff2c64df07..f99c8956109 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2022/08/07 08:25:30 he Exp $
+# $NetBSD: Makefile.common,v 1.48 2022/08/07 16:01:17 gutteridge Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -39,8 +39,8 @@ PYTHON_FOR_BUILD_ONLY=	yes
 
 EGDIR=			${PREFIX}/share/examples/rsyslog
 
-CONFIGURE_ARGS+=	--disable-libgcrypt --disable-testbench			\
-			--enable-diagtools --enable-usertools			\
+CONFIGURE_ARGS+=	--disable-libgcrypt --disable-testbench		\
+			--enable-diagtools --enable-usertools		\
 			--enable-generate-man-pages
 
 BUILDLINK_DEPMETHOD.libestr+=		build
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 4f8d21dda53..3ccf8addf78 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:20:08 nia Exp $
+$NetBSD: distinfo,v 1.40 2022/08/07 16:01:17 gutteridge Exp $
 
 BLAKE2s (rsyslog-8.38.0.tar.gz) = 156eacb39772f84172a5d8ac0f95f09f324ea006ed648ec093779664dac00862
 SHA512 (rsyslog-8.38.0.tar.gz) = 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 Size (rsyslog-8.38.0.tar.gz) = 2721798 bytes
 SHA1 (patch-configure) = c7b6ab1f7da4b78034ac5defe75f965b2b6a6e6b
-SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
+SHA1 (patch-platform_redhat_rsyslog.conf) = 8cfce2df2551dc2ea81802c4cc1b52933cdda153
 SHA1 (patch-tools_iminternal.c) = 76e140343456b120cd9f0743e6f10e78f9baaa5d
-SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
+SHA1 (patch-tools_rsyslogd.8) = a0eea2ee7832fcb19babca24c7a198ca91386e53
 SHA1 (patch-tools_rsyslogd.c) = b2a295da0b6b667d8913bf9e73f6b2e87923e8be
diff --git a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
index a1c71e7c848..9b75878ec6e 100644
--- a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
+++ b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
@@ -1,6 +1,7 @@
-$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.3 2015/01/16 16:58:28 fhajny Exp $
+$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.4 2022/08/07 16:01:17 gutteridge Exp $
 
 Fix sample config file. Auto-select kernel logging module.
+
 --- platform/redhat/rsyslog.conf.orig	2015-01-12 14:15:52.000000000 +0000
 +++ platform/redhat/rsyslog.conf
 @@ -4,14 +4,14 @@
diff --git a/sysutils/rsyslog/patches/patch-tools_rsyslogd.8 b/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
index a5e7380f9a8..9cb74d1e247 100644
--- a/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
@@ -1,6 +1,7 @@
-$NetBSD: patch-tools_rsyslogd.8,v 1.1 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: patch-tools_rsyslogd.8,v 1.2 2022/08/07 16:01:17 gutteridge Exp $
 
 Default PID file path.
+
 --- tools/rsyslogd.8.orig	2014-12-02 10:15:16.000000000 +0000
 +++ tools/rsyslogd.8
 @@ -130,14 +130,14 @@ reacts to a set of signals.  You may eas