new dev6 version with (hopefully) temporary patch.

[David Carlier <devnexen%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David Carlier <devnexen%gmail.com@localhost>
Pushed By:	devnexen
Date:		Tue Sep 29 20:54:48 2015 +0100
Changeset:	eedff804c8ab38fcb2d22e9d01fa4f143adb054b

Modified Files:
	haproxy-devel/Makefile
	haproxy-devel/PLIST
Added Files:
	haproxy-devel/distinfo
	haproxy-devel/files/haproxy.sh
	haproxy-devel/patches/patch-src_proto__tcp.c

Log Message:
new dev6 version with (hopefully) temporary patch.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eedff804c8ab38fcb2d22e9d01fa4f143adb054b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 haproxy-devel/Makefile                       |  3 ++-
 haproxy-devel/PLIST                          | 10 +++++-----
 haproxy-devel/distinfo                       |  6 ++++++
 haproxy-devel/files/haproxy.sh               | 30 ++++++++++++++++++++++++++++
 haproxy-devel/patches/patch-src_proto__tcp.c | 13 ++++++++++++
 5 files changed, 56 insertions(+), 6 deletions(-)

diffs:
diff --git a/haproxy-devel/Makefile b/haproxy-devel/Makefile
index ee6cee4..7fb3c47 100644
--- a/haproxy-devel/Makefile
+++ b/haproxy-devel/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/09/01 20:45:04 devnexen Exp $
 
-DISTNAME=	haproxy-1.6-dev4
+DISTNAME=	haproxy-1.6-dev6
+PKGBASE=	haproxy-devel
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/1.6/src/devel/
 DISTFILES=	${DISTNAME}.tar.gz
diff --git a/haproxy-devel/PLIST b/haproxy-devel/PLIST
index 1eeabc1..6461702 100644
--- a/haproxy-devel/PLIST
+++ b/haproxy-devel/PLIST
@@ -2,8 +2,8 @@
 man/man1/haproxy.1
 sbin/haproxy
 sbin/haproxy-systemd-wrapper
-share/doc/haproxy/architecture.txt
-share/doc/haproxy/configuration.txt
-share/doc/haproxy/haproxy-en.txt
-share/doc/haproxy/haproxy-fr.txt
-share/examples/haproxy/haproxy.cfg
+share/doc/haproxy-devel/architecture.txt
+share/doc/haproxy-devel/configuration.txt
+share/doc/haproxy-devel/haproxy-en.txt
+share/doc/haproxy-devel/haproxy-fr.txt
+share/examples/haproxy-devel/haproxy.cfg
diff --git a/haproxy-devel/distinfo b/haproxy-devel/distinfo
new file mode 100644
index 0000000..f7d4b2e
--- /dev/null
+++ b/haproxy-devel/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (haproxy-1.6-dev6.tar.gz) = d4d69aa843b25951b10ddaf8d9622d56a0edb727
+RMD160 (haproxy-1.6-dev6.tar.gz) = 10329a09330159a1598f63ff11efcde9525bf696
+Size (haproxy-1.6-dev6.tar.gz) = 1652340 bytes
+SHA1 (patch-src_proto__tcp.c) = 65fb30eafc892e6c2cac4ae98441546ccd9b1312
diff --git a/haproxy-devel/files/haproxy.sh b/haproxy-devel/files/haproxy.sh
new file mode 100644
index 0000000..4c0481c
--- /dev/null
+++ b/haproxy-devel/files/haproxy.sh
@@ -0,0 +1,30 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: haproxy.sh,v 1.2 2014/04/27 01:28:01 rodent Exp $
+#
+
+# PROVIDE: haproxy
+# REQUIRE: network
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="haproxy"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+conf_file="@PKG_SYSCONFDIR@/${name}.cfg"
+required_files="${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"
diff --git a/haproxy-devel/patches/patch-src_proto__tcp.c b/haproxy-devel/patches/patch-src_proto__tcp.c
new file mode 100644
index 0000000..94449ea
--- /dev/null
+++ b/haproxy-devel/patches/patch-src_proto__tcp.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/proto_tcp.c.orig	2015-09-29 19:30:47.000000000 +0000
++++ src/proto_tcp.c
+@@ -1456,7 +1456,7 @@ static enum act_return tcp_exec_action_s
+ 	 * network and has no effect on local net.
+ 	 */
+ #ifdef IP_TTL
+-	setsockopt(conn->t.sock.fd, SOL_IP, IP_TTL, &one, sizeof(one));
++	setsockopt(conn->t.sock.fd, IPPROTO_IP, IP_TTL, &one, sizeof(one));
+ #endif
+  out:
+ 	/* kill the stream if any */