net/haproxy-devel: update to version 2.6-dev2

3 files changed, 32 insertions, 28 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 0843de3e7be9..b53f2358a401 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -1,9 +1,9 @@
 # Created by: Hugo Saro <hugo@barafranca.com>
 
 PORTNAME=	haproxy
-DISTVERSION=	2.5-dev13
+DISTVERSION=	2.6-dev2
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/2.5/src/devel/
+MASTER_SITES=	http://www.haproxy.org/download/2.6/src/devel/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
@@ -13,30 +13,47 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
+FLAVORS=	default lua
+FLAVOR?=	${FLAVORS:[1]}
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy
 
+default_CONFLICTS_INSTALL=	haproxy-devel-lua
+lua_CONFLICTS_INSTALL=		haproxy-devel
+lua_PKGNAMESUFFIX=		devel-lua
+
+CONFLICTS_INSTALL=	haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 haproxy22 haproxy23 haproxy24
+
 ALL_TARGET=	all admin/halog/halog
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
 		USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \
 		USE_TFO=1 USE_THREAD_DUMP=1 \
-		CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}"
+		CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" \
+		${MAKE_ARGS_${ARCH}}
+
+MAKE_ARGS_i386=		USE_LIBATOMIC=
+MAKE_ARGS_powerpc=	USE_LIBATOMIC=
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX
 OPTIONS_RADIO=		PCRE
-OPTIONS_RADIO_PCRE=	DPCRE SPCRE
-DPCRE_DESC=		Link dynamically
-SPCRE_DESC=		Link statically
+OPTIONS_RADIO_PCRE=	DPCRE DPCRE2 SPCRE SPCRE2
+DPCRE_DESC=		Link pcre(1) dynamically
+DPCRE2_DESC=		Link pcre2 dynamically
+SPCRE_DESC=		Link pcre(1) statically
+SPCRE2_DESC=		Link pcre2 statically
 DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
 PROMEX_DESC=		Enable Prometheus exporter
-OPTIONS_DEFAULT=	SPCRE OPENSSL
+OPTIONS_DEFAULT=	DPCRE2 OPENSSL
 
 DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
-SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+DPCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+DPCRE2_MAKE_ARGS=	USE_PCRE2=1 USE_PCRE2_JIT=1
+SPCRE_BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre.a:devel/pcre
 SPCRE_MAKE_ARGS=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
+SPCRE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre2-8.a:devel/pcre2
+SPCRE2_MAKE_ARGS=	USE_PCRE2=1 USE_STATIC_PCRE2=1 USE_PCRE2_JIT=1
 DEVICEATLAS_LIB_DEPENDS=	libda.so:net/deviceatlas-enterprise-c
 DEVICEATLAS_MAKE_ARGS=		USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
 PROMEX_MAKE_ARGS=	USE_PROMEX=1
@@ -45,10 +62,8 @@ OPENSSL_MAKE_ARGS=	USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
 LUA_USES=		lua:53
 LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-MAKE_ARGS+=	USE_REGPARM=1
+.if ${FLAVOR:U} == lua
+OPTIONS_DEFAULT+=	LUA
 .endif
 
 do-install:
@@ -60,4 +75,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 1fdd26df2170..351bd8c4bc1f 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636222546
-SHA256 (haproxy-2.5-dev13.tar.gz) = 02dcce857697fd90b9fa070c2be26964ced1e32c13361fa0b606c9c9f62775ec
-SIZE (haproxy-2.5-dev13.tar.gz) = 3786531
+TIMESTAMP = 1645989246
+SHA256 (haproxy-2.6-dev2.tar.gz) = 15628f8870e786c45d704e750ce5a5bf1568365e81a4bfc2d023e481f79a2946
+SIZE (haproxy-2.6-dev2.tar.gz) = 3870378
diff --git a/net/haproxy-devel/files/patch-include-haproxy-atomic.h b/net/haproxy-devel/files/patch-include-haproxy-atomic.h
deleted file mode 100644
index d8b7c8ea15cb..000000000000
--- a/net/haproxy-devel/files/patch-include-haproxy-atomic.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/haproxy/atomic.h.orig	2018-02-17 18:17:22.219400000 +0000
-+++ include/haproxy/atomic.h	2018-02-17 18:18:44.598422000 +0000
-@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit 
- /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
-  * have a header file regrouping all functions dealing with threads. */
- 
--#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
-+#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__))
- /* gcc < 4.7 */
- 
- #define HA_ATOMIC_ADD(val, i)        __sync_add_and_fetch(val, i)