diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-01 10:07:56 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-01 10:07:56 +0000 |
| commit | e15591b7e92b8bacfa90b6089c9f435d49e01f00 (patch) | |
| tree | 3e083c6b12ab70ce698a85b2f10214ce694cda5c /net/haproxy | |
| parent | 7b8b99fc3aa45654c88b5a4007aec2bda437efaf (diff) | |
| download | pkgsrc-e15591b7e92b8bacfa90b6089c9f435d49e01f00.tar.gz | |
Fix build on SunOS. Clean up patches while here.
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/distinfo | 5 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-Makefile (renamed from net/haproxy/patches/patch-Makefile.diff) | 4 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-include_common_standard.h | 24 |
3 files changed, 30 insertions, 3 deletions
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index bfc0364aada..74b106c94a3 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2016/01/03 17:13:40 morr Exp $ +$NetBSD: distinfo,v 1.20 2016/02/01 10:07:56 jperkin Exp $ SHA1 (deviceatlas-enterprise-c-2.1.zip) = fbd4a4198307616d51518e50d09666aeac2eea29 RMD160 (deviceatlas-enterprise-c-2.1.zip) = fc4b78bc18c80cc19e36fa5b8776cbf8b959abd7 @@ -8,4 +8,5 @@ SHA1 (haproxy-1.6.3.tar.gz) = f7da36b53188fa15551978dfbda80a9e1816fa01 RMD160 (haproxy-1.6.3.tar.gz) = 936f280639b24aa29c71f60660c093a3d0da6b2a SHA512 (haproxy-1.6.3.tar.gz) = 79ed526cd857dcd68d9b8289df4d4a2d87594e8d0d119f4d7c618597db7563a0cedc8417ddcfefb464a322d1fb50cb044656a2fbe78867f58052e0ddaa894bb9 Size (haproxy-1.6.3.tar.gz) = 1555861 bytes -SHA1 (patch-Makefile.diff) = bb8cfc3ce5e2abbe60ddde18affe17fbf4ab7ef2 +SHA1 (patch-Makefile) = 5618e5a15c710267b06756d529486acfdb831e5f +SHA1 (patch-include_common_standard.h) = cc4b46e4923447a2d5d95cff2f241981ed77ad1d diff --git a/net/haproxy/patches/patch-Makefile.diff b/net/haproxy/patches/patch-Makefile index ce55959972b..49b943a163a 100644 --- a/net/haproxy/patches/patch-Makefile.diff +++ b/net/haproxy/patches/patch-Makefile @@ -1,4 +1,6 @@ -$NetBSD: patch-Makefile.diff,v 1.2 2015/12/29 04:04:29 dholland Exp $ +$NetBSD: patch-Makefile,v 1.1 2016/02/01 10:07:56 jperkin Exp $ + +Skip installing unnecessary documentation. --- Makefile.orig 2015-11-03 10:22:06.000000000 +0000 +++ Makefile diff --git a/net/haproxy/patches/patch-include_common_standard.h b/net/haproxy/patches/patch-include_common_standard.h new file mode 100644 index 00000000000..ce706c164dc --- /dev/null +++ b/net/haproxy/patches/patch-include_common_standard.h @@ -0,0 +1,24 @@ +$NetBSD: patch-include_common_standard.h,v 1.1 2016/02/01 10:07:56 jperkin Exp $ + +Fix build on SunOS. + +--- include/common/standard.h.orig 2015-11-03 10:22:06.000000000 +0000 ++++ include/common/standard.h +@@ -1004,7 +1004,7 @@ static inline unsigned char utf8_return_ + * the whole code is optimized out. In little endian, with a decent compiler, + * a few bswap and 2 shifts are left, which is the minimum acceptable. + */ +-#ifndef htonll ++#if !defined(htonll) && !defined(__sun) + static inline unsigned long long htonll(unsigned long long a) + { + union { +@@ -1019,7 +1019,7 @@ static inline unsigned long long htonll( + #endif + + /* Turns 64-bit value <a> from network byte order to host byte order. */ +-#ifndef ntohll ++#if !defined(ntohll) && !defined(__sun) + static inline unsigned long long ntohll(unsigned long long a) + { + return htonll(a); |