Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Dec 2015 14:29:16 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404235 - head/net/haproxy-devel
Message-ID:  <201512221429.tBMETG3Q033502@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Tue Dec 22 14:29:16 2015
New Revision: 404235
URL: https://svnweb.freebsd.org/changeset/ports/404235

Log:
  Update to 1.7-dev1

Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy-devel/distinfo

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Tue Dec 22 14:29:04 2015	(r404234)
+++ head/net/haproxy-devel/Makefile	Tue Dec 22 14:29:16 2015	(r404235)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-PORTVERSION=	1.6.0
+DISTVERSION=	1.7-dev1
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.6/src/
+MASTER_SITES=	http://haproxy.1wt.eu/download/1.7/src/devel/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
@@ -14,15 +14,17 @@ COMMENT=	Reliable, high performance TCP/
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-IGNORE=		no devel version available yet
+CONFLICTS=	haproxy-[1234567890]\*
 
 USES=		cpe gmake
-CONFLICTS=	haproxy-[1234567890]\*
 USE_RC_SUBR=	haproxy
 
 DEVICEATLAS_VERSION=	2.1
 DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
-DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module
+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 CC="${CC}" CFLAGS="${CFLAGS}"
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE
@@ -34,9 +36,6 @@ OPTIONS_DEFAULT=	SPCRE OPENSSL
 
 .include <bsd.port.options.mk>
 
-MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
-		USE_ZLIB=1 CC="${CC}" CFLAGS="${CFLAGS}"
-
 .if ${PORT_OPTIONS:MDPCRE}
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ARGS+=	USE_PCRE=1 USE_PCRE_JIT=1
@@ -49,14 +48,14 @@ MAKE_ARGS+=	USE_STATIC_PCRE=1 USE_PCRE_J
 
 .if ${PORT_OPTIONS:MDEVICEATLAS}
 .if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.zip)
-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
+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}.zip
 MAKE_ARGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_SRC=${WRKDIR}/deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
 .endif
 .if ! ${PORT_OPTIONS:MDPCRE} && ! ${PORT_OPTIONS:MSPCRE}
-IGNORE?=	Enable PCRE support to use DeviceAtlas
+IGNORE?=	enable PCRE support to use DeviceAtlas
 .endif
 .endif
 

Modified: head/net/haproxy-devel/distinfo
==============================================================================
--- head/net/haproxy-devel/distinfo	Tue Dec 22 14:29:04 2015	(r404234)
+++ head/net/haproxy-devel/distinfo	Tue Dec 22 14:29:16 2015	(r404235)
@@ -1,4 +1,2 @@
-SHA256 (haproxy-1.6.0.tar.gz) = e83a272b7d3638cf1d37bba58d3e75f497c1862315ee5bb7f5efc1d98d26e25b
-SIZE (haproxy-1.6.0.tar.gz) = 1538022
-SHA256 (deviceatlas-enterprise-c-2.1.zip) = a02fc29486d245b1c8d946c663b71ba981e88fee8d037f5bc1bf255deb287974
-SIZE (deviceatlas-enterprise-c-2.1.zip) = 504286
+SHA256 (haproxy-1.7-dev1.tar.gz) = 00176a0a0bf1e3e24e0abbf85363549f37c0fe4be4191f305a1d2c0ab1adaff8
+SIZE (haproxy-1.7-dev1.tar.gz) = 1563925



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512221429.tBMETG3Q033502>