From owner-dev-commits-ports-main@freebsd.org Wed May 19 10:41:05 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 71AB763E214; Wed, 19 May 2021 10:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FlTtT19Cfz4RZL; Wed, 19 May 2021 10:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1171B114F7; Wed, 19 May 2021 10:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14JAf459047170; Wed, 19 May 2021 10:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14JAf4v3047169; Wed, 19 May 2021 10:41:04 GMT (envelope-from git) Date: Wed, 19 May 2021 10:41:04 GMT Message-Id: <202105191041.14JAf4v3047169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 1df3a9e009d5 - main - www/trafficserver: switch to options helpers MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1df3a9e009d5cc561fcb4ce20ee77801ad88e06f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 10:41:05 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=1df3a9e009d5cc561fcb4ce20ee77801ad88e06f commit 1df3a9e009d5cc561fcb4ce20ee77801ad88e06f Author: Dmitry Marakasov AuthorDate: 2021-05-18 14:29:36 +0000 Commit: Dmitry Marakasov CommitDate: 2021-05-19 10:36:07 +0000 www/trafficserver: switch to options helpers Approved by: portmgr blanket --- www/trafficserver/Makefile | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 88412cdfd98f..fb51e29ce4a3 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -55,36 +55,21 @@ PLIST_SUB+= ARCH="${ARCH:C/powerpc64.*/powerpc/}" WCCP_DESC= Enable WCCPv2 protocol WCCP_CONFIGURE_ENABLE= wccp +WCCP_USE= GCC=yes MEMCACHED_DESC= Enable memcache & memcached_remap plugin +MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin .include -.if ${PORT_OPTIONS:MMEMCACHED} -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -PLIST_SUB+= MEMCACHED="" -.else -PLIST_SUB+= MEMCACHED="@comment " -.endif - .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 .else RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 .endif -PLIST_SUB+= IMAGEMAGICK="" -.else -PLIST_SUB+= IMAGEMAGICK="@comment " -.endif - -.if ${PORT_OPTIONS:MWCCP} -PLIST_SUB+= WCCP="" -USE_GCC= yes -.else -PLIST_SUB+= WCCP="@comment " .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000