Index: www/trafficserver/Makefile =================================================================== --- www/trafficserver/Makefile (revision 406800) +++ www/trafficserver/Makefile (working copy) @@ -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 @@ 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 tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_PERL5= build run @@ -27,6 +26,7 @@ USE_LDCONFIG= yes USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} +USE_SQLITE= yes ONLY_FOR_ARCHS= i386 amd64 @@ -42,18 +42,15 @@ --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 +62,20 @@ 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 -.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 Index: www/trafficserver/distinfo =================================================================== --- www/trafficserver/distinfo (revision 406800) +++ www/trafficserver/distinfo (working copy) @@ -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 Index: www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc =================================================================== --- www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc (revision 406800) +++ www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc (working copy) @@ -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 #include #endif - #include "ink_defs.h" + #include "ts/ink_defs.h" Index: www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc =================================================================== --- www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc (revision 406800) +++ www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc (nonexistent) @@ -1,11 +0,0 @@ ---- lib/atscppapi/src/AsyncHttpFetch.cc.orig 2015-06-30 04:11:56 UTC -+++ lib/atscppapi/src/AsyncHttpFetch.cc -@@ -107,7 +107,7 @@ handleFetchEvents(TSCont cont, TSEvent e - state->body_ = data_start; // data_start will now be pointing to body - state->body_size_ = data_end - data_start; - utils::internal::initResponse(state->response_, state->hdr_buf_, state->hdr_loc_); -- LOG_DEBUG("Fetch result had a status code of %d with a body length of %ld", status, state->body_size_); -+ LOG_DEBUG("Fetch result had a status code of %d with a body length of %zu", status, state->body_size_); - } else { - LOG_ERROR("Unable to parse response; Request URL [%s]; transaction %p", state->request_->getUrl().getUrlString().c_str(), - txn); Property changes on: www/trafficserver/files/patch-lib__atscppapi__src__AsyncHttpFetch.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: www/trafficserver/files/patch-lib__luajit__src__Makefile =================================================================== --- www/trafficserver/files/patch-lib__luajit__src__Makefile (revision 406800) +++ www/trafficserver/files/patch-lib__luajit__src__Makefile (working copy) @@ -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)) Index: www/trafficserver/pkg-plist =================================================================== --- www/trafficserver/pkg-plist (revision 406800) +++ www/trafficserver/pkg-plist (working copy) @@ -13,7 +13,6 @@ bin/traffic_via bin/trafficserver bin/tspush -bin/tstop bin/tsxs %%ETCDIR%%/trafficserver-release @owner %%WWWOWN%% @@ -56,7 +55,6 @@ @sample %%ETCDIR%%/logs_xml.config.sample @sample %%ETCDIR%%/parent.config.sample @sample %%ETCDIR%%/plugin.config.sample -@sample %%ETCDIR%%/prefetch.config.sample @sample %%ETCDIR%%/records.config.sample @sample %%ETCDIR%%/remap.config.sample @sample %%ETCDIR%%/socks.config.sample @@ -64,7 +62,6 @@ @sample %%ETCDIR%%/ssl_multicert.config.sample @sample %%ETCDIR%%/stats.config.xml.sample @sample %%ETCDIR%%/storage.config.sample -@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/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/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