From 0881d90baf0ce2ec2db853892f60ba8cef5a9d06 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 27 Apr 2015 10:20:19 -0300
Subject: Sanitize siproxd version, add port_category, run_depends and fix pbi
 checking

---
 config/siproxd/siproxd.inc | 6 +++---
 config/siproxd/siproxd.xml | 2 +-
 pkg_config.10.xml          | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc
index d9830fb2..e873e08d 100644
--- a/config/siproxd/siproxd.inc
+++ b/config/siproxd/siproxd.inc
@@ -33,10 +33,10 @@ require_once("service-utils.inc");
 
 // Check to find out on which system the package is running
 $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pfs_version == "2.0") {
-	define('SIPROXD', '/usr/local');
-} else {
+if ($pfs_version == "2.1" || $pfs_version == "2.2") {
 	define('SIPROXD', '/usr/pbi/siproxd-' . php_uname("m"));
+} else {
+	define('SIPROXD', '/usr/local');
 }
 // End of system check
 
diff --git a/config/siproxd/siproxd.xml b/config/siproxd/siproxd.xml
index 8b1b5856..455fca9c 100644
--- a/config/siproxd/siproxd.xml
+++ b/config/siproxd/siproxd.xml
@@ -37,7 +37,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>siproxdsettings</name>
-	<version>0.8.0_2 pkg v1.0.2</version>
+	<version>1.0.3</version>
 	<title>siproxd: Settings</title>
 	<include_file>/usr/local/pkg/siproxd.inc</include_file>
 	<aftersaveredirect>/pkg_edit.php?xml=siproxd.xml&amp;id=0</aftersaveredirect>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d7314352..06e84277 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -530,10 +530,12 @@
 		<config_file>https://packages.pfsense.org/packages/config/siproxd/siproxd.xml</config_file>
 		<depends_on_package_pbi>siproxd-0.8.0_1-##ARCH##.pbi</depends_on_package_pbi>
 		<pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink>
+		<port_category>net</port_category>
+		<run_depends>sbin/siproxd:net/siproxd</run_depends>
 		<build_pbi>
 			<port>net/siproxd</port>
 		</build_pbi>
-		<version>0.8.0_1 pkg v1.0.3</version>
+		<version>1.0.3</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<configurationfile>siproxd.xml</configurationfile>
-- 
cgit v1.2.3