svn commit: r407214 - in head/www/trafficserver: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Mon Jan 25 14:14:05 UTC 2016
Author: vanilla
Date: Mon Jan 25 14:14:03 2016
New Revision: 407214
URL: https://svnweb.freebsd.org/changeset/ports/407214
Log:
Upgrade to 6.0.0.
PR: 206443
Submitted by: maintainer
Deleted:
head/www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc
Modified:
head/www/trafficserver/Makefile
head/www/trafficserver/distinfo
head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
head/www/trafficserver/files/patch-lib__luajit__src__Makefile
head/www/trafficserver/files/trafficserver.in
head/www/trafficserver/pkg-plist
Modified: head/www/trafficserver/Makefile
==============================================================================
--- head/www/trafficserver/Makefile Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/Makefile Mon Jan 25 14:14:03 2016 (r407214)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= trafficserver
-PORTVERSION= 5.3.1
-PORTREVISION= 1
+PORTVERSION= 6.0.0
CATEGORIES= www
MASTER_SITES= APACHE/${PORTNAME}
@@ -20,7 +19,7 @@ LIB_DEPENDS= libboost_system.so:${PORTSD
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= cpe execinfo gmake libtool perl5 pkgconfig tar:bzip2 sqlite tcl
+USES= cpe execinfo gmake libtool perl5 pkgconfig sqlite tar:bzip2 tcl
CPE_VENDOR= apache
CPE_PRODUCT= traffic_server
USE_PERL5= build run
@@ -42,18 +41,15 @@ CONFIGURE_ARGS= --with-libxml2=${LOCALBA
--with-tcl=${TCL_LIBDIR} \
--disable-silent-rules \
--enable-cppapi \
- --enable-luajit \
--localstatedir=/var \
--with-user=${USERS} \
--with-group=${GROUPS}
-OPTIONS_DEFINE= DOCS INTERIM WCCP SPDY CACHEURL
-OPTIONS_SINGLE= MEMMAN
-OPTIONS_SINGLE_MEMMAN= ALLOCATORS FREELISTS RECLAIM
+OPTIONS_DEFINE= DOCS INTERIM WCCP SPDY
+OPTIONS_RADIO= MEMMAN
+OPTIONS_RADIO_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
@@ -65,13 +61,20 @@ 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
-RECLAIM_CONFIGURE_ON= --enable-reclaimable-freelist --enable-freelist
-FREELISTS_CONFIGURE_ARGS= --enable-freelist
-ALLOCATORS_CONFIGURE_ARGS= --disable-freelist
+.include <bsd.port.options.mk>
-.if exists(/usr/bin/clang)
+.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
+
+.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang)
CC= clang
CXX= clang++
.endif
Modified: head/www/trafficserver/distinfo
==============================================================================
--- head/www/trafficserver/distinfo Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/distinfo Mon Jan 25 14:14:03 2016 (r407214)
@@ -1,2 +1,2 @@
-SHA256 (trafficserver-5.3.1.tar.bz2) = e6c33c7cfb629406a320a61217e08db3123cfe4b77c2eaef0eaa520065dbeb43
-SIZE (trafficserver-5.3.1.tar.bz2) = 7739777
+SHA256 (trafficserver-6.0.0.tar.bz2) = 1ef6a9ed1d53532bbe2c294d86d4103a0140e3f23a27970936366f1bc8feb3d1
+SIZE (trafficserver-6.0.0.tar.bz2) = 7789127
Modified: head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
==============================================================================
--- head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc Mon Jan 25 14:14:03 2016 (r407214)
@@ -1,4 +1,4 @@
---- iocore/eventsystem/UnixEventProcessor.cc.orig 2015-06-30 04:11:56 UTC
+--- iocore/eventsystem/UnixEventProcessor.cc.orig 2015-09-08 17:43:45 UTC
+++ iocore/eventsystem/UnixEventProcessor.cc
@@ -24,7 +24,6 @@
#include "P_EventSystem.h" /* MAGIC_EDITING_TAG */
@@ -7,4 +7,4 @@
-#include <alloca.h>
#include <hwloc.h>
#endif
- #include "ink_defs.h"
+ #include "ts/ink_defs.h"
Modified: head/www/trafficserver/files/patch-lib__luajit__src__Makefile
==============================================================================
--- head/www/trafficserver/files/patch-lib__luajit__src__Makefile Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/files/patch-lib__luajit__src__Makefile Mon Jan 25 14:14:03 2016 (r407214)
@@ -1,4 +1,4 @@
---- lib/luajit/src/Makefile.orig 2015-06-30 04:11:56 UTC
+--- lib/luajit/src/Makefile.orig 2015-09-08 17:43:45 UTC
+++ lib/luajit/src/Makefile
@@ -25,7 +25,7 @@ NODOTABIVER= 51
# with "make clean", followed by "make" if you change any options.
@@ -9,12 +9,3 @@
#
# Use this if you want to force a 32 bit build on a 64 bit multilib OS.
#CC= gcc -m32
-@@ -313,7 +313,7 @@ ifeq (iOS,$(TARGET_SYS))
- TARGET_DYNXLDOPTS=
- TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
- else
-- ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
-+ ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC))))
- TARGET_XCFLAGS+= -fno-stack-protector
- endif
- ifneq (SunOS,$(TARGET_SYS))
Modified: head/www/trafficserver/files/trafficserver.in
==============================================================================
--- head/www/trafficserver/files/trafficserver.in Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/files/trafficserver.in Mon Jan 25 14:14:03 2016 (r407214)
@@ -12,31 +12,10 @@
rcvar=trafficserver_enable
name="trafficserver"
trafficserver_enable=${trafficserver_enable:-"NO"}
-trafficserver_tm_pidfile=${trafficserver_tm_pidfile:-"/var/run/trafficserver/manager.lock"}
-trafficserver_ts_pidfile=${trafficserver_ts_pidfile:-"/var/run/trafficserver/server.lock"}
pidfile="/var/run/trafficserver/traffic_cop.lock"
-stop_cmd="trafficserver_stop"
command=/usr/sbin/daemon
command_args="-p ${pidfile} %%PREFIX%%/bin/traffic_cop"
procname="%%PREFIX%%/bin/traffic_cop"
-trafficserver_stop()
-{
- if [ -f ${pidfile} ]; then
- kill `cat ${pidfile}`
- rm -f ${pidfile}
- fi
-
- if [ -f ${trafficserver_tm_pidfile} ]; then
- kill `cat ${trafficserver_tm_pidfile}`
- rm -f ${trafficserver_tm_pidfile}
- fi
-
- if [ -f ${trafficserver_ts_pidfile} ]; then
- kill `cat ${trafficserver_ts_pidfile}`
- rm -f ${trafficserver_ts_pidfile}
- fi
-}
-
load_rc_config "$name"
run_rc_command "$1"
Modified: head/www/trafficserver/pkg-plist
==============================================================================
--- head/www/trafficserver/pkg-plist Mon Jan 25 14:01:02 2016 (r407213)
+++ head/www/trafficserver/pkg-plist Mon Jan 25 14:14:03 2016 (r407214)
@@ -1,4 +1,4 @@
- at unexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi
+ at postunexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi
bin/traffic_cop
bin/traffic_crashlog
bin/traffic_ctl
@@ -13,7 +13,6 @@ bin/traffic_top
bin/traffic_via
bin/trafficserver
bin/tspush
-bin/tstop
bin/tsxs
%%ETCDIR%%/trafficserver-release
@owner %%WWWOWN%%
@@ -56,7 +55,6 @@ bin/tsxs
@sample %%ETCDIR%%/logs_xml.config.sample
@sample %%ETCDIR%%/parent.config.sample
@sample %%ETCDIR%%/plugin.config.sample
- at sample %%ETCDIR%%/prefetch.config.sample
@sample %%ETCDIR%%/records.config.sample
@sample %%ETCDIR%%/remap.config.sample
@sample %%ETCDIR%%/socks.config.sample
@@ -64,7 +62,6 @@ bin/tsxs
@sample %%ETCDIR%%/ssl_multicert.config.sample
@sample %%ETCDIR%%/stats.config.xml.sample
@sample %%ETCDIR%%/storage.config.sample
- at sample %%ETCDIR%%/update.config.sample
@sample %%ETCDIR%%/vaddrs.config.sample
@sample %%ETCDIR%%/volume.config.sample
include/atscppapi/Async.h
@@ -101,16 +98,16 @@ include/ts/mgmtapi.h
include/ts/remap.h
include/ts/ts.h
lib/libatscppapi.so
-lib/libatscppapi.so.5
+lib/libatscppapi.so.6
lib/libatscppapi.so.%%PORTVERSION%%
lib/libtsconfig.so
-lib/libtsconfig.so.5
+lib/libtsconfig.so.6
lib/libtsconfig.so.%%PORTVERSION%%
lib/libtsmgmt.so
-lib/libtsmgmt.so.5
+lib/libtsmgmt.so.6
lib/libtsmgmt.so.%%PORTVERSION%%
lib/libtsutil.so
-lib/libtsutil.so.5
+lib/libtsutil.so.6
lib/libtsutil.so.%%PORTVERSION%%
libdata/pkgconfig/trafficserver.pc
libexec/trafficserver/AsyncHttpFetch.so
@@ -142,29 +139,6 @@ 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
More information about the svn-ports-all
mailing list