Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Oct 2015 13:44:22 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400239 - head/www/trafficserver
Message-ID:  <201510271344.t9RDiMEl009274@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Oct 27 13:44:22 2015
New Revision: 400239
URL: https://svnweb.freebsd.org/changeset/ports/400239

Log:
  Add a CACHEURL option.
  
  - not enabling it by default, it does not seem to build on 9
  - convert to options helpers, and use OPTIONS_SINGLE instead of OPTIONS_RADIO.
  
  PR:		203973
  Submitted by:	maintainer
  Sponsored by:	Absolight

Modified:
  head/www/trafficserver/Makefile
  head/www/trafficserver/pkg-plist

Modified: head/www/trafficserver/Makefile
==============================================================================
--- head/www/trafficserver/Makefile	Tue Oct 27 13:44:17 2015	(r400238)
+++ head/www/trafficserver/Makefile	Tue Oct 27 13:44:22 2015	(r400239)
@@ -48,11 +48,13 @@ CONFIGURE_ARGS=	--with-libxml2=${LOCALBA
 		--with-user=${USERS} \
 		--with-group=${GROUPS}
 
-OPTIONS_DEFINE=	DOCS INTERIM WCCP SPDY
-OPTIONS_RADIO=	MEMMAN
-OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
+OPTIONS_DEFINE=	DOCS INTERIM WCCP SPDY CACHEURL
+OPTIONS_SINGLE=	MEMMAN
+OPTIONS_SINGLE_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
 OPTIONS_DEFAULT=	FREELISTS
+OPTIONS_SUB=	yes
 
+CACHEURL_DESC=  Enable CacheURL Plugin
 WCCP_DESC=	Enable WCCPv2 protocol
 INTERIM_DESC=	Enable interim cache (SSD)
 ALLOCATORS_DESC=	Manage memory with allocators
@@ -64,18 +66,11 @@ WCCP_CONFIGURE_ENABLE=	wccp
 INTERIM_CONFIGURE_ENABLE=	interim-cache
 SPDY_CONFIGURE_ENABLE=	spdy
 SPDY_LIB_DEPENDS=	libspdylay.so:${PORTSDIR}/www/spdylay
+CACHEURL_CONFIGURE_ENABLE=        experimental-plugins
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRECLAIM}
-CONFIGURE_ARGS+=	--enable-reclaimable-freelist --enable-freelist
-.elif ${PORT_OPTIONS:MFREELISTS}
-CONFIGURE_ARGS+=	--enable-freelist
-.elif ${PORT_OPTIONS:MALLOCATORS}
-CONFIGURE_ARGS+=	--disable-freelist
-.else
-IGNORE=	no allocation strategy selected
-.endif
+RECLAIM_CONFIGURE_ON=	--enable-reclaimable-freelist --enable-freelist
+FREELISTS_CONFIGURE_ARGS=	--enable-freelist
+ALLOCATORS_CONFIGURE_ARGS=	--disable-freelist
 
 .if exists(/usr/bin/clang)
 CC=		clang

Modified: head/www/trafficserver/pkg-plist
==============================================================================
--- head/www/trafficserver/pkg-plist	Tue Oct 27 13:44:17 2015	(r400238)
+++ head/www/trafficserver/pkg-plist	Tue Oct 27 13:44:22 2015	(r400239)
@@ -142,6 +142,29 @@ libexec/trafficserver/libloader.so
 libexec/trafficserver/regex_remap.so
 libexec/trafficserver/stats_over_http.so
 libexec/trafficserver/tcpinfo.so
+%%CACHEURL%%libexec/trafficserver/authproxy.so
+%%CACHEURL%%libexec/trafficserver/background_fetch.so
+%%CACHEURL%%libexec/trafficserver/balancer.so
+%%CACHEURL%%libexec/trafficserver/buffer_upload.so
+%%CACHEURL%%libexec/trafficserver/channel_stats.so
+%%CACHEURL%%libexec/trafficserver/collapsed_connection.so
+%%CACHEURL%%libexec/trafficserver/combo_handler.so
+%%CACHEURL%%libexec/trafficserver/custom_redirect.so
+%%CACHEURL%%libexec/trafficserver/epic.so
+%%CACHEURL%%libexec/trafficserver/escalate.so
+%%CACHEURL%%libexec/trafficserver/esi.so
+%%CACHEURL%%libexec/trafficserver/generator.so
+%%CACHEURL%%libexec/trafficserver/header_normalize.so
+%%CACHEURL%%libexec/trafficserver/hipes.so
+%%CACHEURL%%libexec/trafficserver/metalink.so
+%%CACHEURL%%libexec/trafficserver/regex_revalidate.so
+%%CACHEURL%%libexec/trafficserver/s3_auth.so
+%%CACHEURL%%libexec/trafficserver/ssl_cert_loader.so
+%%CACHEURL%%libexec/trafficserver/sslheaders.so
+%%CACHEURL%%libexec/trafficserver/stale_while_revalidate.so
+%%CACHEURL%%libexec/trafficserver/tslua.so
+%%CACHEURL%%libexec/trafficserver/url_sig.so
+%%CACHEURL%%libexec/trafficserver/xdebug.so
 %%SITE_PERL%%/Apache/TS.pm
 %%SITE_PERL%%/Apache/TS.pm.in
 %%SITE_PERL%%/Apache/TS/AdminClient.pm



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