Index: head/net/haproxy-devel/Makefile =================================================================== --- head/net/haproxy-devel/Makefile (revision 540564) +++ head/net/haproxy-devel/Makefile (revision 540565) @@ -1,63 +1,63 @@ # Created by: Hugo Saro # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 2.2-dev8 +DISTVERSION= 2.2-dev11 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/2.2/src/devel/ PKGNAMESUFFIX= -devel DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= demon@FreeBSD.org COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* USES= compiler:c++11-lang 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}" 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 Index: head/net/haproxy-devel/distinfo =================================================================== --- head/net/haproxy-devel/distinfo (revision 540564) +++ head/net/haproxy-devel/distinfo (revision 540565) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590170098 -SHA256 (haproxy-2.2-dev8.tar.gz) = e1eb2903784a9bb2907ddcba4f1697cdff35c654216dc4063a7c99f236f8609d -SIZE (haproxy-2.2-dev8.tar.gz) = 2836769 +TIMESTAMP = 1593245870 +SHA256 (haproxy-2.2-dev11.tar.gz) = d26276b3d6b04a5d4f3a12929c31a5c6e1621cdd0d7e25b66fe0d09f8884b788 +SIZE (haproxy-2.2-dev11.tar.gz) = 2854410 Index: head/net/haproxy-devel/files/patch-include-common-hathreads.h =================================================================== --- head/net/haproxy-devel/files/patch-include-common-hathreads.h (revision 540564) +++ head/net/haproxy-devel/files/patch-include-common-hathreads.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 -+++ include/common/hathreads.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) Property changes on: head/net/haproxy-devel/files/patch-include-common-hathreads.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/haproxy-devel/files/patch-include-haproxy-atomic.h =================================================================== --- head/net/haproxy-devel/files/patch-include-haproxy-atomic.h (nonexistent) +++ head/net/haproxy-devel/files/patch-include-haproxy-atomic.h (revision 540565) @@ -0,0 +1,11 @@ +--- 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) Property changes on: head/net/haproxy-devel/files/patch-include-haproxy-atomic.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property