Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 May 2021 10:41:04 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1df3a9e009d5 - main - www/trafficserver: switch to options helpers
Message-ID:  <202105191041.14JAf4v3047169@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1df3a9e009d5cc561fcb4ce20ee77801ad88e06f

commit 1df3a9e009d5cc561fcb4ce20ee77801ad88e06f
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-05-18 14:29:36 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
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 <bsd.port.pre.mk>
 
-.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



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