Index: head/net/haproxy/files/haproxy.in
===================================================================
--- head/net/haproxy/files/haproxy.in	(revision 448025)
+++ head/net/haproxy/files/haproxy.in	(revision 448026)
@@ -1,117 +1,125 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: haproxy
 # REQUIRE: DAEMON LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable haproxy:
 #
 # haproxy_enable (bool):	default: "NO"
 #				Set to "YES" to enable haproxy
 # haproxy_pidfile (str):	default: /var/run/haproxy.pid
 #				Set to the full path of the pid file
 # haproxy_config (str):		default: %%PREFIX%%/etc/haproxy.conf
 #				Set to the full path of the config file
 # haproxy_flags (str):		default: Autogenerated using pidfile and config options
 #				Set to override with your own options
 # haproxy_profiles (str):	default: empty
 # Set to space-separated list of profiles: for each profile separate haproxy
 # process will be spawned, with haproxy-${profile}.conf config file.
 # You can override default pidfile and config file for each profile with
 # haproxy_${profile}_config and haproxy_${profile}_pidfile.
 
 . /etc/rc.subr
 
 name="haproxy"
 rcvar=haproxy_enable
 command="%%PREFIX%%/sbin/haproxy"
-extra_commands="reload configtest"
+extra_commands="reload configtest hardstop hardreload"
 reload_cmd="haproxy_reload"
+hardreload_cmd="haproxy_reload"
+hardreload_precmd="def_hardreload_option"
 stop_cmd="haproxy_stop"
+hardstop_cmd="haproxy_stop"
+hardstop_precmd="def_hardstop_signal"
 
 : ${haproxy_enable:="NO"}
 : ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
 pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
 
-if [ -z "$rc_force" ]; then
-    sig_stop="USR1"
-fi
+def_hardreload_option()
+{
+    reload_opt="-st"
+}
 
+def_hardstop_signal()
+{
+    sig_stop="TERM"
+}
+
 load_rc_config $name
 
 is_valid_profile() {
     local profile
     for profile in $haproxy_profiles; do
         if [ "$profile" = "$1" ]; then
             return 0
         fi
     done
     return 1
 }
 
 if [ -n "$2" ]; then
     profile=$2
     if ! is_valid_profile $profile; then
         echo "$0: no such profile ($profile) defined in ${name}_profiles."
         exit 1
     fi
     eval haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}"
     eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}"
 else
     if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then
         for profile in ${haproxy_profiles}; do
             echo "===> ${name} profile: ${profile}"
             %%PREFIX%%/etc/rc.d/haproxy $1 ${profile}
             retcode="$?"
             if [ ${retcode} -ne 0 ]; then
                 failed="${profile} (${retcode}) ${failed:-}"
             else
                 success="${profile} ${success:-}"
             fi
         done
         exit 0
     fi
 fi
 
 : ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"}
 configtest_cmd="$command -c -f $haproxy_config"
 start_precmd="$command -q -c -f $haproxy_config"
 required_files=$haproxy_config
+sig_stop=SIGUSR1
+reload_opt="-sf"
 
 haproxy_reload()
 {
 	${command} -q -c -f ${haproxy_config}
 	if [ $? -ne 0 ]; then
 	    err 1 "Error found in ${haproxy_config} - not reloading current process!"
 	fi
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
-		if [ -z "$rc_force" ]; then
-			${command} ${haproxy_flags} -sf $(cat ${pidfile})
-		else
-			${command} ${haproxy_flags} -st $(cat ${pidfile})
-		fi
+		${command} ${haproxy_flags} $reload_opt $(cat ${pidfile})
 	else
 		_run_rc_notrunning
 		return 1
 	fi
 }
 
 haproxy_stop()
 {
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
 		rc_pid=$(cat ${pidfile})
 		kill -$sig_stop $rc_pid
 		wait_for_pids $rc_pid
 	else
 		_run_rc_notrunning
 		return 1
 	fi
 }
 
 run_rc_command "$1"
