diff options
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/Makefile | 5 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 8 | ||||
| -rw-r--r-- | net/haproxy/files/haproxy.sh | 19 |
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" |