From owner-svn-ports-all@freebsd.org Mon Oct 23 12:20:37 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD700E4A3A4; Mon, 23 Oct 2017 12:20:37 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97EED6E5F2; Mon, 23 Oct 2017 12:20:37 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9NCKaZv038659; Mon, 23 Oct 2017 12:20:36 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9NCKa9N038655; Mon, 23 Oct 2017 12:20:36 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201710231220.v9NCKa9N038655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Mon, 23 Oct 2017 12:20:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452702 - in head/net: haproxy haproxy-devel X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head/net: haproxy haproxy-devel X-SVN-Commit-Revision: 452702 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Oct 2017 12:20:37 -0000 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 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