Index: head/net/haproxy-devel/files/haproxy.in
===================================================================
--- head/net/haproxy-devel/files/haproxy.in	(revision 448025)
+++ head/net/haproxy-devel/files/haproxy.in	(revision 448026)
@@ -1,117 +1,125 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: haproxy
 # REQUIRE: DAEMON LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable haproxy:
 #
 # haproxy_enable (bool):	default: "NO"
 #				Set to "YES" to enable haproxy
 # haproxy_pidfile (str):	default: /var/run/haproxy.pid
 #				Set to the full path of the pid file
 # haproxy_config (str):		default: %%PREFIX%%/etc/haproxy.conf
 #				Set to the full path of the config file
 # haproxy_flags (str):		default: Autogenerated using pidfile and config options
 #				Set to override with your own options
 # haproxy_profiles (str):	default: empty
 # Set to space-separated list of profiles: for each profile separate haproxy
 # process will be spawned, with haproxy-${profile}.conf config file.
 # You can override default pidfile and config file for each profile with
 # haproxy_${profile}_config and haproxy_${profile}_pidfile.
 
 . /etc/rc.subr
 
 name="haproxy"
 rcvar=haproxy_enable
 command="%%PREFIX%%/sbin/haproxy"
-extra_commands="reload configtest"
+extra_commands="reload configtest hardstop hardreload"
 reload_cmd="haproxy_reload"
+hardreload_cmd="haproxy_reload"
+hardreload_precmd="def_hardreload_option"
 stop_cmd="haproxy_stop"
+hardstop_cmd="haproxy_stop"
+hardstop_precmd="def_hardstop_signal"
 
 : ${haproxy_enable:="NO"}
 : ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
 pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
 
-if [ -z "$rc_force" ]; then
-    sig_stop="USR1"
-fi
+def_hardreload_option()
+{
+    reload_opt="-st"
+}
 
+def_hardstop_signal()
+{
+    sig_stop="TERM"
+}
+
 load_rc_config $name
 
 is_valid_profile() {
     local profile
     for profile in $haproxy_profiles; do
         if [ "$profile" = "$1" ]; then
             return 0
         fi
     done
     return 1
 }
 
 if [ -n "$2" ]; then
     profile=$2
     if ! is_valid_profile $profile; then
         echo "$0: no such profile ($profile) defined in ${name}_profiles."
         exit 1
     fi
     eval haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}"
     eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}"
 else
     if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then
         for profile in ${haproxy_profiles}; do
             echo "===> ${name} profile: ${profile}"
             %%PREFIX%%/etc/rc.d/haproxy $1 ${profile}
             retcode="$?"
             if [ ${retcode} -ne 0 ]; then
                 failed="${profile} (${retcode}) ${failed:-}"
             else
                 success="${profile} ${success:-}"
             fi
         done
         exit 0
     fi
 fi
 
 : ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"}
 configtest_cmd="$command -c -f $haproxy_config"
 start_precmd="$command -q -c -f $haproxy_config"
 required_files=$haproxy_config
+sig_stop=SIGUSR1
+reload_opt="-sf"
 
 haproxy_reload()
 {
 	${command} -q -c -f ${haproxy_config}
 	if [ $? -ne 0 ]; then
 	    err 1 "Error found in ${haproxy_config} - not reloading current process!"
 	fi
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
-		if [ -z "$rc_force" ]; then
-			${command} ${haproxy_flags} -sf $(cat ${pidfile})
-		else
-			${command} ${haproxy_flags} -st $(cat ${pidfile})
-		fi
+		${command} ${haproxy_flags} $reload_opt $(cat ${pidfile})
 	else
 		_run_rc_notrunning
 		return 1
 	fi
 }
 
 haproxy_stop()
 {
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
 		rc_pid=$(cat ${pidfile})
 		kill -$sig_stop $rc_pid
 		wait_for_pids $rc_pid
 	else
 		_run_rc_notrunning
 		return 1
 	fi
 }
 
 run_rc_command "$1"