svn commit: r452702 - in head/net: haproxy haproxy-devel

[Dmitry Sivachenko]

Author: demon
Date: Mon Oct 23 12:20:36 2017
New Revision: 452702
URL: https://svnweb.freebsd.org/changeset/ports/452702

Log:
  Pull deviceatlas library from a (recently created) separate port.
  
  Submitted by:	David Carlier <dcarlier at afilias.info>

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

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Mon Oct 23 11:32:23 2017	(r452701)
+++ head/net/haproxy-devel/Makefile	Mon Oct 23 12:20:36 2017	(r452702)
@@ -20,10 +20,6 @@ CONFLICTS_INSTALL=	haproxy-[1234567890]\*
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy
 
-DEVICEATLAS_VERSION=	2.1.2_2
-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_ACCEPT4=1 \
 		CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}"
@@ -49,16 +45,8 @@ MAKE_ARGS+=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=
 .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
+LIB_DEPENDS+=   libda.so:net/deviceatlas-enterprise-c
+MAKE_ARGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}

Modified: head/net/haproxy-devel/distinfo
==============================================================================
--- head/net/haproxy-devel/distinfo	Mon Oct 23 11:32:23 2017	(r452701)
+++ head/net/haproxy-devel/distinfo	Mon Oct 23 12:20:36 2017	(r452702)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1504203934
+TIMESTAMP = 1508748419
 SHA256 (haproxy-1.8-dev2.tar.gz) = 45f42107e8730fc7bf324523d148d67aae6a65f0d4a4b981273d3dcefd6de2e1
 SIZE (haproxy-1.8-dev2.tar.gz) = 1850881
-SHA256 (deviceatlas-enterprise-c-2.1.2_2.tgz) = feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce
-SIZE (deviceatlas-enterprise-c-2.1.2_2.tgz) = 184368

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Mon Oct 23 11:32:23 2017	(r452701)
+++ head/net/haproxy/Makefile	Mon Oct 23 12:20:36 2017	(r452702)
@@ -18,10 +18,6 @@ CONFLICTS_INSTALL=	haproxy-devel-[0-9]*
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy
 
-DEVICEATLAS_VERSION=	2.1.2_2
-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_ACCEPT4=1 \
 		CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}"
@@ -47,16 +43,8 @@ MAKE_ARGS+=	USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=
 .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
+LIB_DEPENDS+=   libda.so:net/deviceatlas-enterprise-c
+MAKE_ARGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}

Modified: head/net/haproxy/distinfo
==============================================================================
--- head/net/haproxy/distinfo	Mon Oct 23 11:32:23 2017	(r452701)
+++ head/net/haproxy/distinfo	Mon Oct 23 12:20:36 2017	(r452702)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1504203902
+TIMESTAMP = 1508749073
 SHA256 (haproxy-1.7.9.tar.gz) = 1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e
 SIZE (haproxy-1.7.9.tar.gz) = 1748159
-SHA256 (deviceatlas-enterprise-c-2.1.2_2.tgz) = feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce
-SIZE (deviceatlas-enterprise-c-2.1.2_2.tgz) = 184368