summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2021-09-16 12:02:12 +0000
committerwiz <wiz@pkgsrc.org>2021-09-16 12:02:12 +0000
commit918de0779394857f951a4202c67935807d6becb3 (patch)
tree038ea711c13b7a9c7c8f20af41b453f75d9e9342
parentbc367c8bea130166db0e60f2ef88fefc3dbde4ec (diff)
downloadpkgsrc-918de0779394857f951a4202c67935807d6becb3.tar.gz
syslog-ng: simplify patch for upstreaming, and add pull request URL
-rw-r--r--sysutils/syslog-ng/Makefile9
-rw-r--r--sysutils/syslog-ng/Makefile.common4
-rw-r--r--sysutils/syslog-ng/distinfo4
-rw-r--r--sysutils/syslog-ng/patches/patch-ac13
4 files changed, 14 insertions, 16 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 144a3ae8676..1f40b35b743 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -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}
diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common
index f93dc2886cf..2681e1f66d6 100644
--- a/sysutils/syslog-ng/Makefile.common
+++ b/sysutils/syslog-ng/Makefile.common
@@ -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_inotify_init=no
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
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 35f8ffc2f3d..e727be05d7b 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -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
diff --git a/sysutils/syslog-ng/patches/patch-ac b/sysutils/syslog-ng/patches/patch-ac
index a12268fa7e3..d8157c5d90f 100644
--- a/sysutils/syslog-ng/patches/patch-ac
+++ b/sysutils/syslog-ng/patches/patch-ac
@@ -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>
#
@@ -13,10 +14,8 @@ $NetBSD: patch-ac,v 1.3 2015/10/29 16:34:13 fhajny Exp $
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";