From fbf36587a4c10add5fb46f807d56892c6c39b6d4 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 12 Jun 2015 13:46:02 -0400
Subject: Prepare syslog-ng and ladvd for 2.3+

---
 config/syslog-ng/syslog-ng.inc | 6 +++++-
 pkg_config.10.xml              | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index 818ae123..bbec3a7c 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -37,7 +37,11 @@ require_once('service-utils.inc');
 if(!function_exists("filter_configure")) 
 	require_once("filter.inc");
 
-define("SYSLOGNG_BASEDIR", "/usr/pbi/syslog-ng-" . php_uname("m") . "/");
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version == "2.1" || $pf_version == "2.2")
+	define("SYSLOGNG_BASEDIR", "/usr/pbi/syslog-ng-" . php_uname("m") . "/");
+else
+	define("SYSLOGNG_BASEDIR", "/usr/local/");
 
 function syslogng_get_real_interface_address($interface) {
 	$interface = convert_friendly_interface_to_real_interface_name($interface);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 97f1dfef..a37e9819 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1462,10 +1462,12 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.6.2_3 pkg.v.1.0.6</version>
+		<version>1.0.6</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi>
+		<port_category>sysutils</port_category>
+		<run_depends>sbin/syslog-ng:sysutils/syslog-ng</run_depends>
 		<build_pbi>
 			<ports_before>sysutils/logrotate</ports_before>
 			<port>sysutils/syslog-ng</port>
@@ -1638,6 +1640,8 @@
 		<status>BETA</status>
 		<depends_on_package_pbi>ladvd-1.0.4_1-##ARCH##.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/ladvd/ladvd.xml</config_file>
+		<port_category>net</port_category>
+		<run_depends>sbin/ladvd:net/ladvd</run_depends>
 		<build_pbi>
 			<port>net/ladvd</port>
 		</build_pbi>
-- 
cgit v1.2.3