Fix rcvar declaration that I broke yesterday and bump necessary package versions

9 files changed, 26 insertions, 26 deletions

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 803d857e..15fbcd17 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -374,7 +374,7 @@ function haproxy_custom_php_install_command() {
 . /etc/rc.subr
 
 name="haproxy"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 command="/usr/pbi/haproxy-devel-`uname -m`/sbin/haproxy"
 haproxy_enable=\${haproxy-"YES"}
 
diff --git a/config/haproxy-legacy/haproxy.inc b/config/haproxy-legacy/haproxy.inc
index b6c22899..9058b4a6 100644
--- a/config/haproxy-legacy/haproxy.inc
+++ b/config/haproxy-legacy/haproxy.inc
@@ -81,7 +81,7 @@ function haproxy_custom_php_install_command() {
 . /etc/rc.subr
 
 name="haproxy"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 command="/usr/local/bin/haproxy"
 haproxy_enable=\${haproxy-"YES"}
 
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 13bdaeab..6d4ba0e5 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -85,7 +85,7 @@ function haproxy_custom_php_install_command() {
 . /etc/rc.subr
 
 name="haproxy"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 command="/usr/local/bin/haproxy"
 haproxy_enable=\${haproxy-"YES"}
 
diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 3fdf2edd..643cb837 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -127,7 +127,7 @@ function nrpe2_custom_php_install_command() {
 
 nrpe2_enable=\${nrpe2_enable-"YES"}
 name="nrpe2"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 
 command="{$nrpe2_binary}"
 command_args="-d"
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc
index 1b909d34..a90f5702 100644
--- a/config/open-vm-tools_2/open-vm-tools.inc
+++ b/config/open-vm-tools_2/open-vm-tools.inc
@@ -42,7 +42,7 @@ checkvm_cmd="/usr/local/bin/vmware-checkvm > /dev/null"
 
 # VMware guest daemon
 name="vmware_guestd"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 start_precmd="\${checkvm_cmd}"
 unset start_cmd
 stop_precmd="\${checkvm_cmd}"
@@ -100,7 +100,7 @@ vmware_guest_vmhgfs_start()
 
 # VMware kernel module: vmmemctl
 name="vmware_guest_vmmemctl"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 start_precmd="\${checkvm_cmd}"
 start_cmd="vmware_guest_vmmemctl_start"
 stop_precmd="\${checkvm_cmd}"
@@ -112,7 +112,7 @@ run_rc_command "\$1"
 
 # VMware kernel module: vmxnet
 name="vmware_guest_vmxnet"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 start_precmd="\${checkvm_cmd}"
 start_cmd="vmware_guest_vmxnet_start"
 stop_precmd="\${checkvm_cmd}"
@@ -124,7 +124,7 @@ run_rc_command "\$1"
 
 # VMware kernel module: vmblock
 name="vmware_guest_vmblock"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 start_precmd="\${checkvm_cmd}"
 start_cmd="vmware_guest_vmblock_start"
 stop_precmd="\${checkvm_cmd}"
@@ -136,7 +136,7 @@ run_rc_command "\$1"
 
 # VMware kernel module: vmhgfs
 name="vmware_guest_vmhgfs"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 start_precmd="\${checkvm_cmd}"
 start_cmd="vmware_guest_vmhgfs_start"
 stop_precmd="\${checkvm_cmd}"
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index c53926aa..047383ff 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -73,7 +73,7 @@ function tinydns_custom_php_install_command() {
 . /etc/rc.subr
 
 name="svscan"
-rcvar="\${name}"
+rcvar="\${name}_enable"
 command="/usr/local/bin/svscan"
 svscan_enable=\${svscan_enable-"YES"}
 svscan_servicedir=\${svscan_servicedir-"{$g['varrun_path']}/service"}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index fd75e618..31567875 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -137,7 +137,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.9 pkg v 0.19</version>
+		<version>1.5.9 pkg v 0.20</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -588,7 +588,7 @@
 		<descr>pfSense version of TinyDNS which features failover host support</descr>
 		<website>http://cr.yp.to/djbdns.html</website>
 		<category>Services</category>
-		<version>1.0.6.20</version>
+		<version>1.0.6.21</version>
 		<status>Beta</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Tinydns_package</pkginfolink>
 		<required_version>2.2</required_version>
@@ -606,7 +606,7 @@
 		<descr>VMware Tools</descr>
 		<website>http://open-vm-tools.sourceforge.net/</website>
 		<category>Services</category>
-		<version>1280544_9</version>
+		<version>1280544_10</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
 		<required_version>2.2</required_version>
@@ -1136,7 +1136,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.15_5 v2.2_2</version>
+		<version>2.15_5 v2.2_3</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index f4c0161d..7dbe2b06 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -131,7 +131,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.2.5</version>
+		<version>1.4.24 pkg v 1.2.6</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy/haproxy.xml</config_file>
@@ -149,7 +149,7 @@
 				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.1.1</version>
+		<version>1.4.24 pkg v 1.1.2</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file>
@@ -166,7 +166,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.19</version>
+		<version>1.5.3 pkg v 0.20</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -784,7 +784,7 @@
 		<descr>pfSense version of TinyDNS which features failover host support</descr>
 		<website>http://cr.yp.to/djbdns.html</website>
 		<category>Services</category>
-		<version>1.0.6.19</version>
+		<version>1.0.6.21</version>
 		<status>Beta</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Tinydns_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -809,7 +809,7 @@
 		<descr>VMware Tools</descr>
 		<website>http://open-vm-tools.sourceforge.net/</website>
 		<category>Services</category>
-		<version>8.7.0.3046.1 (build-425873)</version>
+		<version>8.7.0.3046.1_1 (build-425873)</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -1543,7 +1543,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.12_4 v2.2_2</version>
+		<version>2.12_4 v2.2_3</version>
 		<status>Beta</status>
 		<required_version>1.2</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 985e3c85..cb655774 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -118,7 +118,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.2.5</version>
+		<version>1.4.24 pkg v 1.2.6</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy/haproxy.xml</config_file>
@@ -136,7 +136,7 @@
 				(Legacy version)]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.24 pkg v 1.1.1</version>
+		<version>1.4.24 pkg v 1.1.2</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-legacy/haproxy.xml</config_file>
@@ -153,7 +153,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.19</version>
+		<version>1.5.3 pkg v 0.20</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -771,7 +771,7 @@
 		<descr>pfSense version of TinyDNS which features failover host support</descr>
 		<website>http://cr.yp.to/djbdns.html</website>
 		<category>Services</category>
-		<version>1.0.6.19</version>
+		<version>1.0.6.21</version>
 		<status>Beta</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Tinydns_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -796,7 +796,7 @@
 		<descr>VMware Tools</descr>
 		<website>http://open-vm-tools.sourceforge.net/</website>
 		<category>Services</category>
-		<version>8.7.0.3046.1 (build-425873)</version>
+		<version>8.7.0.3046.1_1 (build-425873)</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
 		<required_version>2.0</required_version>
@@ -1530,7 +1530,7 @@
 		</build_pbi>
 		<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
-		<version>2.12_4 v2.2_2</version>
+		<version>2.12_4 v2.2_3</version>
 		<status>Beta</status>
 		<required_version>1.2</required_version>
 		<maintainer>erik@erikkristensen.com</maintainer>