From 512730bd1af521e6d4a948e22f4dabed7b4e5cbe Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 13 Nov 2020 10:56:36 +0100
Subject: [PATCH] system: syslog-ng again; fix this the hard way

---
 Makefile       | 3 +--
 Mk/defaults.mk | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 96661f68e..704e760bb 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,6 @@ all:
 CORE_ABI?=	20.7
 CORE_PHP?=	72
 CORE_PYTHON?=	37
-CORE_SYSLOGNG?=	3.29
 
 .if exists(${GIT}) && exists(${GITVERSION})
 . if ${CORE_ABI} == "20.7"
@@ -142,7 +141,7 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			squid \
 			strongswan \
 			sudo \
-			syslog-ng${CORE_SYSLOGNG:S/.//g} \
+			syslog-ng \
 			syslogd \
 			unbound \
 			wpa_supplicant \
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 62ae0c3bf..b26476f85 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -67,6 +67,11 @@ _CORE_PYTHON!=	${PYTHONLINK} -V
 CORE_PYTHON?=	${_CORE_PYTHON:[2]:S/./ /g:[1..2]:tW:S/ //}
 .endif
 
+.if exists(${PKG})
+_CORE_SYSLOGNG!= ${PKG} query %v syslog-ng
+CORE_SYSLOGNG?=  ${_CORE_SYSLOGNG:S/./ /g:[1..2]:tW:S/ /./g}
+.endif
+
 REPLACEMENTS=	CORE_ABI \
 		CORE_ARCH \
 		CORE_COMMIT \