diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 26362b2372d5..044b96a7ffab 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -1,64 +1,64 @@ # Created by: Clement Laforet PORTNAME= haproxy -PORTVERSION= 1.7.13 +PORTVERSION= 1.7.14 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.7/src/ PKGNAMESUFFIX= 17 MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4' BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4' CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy 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} -fcommon" OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS OPTIONS_RADIO= PCRE OPTIONS_RADIO_PCRE= DPCRE SPCRE DPCRE_DESC= Link dynamically SPCRE_DESC= Link statically DEVICEATLAS_DESC= DeviceAtlas Device Detection support OPTIONS_DEFAULT= SPCRE 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 SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_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 OPENSSL_USES= ssl 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 .if ${ARCH} == "amd64" || ${ARCH} == "i386" 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_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/net/haproxy17/distinfo b/net/haproxy17/distinfo index 06c537bc4d6b..1a87e6d16569 100644 --- a/net/haproxy17/distinfo +++ b/net/haproxy17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616176335 -SHA256 (haproxy-1.7.13.tar.gz) = 53ae3ae722236a56cc8b584bf1f8ef422fc40e9ce032d244e256c486c1713600 -SIZE (haproxy-1.7.13.tar.gz) = 1766574 +TIMESTAMP = 1618870509 +SHA256 (haproxy-1.7.14.tar.gz) = 1f9fb6c5a342803037a622c7dd04702b0d010a88b5c3922cd3da71a34f3377a4 +SIZE (haproxy-1.7.14.tar.gz) = 1766999 diff --git a/net/haproxy17/files/patch-ebtree-ebtree.h b/net/haproxy17/files/patch-ebtree-ebtree.h deleted file mode 100644 index 4f5d4a03c32e..000000000000 --- a/net/haproxy17/files/patch-ebtree-ebtree.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ebtree/ebtree.h.orig 2021-03-19 17:56:33.131201000 +0000 -+++ ebtree/ebtree.h 2021-03-19 17:54:50.584874000 +0000 -@@ -247,6 +247,7 @@ - #define _EBTREE_H - - #include -+#include - #include "compiler.h" - - static inline int flsnz8_generic(unsigned int x)