Import of pkgsrc-2015Q3

net/haproxy/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2015/06/26 13:37:27 rodent Exp $
+# $NetBSD: Makefile,v 1.21 2015/07/04 13:13:53 morr Exp $
 
-DISTNAME=	haproxy-1.5.12
+DISTNAME=	haproxy-1.5.14
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/
 

net/haproxy/distinfo

@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2015/06/26 13:37:27 rodent Exp $
+$NetBSD: distinfo,v 1.16 2015/07/04 13:13:53 morr Exp $
 
-SHA1 (haproxy-1.5.12.tar.gz) = c488f7f108ddefb558bd86e7cbc1b71636ada856
-RMD160 (haproxy-1.5.12.tar.gz) = b51fb65360e768c788324a02be773ab23946d430
-Size (haproxy-1.5.12.tar.gz) = 1344813 bytes
+SHA1 (haproxy-1.5.14.tar.gz) = 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
+RMD160 (haproxy-1.5.14.tar.gz) = 76577b9bf86390582bf43ae7649ed30761267d5d
+Size (haproxy-1.5.14.tar.gz) = 1345345 bytes
 SHA1 (patch-aa) = be43fca3478d170620607cfe7f4b9ed30f341651
-SHA1 (patch-standard_h) = 08ef71d48cd846d16b7427e6dd133bb4a02d431c

net/haproxy/patches/patch-standard_h

@@ -1,30 +0,0 @@
-$NetBSD: patch-standard_h,v 1.1 2014/07/14 15:30:10 fhajny Exp $
-
-Remove local version of popcount(3), conflicts w/ libc.
-
---- include/common/standard.h.orig	2014-07-12 14:40:52.000000000 +0000
-+++ include/common/standard.h
-@@ -24,6 +24,7 @@
- 
- #include <limits.h>
- #include <string.h>
-+#include <strings.h>
- #include <time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -565,6 +566,7 @@ static inline unsigned int div64_32(unsi
- 	return result;
- }
- 
-+#if !defined(__NetBSD__)
- /* Simple popcount implementation. It returns the number of ones in a word */
- static inline unsigned int popcount(unsigned long a)
- {
-@@ -575,6 +577,7 @@ static inline unsigned int popcount(unsi
- 	}
- 	return cnt;
- }
-+#endif
- 
- /* Build a word with the <bits> lower bits set (reverse of popcount) */
- static inline unsigned long nbits(int bits)