Update to latest stable release, 1.4.25. Some changes to files/haproxy.sh:

* Don't hardcode PREFIX nor PKG_SYSCONFDIR;
* Add a configtest() function to test the configuration file before restart
  so lazy SysOps (me) don't have to remember command arguments;

From CHANGELOG:

    - DOC: typo: nosepoll self reference in config guide
    - BUG/MINOR: deinit: free fdinfo while doing cleanup
    - BUG/MEDIUM: server: set the macro for server's max weight SRV_UWGHT_MAX to SRV_UWGHT_RANGE
    - BUG/MINOR: use the same check condition for server as other algorithms
    - BUG/MINOR: stream-int: also consider ENOTCONN in addition to EAGAIN for recv()
    - BUG/MINOR: fix forcing fastinter in "on-error"
    - BUG/MEDIUM: http/auth: Sometimes the authentication credentials can be mix between two requests
    - BUG/MAJOR: http: don't emit the send-name-header when no server is available
    - BUG/MEDIUM: http: "option checkcache" fails with the no-cache header
    - MEDIUM: session: disable lingering on the server when the client aborts
    - MINOR: config: warn when a server with no specific port uses rdp-cookie
    - MEDIUM: increase chunk-size limit to 2GB-1
    - DOC: add a mention about the limited chunk size
    - MEDIUM: http: add "redirect scheme" to ease HTTP to HTTPS redirection
    - BUILD: proto_tcp: remove a harmless warning
    - BUG/MINOR: acl: remove patterns from the tree before freeing them
    - BUG/MEDIUM: checks: fix slow start regression after fix attempt
    - BUG/MAJOR: server: weight calculation fails for map-based algorithms
    - BUG/MINOR: backend: fix target address retrieval in transparent mode
    - BUG/MEDIUM: stick: completely remove the unused flag from the store entries
    - BUG/MEDIUM: stick-tables: complete the latest fix about store-responses
    - BUG/MEDIUM: checks: tracking servers must not inherit the MAINT flag
    - BUG/MINOR: stats: report correct throttling percentage for servers in slowstart
    - BUG/MINOR: stats: correctly report throttle rate of low weight servers
    - BUG/MINOR: checks: successful check completion must not re-enable MAINT servers
    - BUG/MEDIUM: stats: the web interface must check the tracked servers before enabling
    - BUG/MINOR: channel: initialize xfer_small/xfer_large on new buffers
    - BUG/MINOR: stream-int: also consider ENOTCONN in addition to EAGAIN
    - BUG/MEDIUM: http: don't start to forward request data before the connect
    - DOC: fix misleading information about SIGQUIT
    - BUILD: simplify the date and version retrieval in the makefile
    - BUILD: prepare the makefile to skip format lines in SUBVERS and VERDATE
    - BUILD: use format tags in VERDATE and SUBVERS files

3 files changed, 21 insertions, 11 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 963d9df2e11..55e553f9232 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2014/04/24 16:23:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2014/04/27 01:28:01 rodent Exp $
 
-DISTNAME=	haproxy-1.4.24
-PKGREVISION=	2
+DISTNAME=	haproxy-1.4.25
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 40e9a9aa897..1b469b1d1eb 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2014/04/24 16:23:59 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2014/04/27 01:28:01 rodent Exp $
 
-SHA1 (haproxy-1.4.24.tar.gz) = 0c5104d029d8d58d39b0d94179edd84c661306d1
-RMD160 (haproxy-1.4.24.tar.gz) = b176de6feb19aec40f1808d81c10e0ff3f229e16
-Size (haproxy-1.4.24.tar.gz) = 836768 bytes
+SHA1 (haproxy-1.4.25.tar.gz) = f5c7dcaf0e8190f86e58b8e106dbc53609beaacd
+RMD160 (haproxy-1.4.25.tar.gz) = ececa8cf89c2c323016ba043ce5fc7e609b49efd
+Size (haproxy-1.4.25.tar.gz) = 838775 bytes
 SHA1 (patch-aa) = ad0de5c2ae97f4794635cdb823ec6b3049a50054
 SHA1 (patch-ab) = 10e051618f1fc561f5e5c87af576a87e1c3a884b
diff --git a/net/haproxy/files/haproxy.sh b/net/haproxy/files/haproxy.sh
index bc2b733f9f3..4c0481ce77b 100644
--- a/net/haproxy/files/haproxy.sh
+++ b/net/haproxy/files/haproxy.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: haproxy.sh,v 1.1.1.1 2011/10/31 23:34:07 morr Exp $
+# $NetBSD: haproxy.sh,v 1.2 2014/04/27 01:28:01 rodent Exp $
 #
 
 # PROVIDE: haproxy
@@ -10,10 +10,21 @@ $_rc_subr_loaded . /etc/rc.subr
 
 name="haproxy"
 rcvar=$name
-command="/usr/pkg/sbin/${name}"
-conf_file="/usr/pkg/etc/${name}.cfg"
+command="@PREFIX@/sbin/${name}"
+conf_file="@PKG_SYSCONFDIR@/${name}.cfg"
 required_files="${conf_file}"
-command_args="-f $conf_file"
+command_args="-f ${conf_file}"
+extra_commands="configtest"
+configtest_cmd="haproxy_configtest"
+
+haproxy_configtest()
+{
+	if [ ! -f ${conf_file} ]; then
+		warn "${conf_file} does not exist."
+		return 1;
+	fi
+	${command} -c -f ${conf_file}
+}
 
 load_rc_config $name
 run_rc_command "$1"