git: 463d4b107e8d - main - net/haproxy: update to version 2.4.0.

[Dmitry Sivachenko]

The branch main has been updated by demon:

URL: https://cgit.FreeBSD.org/ports/commit/?id=463d4b107e8dacde4f0869502ca1d5a7d588fe5f

commit 463d4b107e8dacde4f0869502ca1d5a7d588fe5f
Author:     Dmitry Sivachenko <demon at FreeBSD.org>
AuthorDate: 2021-06-16 21:37:29 +0000
Commit:     Dmitry Sivachenko <demon at FreeBSD.org>
CommitDate: 2021-06-16 21:37:29 +0000

    net/haproxy: update to version 2.4.0.
---
 net/haproxy/Makefile  | 10 ++++------
 net/haproxy/distinfo  |  6 +++---
 net/haproxy/pkg-plist | 11 +++++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7c0d9d21467b..3c8f03e5cc63 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,9 +1,9 @@
 # Created by: Hugo Saro <hugo at barafranca.com>
 
 PORTNAME=	haproxy
-DISTVERSION=	2.2.14
+DISTVERSION=	2.4.0
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/2.2/src/
+MASTER_SITES=	http://www.haproxy.org/download/2.4/src/
 
 MAINTAINER=	demon at FreeBSD.org
 COMMENT=	Reliable, high performance TCP/HTTP load balancer
@@ -23,6 +23,7 @@ CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haprox
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy
 
+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 \
 		CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}"
@@ -58,12 +59,9 @@ OPTIONS_DEFAULT+=	LUA
 MAKE_ARGS+=	USE_REGPARM=1
 .endif
 
-post-build:
-	cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/admin/halog/halog ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index df73a0e63689..8c0e35714f6c 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619725872
-SHA256 (haproxy-2.2.14.tar.gz) = 6a9b702f04b07786f3e5878de8172a727acfdfdbc1cefe1c7a438df372f2fb61
-SIZE (haproxy-2.2.14.tar.gz) = 2923727
+TIMESTAMP = 1623879154
+SHA256 (haproxy-2.4.0.tar.gz) = 0a6962adaf5a1291db87e3eb4ddf906a72fed535dbd2255b164b7d8394a53640
+SIZE (haproxy-2.4.0.tar.gz) = 3570069
diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist
index 09381167265d..1d98e5cecf49 100644
--- a/net/haproxy/pkg-plist
+++ b/net/haproxy/pkg-plist
@@ -49,10 +49,15 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/htx-api.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/initcalls.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/list.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/list.png
 %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png
 %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf
+%%PORTDOCS%%%%DOCSDIR%%/internals/muxes.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/muxes.pdf
+%%PORTDOCS%%%%DOCSDIR%%/internals/muxes.png
+%%PORTDOCS%%%%DOCSDIR%%/internals/muxes.svg
 %%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia
@@ -60,6 +65,10 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/sched.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/sched.pdf
+%%PORTDOCS%%%%DOCSDIR%%/internals/sched.png
+%%PORTDOCS%%%%DOCSDIR%%/internals/sched.svg
 %%PORTDOCS%%%%DOCSDIR%%/internals/ssl_cert.dia
 %%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
@@ -82,6 +91,7 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt
 %%PORTDOCS%%%%DOCSDIR%%/seamless_reload.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic-config-edge.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http
@@ -93,6 +103,7 @@ sbin/haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quick-test.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks4.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg