svn commit: r437604 - head/net/haproxy-devel

[Dmitry Sivachenko]

Author: demon
Date: Mon Apr  3 08:43:23 2017
New Revision: 437604
URL: https://svnweb.freebsd.org/changeset/ports/437604

Log:
  Update to version 1.8-dev1

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

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Mon Apr  3 08:40:33 2017	(r437603)
+++ head/net/haproxy-devel/Makefile	Mon Apr  3 08:43:23 2017	(r437604)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	1.7-dev6
+DISTVERSION=	1.8-dev1
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.7/src/devel/
+MASTER_SITES=	http://www.haproxy.org/download/1.8/src/devel/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
@@ -15,12 +15,11 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 CONFLICTS_INSTALL=	haproxy-[1234567890]\*
-IGNORE=		no devel version available
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy
 
-DEVICEATLAS_VERSION=	2.1
+DEVICEATLAS_VERSION=	2.1.2_1
 DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
 DEVICEATLAS_REGISTRATION_URL=	https://deviceatlas.com/deviceatlas-haproxy-module
 
@@ -48,12 +47,12 @@ MAKE_ARGS+=	USE_PCRE=1 USE_STATIC_PCRE=1
 .endif
 
 .if ${PORT_OPTIONS:MDEVICEATLAS}
-.if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.zip)
+.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}.zip
-MAKE_ARGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_SRC=${WRKDIR}/deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
+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
@@ -63,9 +62,6 @@ IGNORE?=	enable PCRE support to use Devi
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 MAKE_ARGS+=	USE_OPENSSL=1
-.if !empty(SSL_DEFAULT:Mlibressl*)
-BROKEN= does not build with libressl
-.endif
 .endif
 
 .if ${PORT_OPTIONS:MLUA}

Modified: head/net/haproxy-devel/distinfo
==============================================================================
--- head/net/haproxy-devel/distinfo	Mon Apr  3 08:40:33 2017	(r437603)
+++ head/net/haproxy-devel/distinfo	Mon Apr  3 08:43:23 2017	(r437604)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1478763670
-SHA256 (haproxy-1.7-dev6.tar.gz) = b6aae0fef347ab213586d08f1f2fa60a41956ea5d4c6b0181a0dd9ae605229e3
-SIZE (haproxy-1.7-dev6.tar.gz) = 1721271
-SHA256 (deviceatlas-enterprise-c-2.1.zip) = a02fc29486d245b1c8d946c663b71ba981e88fee8d037f5bc1bf255deb287974
-SIZE (deviceatlas-enterprise-c-2.1.zip) = 504286
+TIMESTAMP = 1491208766
+SHA256 (haproxy-1.8-dev1.tar.gz) = 4aead2a059ecab9afbe49e80ef6f49940c3ca488d0aeb4fda613fcf2058c6fb6
+SIZE (haproxy-1.8-dev1.tar.gz) = 1779494
+SHA256 (deviceatlas-enterprise-c-2.1.2_1.tgz) = 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372
+SIZE (deviceatlas-enterprise-c-2.1.2_1.tgz) = 184432