Index: branches/2017Q3/net/haproxy/Makefile =================================================================== --- branches/2017Q3/net/haproxy/Makefile (revision 446291) +++ branches/2017Q3/net/haproxy/Makefile (revision 446292) @@ -1,90 +1,94 @@ # Created by: Clement Laforet # $FreeBSD$ PORTNAME= haproxy -PORTVERSION= 1.7.7 +PORTVERSION= 1.7.8 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.7/src/ 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-devel-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy DEVICEATLAS_VERSION= 2.1.2_1 DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION} DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_REGPARM=1 USE_ACCEPT4=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 .include .if ${PORT_OPTIONS:MDPCRE} LIB_DEPENDS+= libpcre.so:devel/pcre MAKE_ARGS+= USE_PCRE=1 USE_PCRE_JIT=1 .endif .if ${PORT_OPTIONS:MSPCRE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:devel/pcre MAKE_ARGS+= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 .endif .if ${PORT_OPTIONS:MDEVICEATLAS} .if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.tgz) IGNORE?= you must manually fetch the DeviceAtlas Device Detection C API from ${DEVICEATLAS_REGISTRATION_URL} and place it in ${DISTDIR} and then run make again .else RESTRICTED= The redistribution of the DeviceAtlas Device Detection C API is not permitted DISTFILES+= ${DEVICEATLAS_DISTFILE}.tgz MAKE_ARGS+= USE_DEVICEATLAS=1 DEVICEATLAS_SRC=${WRKDIR}/deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}/Src .endif .if ! ${PORT_OPTIONS:MDPCRE} && ! ${PORT_OPTIONS:MSPCRE} IGNORE?= enable PCRE support to use DeviceAtlas .endif .endif .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl MAKE_ARGS+= USE_OPENSSL=1 .endif .if ${PORT_OPTIONS:MLUA} USES+= lua:53 MAKE_ARGS+= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} .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 + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +MAKE_ARGS+= USE_REGPARM=1 +.endif .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .include Index: branches/2017Q3/net/haproxy/distinfo =================================================================== --- branches/2017Q3/net/haproxy/distinfo (revision 446291) +++ branches/2017Q3/net/haproxy/distinfo (revision 446292) @@ -1,5 +1,5 @@ -TIMESTAMP = 1498460319 -SHA256 (haproxy-1.7.7.tar.gz) = 81196ca449e4ada45fbd743fe3804bb82c25563ff9653e136872181ee5603ae2 -SIZE (haproxy-1.7.7.tar.gz) = 1745024 +TIMESTAMP = 1499429680 +SHA256 (haproxy-1.7.8.tar.gz) = ec90153ccedd20ad4015d3eaf76b502ff1f61b431d54c22b8457b5784a9ae142 +SIZE (haproxy-1.7.8.tar.gz) = 1746321 SHA256 (deviceatlas-enterprise-c-2.1.2_1.tgz) = 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372 SIZE (deviceatlas-enterprise-c-2.1.2_1.tgz) = 184432 Index: branches/2017Q3/net/haproxy-devel/Makefile =================================================================== --- branches/2017Q3/net/haproxy-devel/Makefile (revision 446291) +++ branches/2017Q3/net/haproxy-devel/Makefile (revision 446292) @@ -1,85 +1,91 @@ # Created by: Hugo Saro # $FreeBSD$ PORTNAME= haproxy DISTVERSION= 1.8-dev2 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.8/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-[1234567890]\* USES= cpe gmake USE_RC_SUBR= haproxy DEVICEATLAS_VERSION= 2.1.2_1 DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION} DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_REGPARM=1 USE_ACCEPT4=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 .include .if ${PORT_OPTIONS:MDPCRE} LIB_DEPENDS+= libpcre.so:devel/pcre MAKE_ARGS+= USE_PCRE=1 USE_PCRE_JIT=1 .endif .if ${PORT_OPTIONS:MSPCRE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:devel/pcre MAKE_ARGS+= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 .endif .if ${PORT_OPTIONS:MDEVICEATLAS} .if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.tgz) IGNORE?= you must manually fetch the DeviceAtlas Device Detection C API from ${DEVICEATLAS_REGISTRATION_URL} and place it in ${DISTDIR} and then run make again .else RESTRICTED= The redistribution of the DeviceAtlas Device Detection C API is not permitted DISTFILES+= ${DEVICEATLAS_DISTFILE}.tgz MAKE_ARGS+= USE_DEVICEATLAS=1 DEVICEATLAS_SRC=${WRKDIR}/deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}/Src .endif .if ! ${PORT_OPTIONS:MDPCRE} && ! ${PORT_OPTIONS:MSPCRE} IGNORE?= enable PCRE support to use DeviceAtlas .endif .endif .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl MAKE_ARGS+= USE_OPENSSL=1 .endif .if ${PORT_OPTIONS:MLUA} USES+= lua:53 MAKE_ARGS+= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} .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 +.include + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +MAKE_ARGS+= USE_REGPARM=1 +.endif + +.include Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 446291) +++ branches/2017Q3 (revision 446292) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r445240,446176