Index: branches/2020Q1/www/trafficserver/Makefile =================================================================== --- branches/2020Q1/www/trafficserver/Makefile (revision 523686) +++ branches/2020Q1/www/trafficserver/Makefile (revision 523687) @@ -1,107 +1,112 @@ # Created by: Jui-Nan Lin # $FreeBSD$ PORTNAME= trafficserver PORTVERSION= 8.0.2 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} MAINTAINER= gaod@hychen.org COMMENT= Fast, scalable and extensible HTTP proxy server LICENSE= APACHE20 -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= amd64 powerpc64 LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ - libluajit-5.1.so:lang/luajit \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 \ - libbrotlienc.so:archivers/brotli + libbrotlienc.so:archivers/brotli \ + ${LIB_DEPENDS_${ARCH}} +LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit -USES= compiler:c++17-lang cpe gmake libtool ncurses pathfix \ - perl5 pkgconfig sqlite ssl tar:bzip2 tcl +USES= compiler:c++17-lang cpe gmake libtool localbase ncurses \ + pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_GCC= yes USE_PERL5= build run USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USERS= ${WWWOWN} GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}" -LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-libxml2=${LOCALBASE} \ - --with-pcre=${LOCALBASE} \ +CONFIGURE_ARGS= --with-pcre=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ - --with-xml=libxml2 \ --with-tcl=${TCL_LIBDIR} \ --localstatedir=/var \ --with-user=${USERS} \ --with-group=${GROUPS} \ --disable-maintainer-mode \ --disable-dependency-tracking \ --enable-mime-sanity-check \ --enable-experimental-plugins OPTIONS_DEFINE= DOCS WCCP MEMCACHED IMAGEMAGICK X11 OPTIONS_SUB= yes +PLIST_SUB+= ARCH="${ARCH:S/powerpc64/powerpc/}" WCCP_DESC= Enable WCCPv2 protocol WCCP_CONFIGURE_ENABLE= wccp MEMCACHED_DESC= Enable memcache & memcached_remap plugin IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin .include +.if ${ARCH} == amd64 +PLIST_SUB+= LUAJIT="" +.else +PLIST_SUB+= LUAJIT="@comment " +.endif + .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="" .else PLIST_SUB+= WCCP="@comment " .endif post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \ -e '/runtimedir:/s,$${localstatedir}+,$${localstatedir}/run+,' \ ${WRKSRC}/config.layout @${REINPLACE_CMD} '/^LUA_LDFLAGS =/s/$$/ @LDFLAGS@/' \ ${WRKSRC}/lib/Makefile.in post-install: ${RMDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done) ${SED} -i '' -e 's|^${STAGEDIR}||g' \ - ${STAGEDIR}${PREFIX}/lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist + ${STAGEDIR}${PREFIX}/lib/perl5/${ARCH:S/powerpc64/powerpc/}-freebsd-thread-multi/auto/Apache/TS/.packlist .include Index: branches/2020Q1/www/trafficserver/files/patch-configure =================================================================== --- branches/2020Q1/www/trafficserver/files/patch-configure (nonexistent) +++ branches/2020Q1/www/trafficserver/files/patch-configure (revision 523687) @@ -0,0 +1,13 @@ +--- configure.orig 2020-01-03 10:44:56 UTC ++++ configure +@@ -23922,7 +23922,9 @@ $as_echo "$as_me: adding ${ssldir}/lib64 to RPATH" >&6 + + fi + else +- OPENSSL_LDFLAGS="-L$ssldir/lib" ++ if [ $ssldir != "/usr" ]; then ++ OPENSSL_LDFLAGS="-L$ssldir/lib" ++ fi + if test "$overriden_with_ssl"; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: adding ${ssldir}/lib to RPATH" >&5 Property changes on: branches/2020Q1/www/trafficserver/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/www/trafficserver/pkg-plist =================================================================== --- branches/2020Q1/www/trafficserver/pkg-plist (revision 523686) +++ branches/2020Q1/www/trafficserver/pkg-plist (revision 523687) @@ -1,180 +1,180 @@ @postunexec if [ ! -s %D/%%ETCDIR%%/proxy.pac ]; then rm -f %D/%%ETCDIR%%/proxy.pac; fi bin/traffic_cache_tool bin/traffic_crashlog bin/traffic_ctl bin/traffic_layout bin/traffic_logcat bin/traffic_logstats bin/traffic_manager bin/traffic_server bin/traffic_top bin/traffic_via %%WCCP%%bin/traffic_wccp bin/trafficserver bin/tspush bin/tsxs %%ETCDIR%%/trafficserver-release @owner %%WWWOWN%% @group %%WWWGRP%% @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/.body_factory_info @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/README @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#denied @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#proxy_auth_required @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#ssl_forbidden @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#not_in_cache @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#read_error @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#dns_failed @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#failed_connect @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#hangup @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/default @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/interception#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_permanently @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_temporarily @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#cycle_detected @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#invalid_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#scheme_unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#syntax_error @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_response @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_version @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#activity @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#inactivity @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/transcoding#unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/urlrouting#no_mapping @sample %%ETCDIR%%/cache.config.sample @sample %%ETCDIR%%/hosting.config.sample @sample %%ETCDIR%%/ip_allow.config.sample @sample %%ETCDIR%%/logging.yaml.sample @sample %%ETCDIR%%/parent.config.sample @sample %%ETCDIR%%/plugin.config.sample @sample %%ETCDIR%%/records.config.sample @sample %%ETCDIR%%/remap.config.sample @sample %%ETCDIR%%/socks.config.sample @sample %%ETCDIR%%/splitdns.config.sample @sample %%ETCDIR%%/ssl_multicert.config.sample @sample %%ETCDIR%%/ssl_server_name.yaml.sample @sample %%ETCDIR%%/storage.config.sample @sample %%ETCDIR%%/volume.config.sample include/ts/apidefs.h include/ts/experimental.h include/ts/mgmtapi.h include/ts/remap.h include/ts/ts.h include/tscpp/api/Async.h include/tscpp/api/AsyncHttpFetch.h include/tscpp/api/AsyncTimer.h include/tscpp/api/CaseInsensitiveStringComparator.h include/tscpp/api/ClientRequest.h include/tscpp/api/Continuation.h include/tscpp/api/GlobalPlugin.h include/tscpp/api/GzipDeflateTransformation.h include/tscpp/api/GzipInflateTransformation.h include/tscpp/api/Headers.h include/tscpp/api/HttpMethod.h include/tscpp/api/HttpStatus.h include/tscpp/api/HttpVersion.h include/tscpp/api/InterceptPlugin.h include/tscpp/api/Logger.h include/tscpp/api/Plugin.h include/tscpp/api/PluginInit.h include/tscpp/api/RemapPlugin.h include/tscpp/api/Request.h include/tscpp/api/Response.h include/tscpp/api/Stat.h include/tscpp/api/Transaction.h include/tscpp/api/TransactionPlugin.h include/tscpp/api/TransformationPlugin.h include/tscpp/api/Url.h include/tscpp/api/noncopyable.h include/tscpp/api/utils.h include/tscpp/util/TextView.h lib/libtsconfig.so lib/libtsconfig.so.8 lib/libtsconfig.so.%%PORTVERSION%% lib/libtscore.so lib/libtscore.so.8 lib/libtscore.so.%%PORTVERSION%% lib/libtscppapi.so lib/libtscppapi.so.8 lib/libtscppapi.so.%%PORTVERSION%% lib/libtscpputil.so lib/libtscpputil.so.8 lib/libtscpputil.so.%%PORTVERSION%% lib/libtsmgmt.so lib/libtsmgmt.so.8 lib/libtsmgmt.so.%%PORTVERSION%% libdata/pkgconfig/trafficserver.pc %%IMAGEMAGICK%%libexec/trafficserver/WebpTransform.so libexec/trafficserver/access_control.so libexec/trafficserver/acme.so libexec/trafficserver/authproxy.so libexec/trafficserver/background_fetch.so libexec/trafficserver/balancer.so libexec/trafficserver/buffer_upload.so libexec/trafficserver/cache_promote.so libexec/trafficserver/cache_range_requests.so libexec/trafficserver/cachekey.so libexec/trafficserver/certifier.so libexec/trafficserver/collapsed_forwarding.so libexec/trafficserver/combo_handler.so libexec/trafficserver/compress.so libexec/trafficserver/conf_remap.so libexec/trafficserver/custom_redirect.so libexec/trafficserver/escalate.so libexec/trafficserver/esi.so libexec/trafficserver/fq_pacing.so libexec/trafficserver/generator.so libexec/trafficserver/geoip_acl.so libexec/trafficserver/header_freq.so libexec/trafficserver/header_normalize.so libexec/trafficserver/header_rewrite.so libexec/trafficserver/hipes.so libexec/trafficserver/hook-trace.so libexec/trafficserver/inliner.so libexec/trafficserver/libloader.so %%IMAGEMAGICK%%libexec/trafficserver/magick.so %%MEMCACHED%%libexec/trafficserver/memcached_remap.so libexec/trafficserver/metalink.so libexec/trafficserver/money_trace.so libexec/trafficserver/mp4.so libexec/trafficserver/multiplexer.so libexec/trafficserver/prefetch.so libexec/trafficserver/regex_remap.so libexec/trafficserver/regex_revalidate.so libexec/trafficserver/remap_purge.so libexec/trafficserver/remap_stats.so libexec/trafficserver/s3_auth.so libexec/trafficserver/server_push_preload.so libexec/trafficserver/ssl_cert_loader.so libexec/trafficserver/sslheaders.so libexec/trafficserver/stale_while_revalidate.so libexec/trafficserver/stats_over_http.so libexec/trafficserver/stream_editor.so libexec/trafficserver/system_stats.so libexec/trafficserver/tcpinfo.so libexec/trafficserver/test_cppapi.so libexec/trafficserver/tls_bridge.so libexec/trafficserver/traffic_dump.so -libexec/trafficserver/tslua.so +%%LUAJIT%%libexec/trafficserver/tslua.so libexec/trafficserver/tsmemcache.so libexec/trafficserver/url_sig.so libexec/trafficserver/xdebug.so -lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist -lib/perl5/amd64-freebsd-thread-multi/perllocal.pod +lib/perl5/%%ARCH%%-freebsd-thread-multi/auto/Apache/TS/.packlist +lib/perl5/%%ARCH%%-freebsd-thread-multi/perllocal.pod lib/perl5/Apache/TS.pm lib/perl5/Apache/TS/AdminClient.pm lib/perl5/Apache/TS/Config.pm lib/perl5/Apache/TS/Config/Records.pm man/man3/Apache::TS.3.gz man/man3/Apache::TS::AdminClient.3.gz man/man3/Apache::TS::Config::Records.3.gz @dir(,,) libexec/trafficserver @dir(,,) include/ts @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/snapshots @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/trafficserver Index: branches/2020Q1 =================================================================== --- branches/2020Q1 (revision 523686) +++ branches/2020Q1 (revision 523687) Property changes on: branches/2020Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r523686