CVS commit: pkgsrc/sysutils/syslog-ng

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 16 12:02:13 UTC 2021

Modified Files:
        pkgsrc/sysutils/syslog-ng: Makefile Makefile.common distinfo
        pkgsrc/sysutils/syslog-ng/patches: patch-ac

Log Message:
syslog-ng: simplify patch for upstreaming, and add pull request URL


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/syslog-ng/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/syslog-ng/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/syslog-ng/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/syslog-ng/Makefile
diff -u pkgsrc/sysutils/syslog-ng/Makefile:1.40 pkgsrc/sysutils/syslog-ng/Makefile:1.41
--- pkgsrc/sysutils/syslog-ng/Makefile:1.40     Thu Sep 16 09:22:46 2021
+++ pkgsrc/sysutils/syslog-ng/Makefile  Thu Sep 16 12:02:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/09/16 09:22:46 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2021/09/16 12:02:12 wiz Exp $
 
 .include "../../sysutils/syslog-ng/Makefile.common"
 
@@ -34,10 +34,9 @@ PLIST_VARS+=         systemd
 PLIST.systemd=         yes
 .endif
 
-PKGCONFIG_OVERRIDE=    libtest/syslog-ng-test.pc.in                    \
-                       syslog-ng-add-contextual-data.pc.in             \
-                       syslog-ng-native-connector.pc.in                \
-                       syslog-ng.pc.in
+PKGCONFIG_OVERRIDE+=   libtest/syslog-ng-test.pc.in
+PKGCONFIG_OVERRIDE+=   syslog-ng-native-connector.pc.in
+PKGCONFIG_OVERRIDE+=   syslog-ng.pc.in
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR}

Index: pkgsrc/sysutils/syslog-ng/Makefile.common
diff -u pkgsrc/sysutils/syslog-ng/Makefile.common:1.19 pkgsrc/sysutils/syslog-ng/Makefile.common:1.20
--- pkgsrc/sysutils/syslog-ng/Makefile.common:1.19      Thu Sep 16 09:22:46 2021
+++ pkgsrc/sysutils/syslog-ng/Makefile.common   Thu Sep 16 12:02:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2021/09/16 09:22:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.20 2021/09/16 12:02:12 wiz Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
@@ -48,7 +48,7 @@ CONFIGURE_ARGS.SunOS+=        ac_cv_func_inotif
 SUBST_CLASSES+=                unamepath
 SUBST_STAGE.unamepath= post-configure
 SUBST_FILES.unamepath= contrib/syslog2ng
-SUBST_VARS.unamepath=  UNAME
+SUBST_SED.unamepath=   -e s,/bin/uname,${UNAME},
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 

Index: pkgsrc/sysutils/syslog-ng/distinfo
diff -u pkgsrc/sysutils/syslog-ng/distinfo:1.18 pkgsrc/sysutils/syslog-ng/distinfo:1.19
--- pkgsrc/sysutils/syslog-ng/distinfo:1.18     Thu Sep 16 09:32:03 2021
+++ pkgsrc/sysutils/syslog-ng/distinfo  Thu Sep 16 12:02:12 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2021/09/16 09:32:03 wiz Exp $
+$NetBSD: distinfo,v 1.19 2021/09/16 12:02:12 wiz Exp $
 
 SHA1 (syslog-ng-3.34.1.tar.gz) = b0c02f7ca30d6b29722630c7c62961f1941c886f
 RMD160 (syslog-ng-3.34.1.tar.gz) = 2e8759268de8a57d631eab7d6ea3577ad5feb401
 SHA512 (syslog-ng-3.34.1.tar.gz) = f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10
 Size (syslog-ng-3.34.1.tar.gz) = 5903489 bytes
-SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
+SHA1 (patch-ac) = 1f70075860999e854629faa7f293ef51243b398d
 SHA1 (patch-configure) = d4ae0c21ac4287b765bc4411db9873be8bdb0853
 SHA1 (patch-lib_signal-handler.c) = 440a9d0df0da613817c943b8244e98e50c92bbb2

Index: pkgsrc/sysutils/syslog-ng/patches/patch-ac
diff -u pkgsrc/sysutils/syslog-ng/patches/patch-ac:1.3 pkgsrc/sysutils/syslog-ng/patches/patch-ac:1.4
--- pkgsrc/sysutils/syslog-ng/patches/patch-ac:1.3      Thu Oct 29 16:34:13 2015
+++ pkgsrc/sysutils/syslog-ng/patches/patch-ac  Thu Sep 16 12:02:12 2021
@@ -1,10 +1,11 @@
-$NetBSD: patch-ac,v 1.3 2015/10/29 16:34:13 fhajny Exp $
+$NetBSD: patch-ac,v 1.4 2021/09/16 12:02:12 wiz Exp $
 
 # add NetBSD support and fix some paths
+https://github.com/syslog-ng/syslog-ng/pull/3786
 
---- contrib/syslog2ng.orig     2014-12-15 14:48:45.000000000 +0000
+--- contrib/syslog2ng.orig     2021-09-10 11:01:49.000000000 +0000
 +++ contrib/syslog2ng
-@@ -5,18 +5,24 @@
+@@ -5,7 +5,7 @@
  # Translator from syslog.conf to syslog-ng.conf
  # by Jonathan W. Marks <j-marks%uiuc.edu@localhost>
  #
@@ -13,10 +14,8 @@ $NetBSD: patch-ac,v 1.3 2015/10/29 16:34
  
  BEGIN {
        # Handle the various platforms- determine proper log device
--      "/bin/uname -s" | getline sysname;
--      close("/bin/uname -s");
-+      "@UNAME@ -s" | getline sysname;
-+      close("@UNAME@ -s");
+@@ -13,10 +13,16 @@ BEGIN {
+       close("/bin/uname -s");
        if (sysname == "SunOS") {
                LOGDEVTYPE="sun-streams";
 +              LOGDEVPATH="/dev/log";