- Update to 2.1.4 (maintainer submitted a new patch via IRC)

- Use DATADIR and ETCDIR
- Sort PLIST

Changes:	http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?revision=1033178&view=markup
PR:		ports/151793 (based on)
Submitted by:	rellik <rellik@pixnet.tw>
Approved by:	Jui-Nan Lin <jnlin@csie.nctu.edu.tw> (maintainer)

3 files changed, 74 insertions, 273 deletions

diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 7f6dd60e3506..b542fca5d346 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	trafficserver
-PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTVERSION=	2.1.4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	trafficserver
+MASTER_SITES=	APACHE/${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-unstable
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	A fast, scalable and extensible HTTP proxy server
 
-BUILD_DEPENDS=	expat>0:${PORTSDIR}/textproc/expat2 \
-		pcre>0:${PORTSDIR}/devel/pcre
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	ASL
+
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		expat.6:${PORTSDIR}/textproc/expat2 \
+		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_AUTOTOOLS=	autoconf:268 automake:111 libtool:22
 USE_BZIP2=	yes
@@ -32,8 +31,8 @@ USE_RC_SUBR=	${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-BUILD_DEPENDS+=	xz>0:${PORTSDIR}/archivers/xz
-RUN_DEPENDS+=	xz>0:${PORTSDIR}/archivers/xz
+BUILD_DEPENDS=	xz>0:${PORTSDIR}/archivers/xz
+RUN_DEPENDS=	xz>0:${PORTSDIR}/archivers/xz
 .endif
 
 .if ${OSVERSION} < 700000
diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo
index a5a7df22301e..24fc83f4d731 100644
--- a/www/trafficserver/distinfo
+++ b/www/trafficserver/distinfo
@@ -1,3 +1,2 @@
-MD5 (trafficserver-2.1.1-unstable.tar.bz2) = e3118fa21e2a47c17b728503fa1d0e74
-SHA256 (trafficserver-2.1.1-unstable.tar.bz2) = 8415815ecce85cc422c2f0c18e8e6ea7149cd1c83db96f17c4783a6a4d275954
-SIZE (trafficserver-2.1.1-unstable.tar.bz2) = 2855575
+SHA256 (trafficserver-2.1.4-unstable.tar.bz2) = 755e5937d48b8ffb98fce12fa2ae56f72116993ddffaf755e2ff7e849b1936d1
+SIZE (trafficserver-2.1.4-unstable.tar.bz2) = 2808882
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index 6c0326c2ade5..a553b9cc72fe 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -7,266 +7,69 @@ bin/traffic_manager
 bin/traffic_sac
 bin/traffic_server
 bin/traffic_shell
-etc/trafficserver/admin_access.config
-etc/trafficserver/ae_ua.config
-etc/trafficserver/body_factory/default/.body_factory_info
-etc/trafficserver/body_factory/default/README
-etc/trafficserver/body_factory/default/access#denied
-etc/trafficserver/body_factory/default/access#proxy_auth_required
-etc/trafficserver/body_factory/default/access#redirect_url
-etc/trafficserver/body_factory/default/access#ssl_forbidden
-etc/trafficserver/body_factory/default/cache#not_in_cache
-etc/trafficserver/body_factory/default/cache#read_error
-etc/trafficserver/body_factory/default/congestion#retryAfter
-etc/trafficserver/body_factory/default/connect#dns_failed
-etc/trafficserver/body_factory/default/connect#failed_connect
-etc/trafficserver/body_factory/default/connect#hangup
-etc/trafficserver/body_factory/default/default
-etc/trafficserver/body_factory/default/interception#no_host
-etc/trafficserver/body_factory/default/redirect#moved_temporarily
-etc/trafficserver/body_factory/default/request#cycle_detected
-etc/trafficserver/body_factory/default/request#no_content_length
-etc/trafficserver/body_factory/default/request#no_host
-etc/trafficserver/body_factory/default/request#scheme_unsupported
-etc/trafficserver/body_factory/default/request#syntax_error
-etc/trafficserver/body_factory/default/response#bad_response
-etc/trafficserver/body_factory/default/response#bad_version
-etc/trafficserver/body_factory/default/timeout#activity
-etc/trafficserver/body_factory/default/timeout#inactivity
-etc/trafficserver/body_factory/default/transcoding#unsupported
-etc/trafficserver/body_factory/default/urlrouting#no_mapping
-etc/trafficserver/cache.config
-etc/trafficserver/cluster.config
-etc/trafficserver/congestion.config
-etc/trafficserver/english.dict
-etc/trafficserver/filter.config
-etc/trafficserver/hosting.config
-etc/trafficserver/icp.config
-etc/trafficserver/ip_allow.config
-etc/trafficserver/log_hosts.config
-etc/trafficserver/logs.config
-etc/trafficserver/logs_xml.config
-etc/trafficserver/mgmt_allow.config
-etc/trafficserver/mgr.cnf
-etc/trafficserver/parent.config
-etc/trafficserver/partition.config
-etc/trafficserver/plugin.config
-etc/trafficserver/plugin.db
-etc/trafficserver/records.config
-etc/trafficserver/remap.config
-etc/trafficserver/snmpd.cnf
-etc/trafficserver/socks.config
-etc/trafficserver/splitdns.config
-etc/trafficserver/ssl_multicert.config
-etc/trafficserver/stats.config.xml
-etc/trafficserver/storage.config
-etc/trafficserver/trafficserver-release
-etc/trafficserver/trafficserver-root
-etc/trafficserver/update.config
-etc/trafficserver/vaddrs.config
-%%DATADIR%%/agent-installer/installer.cgi
-%%DATADIR%%/agent-installer/installer.html
-%%DATADIR%%/charting/Bandwidth_Savings.html
-%%DATADIR%%/charting/Cache_Percent_Free.html
-%%DATADIR%%/charting/Cache_Transfers_In_Progress.html
-%%DATADIR%%/charting/Client_Throughput.html
-%%DATADIR%%/charting/DNS_Lookups_Per_Second.html
-%%DATADIR%%/charting/Document_Hit_Rate.html
-%%DATADIR%%/charting/Host_Database_Hit_Rate.html
-%%DATADIR%%/charting/Multiple_Graph_View.html
-%%DATADIR%%/charting/Open_Client_Connections.html
-%%DATADIR%%/charting/Open_Server_Connections.html
-%%DATADIR%%/charting/Transactions_Per_Second.html
-%%DATADIR%%/checkCookies.ink
-%%DATADIR%%/configure/c_autoconf_pac.ink
-%%DATADIR%%/configure/c_autoconf_wpad.ink
-%%DATADIR%%/configure/c_basic.ink
-%%DATADIR%%/configure/c_basic.ink.win
-%%DATADIR%%/configure/c_buttons.ink
-%%DATADIR%%/configure/c_buttons_hide.ink
-%%DATADIR%%/configure/c_cache_general.ink
-%%DATADIR%%/configure/c_cache_hosting.ink
-%%DATADIR%%/configure/c_cache_partition.ink
-%%DATADIR%%/configure/c_clustering.ink
-%%DATADIR%%/configure/c_config_display.ink
-%%DATADIR%%/configure/c_congestion.ink
-%%DATADIR%%/configure/c_dns_host_database.ink
-%%DATADIR%%/configure/c_dns_proxy.ink
-%%DATADIR%%/configure/c_dns_resolver.ink
-%%DATADIR%%/configure/c_dns_split.ink
-%%DATADIR%%/configure/c_footer.ink
-%%DATADIR%%/configure/c_header.ink
-%%DATADIR%%/configure/c_http_cachability.ink
-%%DATADIR%%/configure/c_http_dyn_cache.ink
-%%DATADIR%%/configure/c_http_filtering.ink
-%%DATADIR%%/configure/c_http_general.ink
-%%DATADIR%%/configure/c_http_parent_proxy.ink
-%%DATADIR%%/configure/c_http_privacy.ink
-%%DATADIR%%/configure/c_http_response_custom.ink
-%%DATADIR%%/configure/c_http_response_general.ink
-%%DATADIR%%/configure/c_http_timeout.ink
-%%DATADIR%%/configure/c_http_update_general.ink
-%%DATADIR%%/configure/c_http_update_urls.ink
-%%DATADIR%%/configure/c_icp.ink
-%%DATADIR%%/configure/c_inspector.ink
-%%DATADIR%%/configure/c_inspector_display.ink
-%%DATADIR%%/configure/c_ldap_general.ink
-%%DATADIR%%/configure/c_logging_collation.ink
-%%DATADIR%%/configure/c_logging_custom.ink
-%%DATADIR%%/configure/c_logging_format.ink
-%%DATADIR%%/configure/c_logging_general.ink
-%%DATADIR%%/configure/c_logging_search.ink
-%%DATADIR%%/configure/c_logging_splitting.ink
-%%DATADIR%%/configure/c_mapping.ink
-%%DATADIR%%/configure/c_media_common.ink
-%%DATADIR%%/configure/c_media_push.ink
-%%DATADIR%%/configure/c_mgmt_access.ink
-%%DATADIR%%/configure/c_mgmt_general.ink
-%%DATADIR%%/configure/c_mgmt_login.ink
-%%DATADIR%%/configure/c_net_config.ink
-%%DATADIR%%/configure/c_net_devdri.ink
-%%DATADIR%%/configure/c_net_device.ink
-%%DATADIR%%/configure/c_net_driver.ink
-%%DATADIR%%/configure/c_net_nic.ink
-%%DATADIR%%/configure/c_ntlm_general.ink
-%%DATADIR%%/configure/c_phonehome.ink
-%%DATADIR%%/configure/c_proxy_access.ink
-%%DATADIR%%/configure/c_quicktime_general.ink
-%%DATADIR%%/configure/c_quicktime_mbridge.ink
-%%DATADIR%%/configure/c_radius_general.ink
-%%DATADIR%%/configure/c_real_networks_general.ink
-%%DATADIR%%/configure/c_reverse_proxy.ink
-%%DATADIR%%/configure/c_snapshot.ink
-%%DATADIR%%/configure/c_snapshot_filesystem.ink
-%%DATADIR%%/configure/c_snapshot_floppy.ink
-%%DATADIR%%/configure/c_socks_general.ink
-%%DATADIR%%/configure/c_socks_proxy.ink
-%%DATADIR%%/configure/c_socks_server.ink
-%%DATADIR%%/configure/c_ssl_accelerator.ink
-%%DATADIR%%/configure/c_ssl_client_proxy.ink
-%%DATADIR%%/configure/c_ssl_general.ink
-%%DATADIR%%/configure/c_ssl_proxy_server.ink
-%%DATADIR%%/configure/c_tab.ink
-%%DATADIR%%/configure/c_throttling.ink
-%%DATADIR%%/configure/c_view_access_logs.ink
-%%DATADIR%%/configure/c_view_debug_logs.ink
-%%DATADIR%%/configure/c_view_system_logs.ink
-%%DATADIR%%/configure/c_virtual_ip.ink
-%%DATADIR%%/configure/c_windows_media_general.ink
-%%DATADIR%%/configure/c_windows_media_mbridge.ink
-%%DATADIR%%/configure/c_windows_media_mcast.ink
-%%DATADIR%%/configure/f_bypass_config.ink
-%%DATADIR%%/configure/f_cache_config.ink
-%%DATADIR%%/configure/f_configs.ink
-%%DATADIR%%/configure/f_filter_config.ink
-%%DATADIR%%/configure/f_hosting_config.ink
-%%DATADIR%%/configure/f_icp_config.ink
-%%DATADIR%%/configure/f_ip_allow_config.ink
-%%DATADIR%%/configure/f_ipnat_config.ink
-%%DATADIR%%/configure/f_mgmt_allow_config.ink
-%%DATADIR%%/configure/f_parent_config.ink
-%%DATADIR%%/configure/f_partition_config.ink
-%%DATADIR%%/configure/f_remap_config.ink
-%%DATADIR%%/configure/f_socks_config.ink
-%%DATADIR%%/configure/f_split_dns_config.ink
-%%DATADIR%%/configure/f_update_config.ink
-%%DATADIR%%/configure/f_vaddrs_config.ink
-%%DATADIR%%/configure/helper/INKMgmtAPICheckTcl.sh
-%%DATADIR%%/configure/helper/log.sh
-%%DATADIR%%/configure/helper/otwu.tcl
-%%DATADIR%%/configure/helper/traffic_shell.cgi
-%%DATADIR%%/enableCookies.ink
-%%DATADIR%%/images/arrow_add.gif
-%%DATADIR%%/images/arrow_cross.gif
-%%DATADIR%%/images/arrow_down.gif
-%%DATADIR%%/images/arrow_set.gif
-%%DATADIR%%/images/arrow_up.gif
-%%DATADIR%%/images/blankIcon.gif
-%%DATADIR%%/images/configure_off.gif
-%%DATADIR%%/images/configure_on.gif
-%%DATADIR%%/images/dot_clear.gif
-%%DATADIR%%/images/header_bg.gif
-%%DATADIR%%/images/header_bg_pe.gif
-%%DATADIR%%/images/menu_begin_off.gif
-%%DATADIR%%/images/menu_begin_on.gif
-%%DATADIR%%/images/menu_bg_off.gif
-%%DATADIR%%/images/menu_bg_on.gif
-%%DATADIR%%/images/menu_end_off.gif
-%%DATADIR%%/images/menu_end_on.gif
-%%DATADIR%%/images/menu_separator_off_off.gif
-%%DATADIR%%/images/menu_separator_off_on.gif
-%%DATADIR%%/images/menu_separator_on_off.gif
-%%DATADIR%%/images/minusIcon.gif
-%%DATADIR%%/images/monitor_off.gif
-%%DATADIR%%/images/monitor_on.gif
-%%DATADIR%%/images/plusIcon.gif
-%%DATADIR%%/include/body_footer.ink
-%%DATADIR%%/include/body_header.ink
-%%DATADIR%%/include/footer.ink
-%%DATADIR%%/include/form_footer.ink
-%%DATADIR%%/include/form_header.ink
-%%DATADIR%%/include/header.ink
-%%DATADIR%%/include/html_footer.ink
-%%DATADIR%%/include/html_header.ink
-%%DATADIR%%/include/tree_footer.ink
-%%DATADIR%%/include/tree_header.ink
-%%DATADIR%%/index.ink
-%%DATADIR%%/inktomi.css
-%%DATADIR%%/inktomiLarge.css
-%%DATADIR%%/monitor/m_alarm.ink
-%%DATADIR%%/monitor/m_blue_bar.ink
-%%DATADIR%%/monitor/m_cache.ink
-%%DATADIR%%/monitor/m_cluster.ink
-%%DATADIR%%/monitor/m_dns.ink
-%%DATADIR%%/monitor/m_dns_proxy.ink
-%%DATADIR%%/monitor/m_footer.ink
-%%DATADIR%%/monitor/m_graphs.ink
-%%DATADIR%%/monitor/m_header.ink
-%%DATADIR%%/monitor/m_http.ink
-%%DATADIR%%/monitor/m_http_trans.ink
-%%DATADIR%%/monitor/m_icp.ink
-%%DATADIR%%/monitor/m_ldap.ink
-%%DATADIR%%/monitor/m_logging.ink
-%%DATADIR%%/monitor/m_mpeg4.ink
-%%DATADIR%%/monitor/m_net.ink
-%%DATADIR%%/monitor/m_net_device.ink
-%%DATADIR%%/monitor/m_node.ink
-%%DATADIR%%/monitor/m_ntlm.ink
-%%DATADIR%%/monitor/m_overview.ink
-%%DATADIR%%/monitor/m_overview_details_less.ink
-%%DATADIR%%/monitor/m_overview_details_more.ink
-%%DATADIR%%/monitor/m_quicktime.ink
-%%DATADIR%%/monitor/m_real_networks.ink
-%%DATADIR%%/monitor/m_socks.ink
-%%DATADIR%%/monitor/m_tab.ink
-%%DATADIR%%/monitor/m_virtual_ip.ink
-%%DATADIR%%/monitor/m_windows_media.ink
-%%DATADIR%%/mrtg/detailed.ink
-%%DATADIR%%/mrtg/overview.ink
-%%DATADIR%%/navigation_tree.xml
-%%DATADIR%%/plugin.ink
-%%DATADIR%%/rename.ink
-%%DATADIR%%/resize.js
-%%DATADIR%%/restart.ink
-%%DATADIR%%/ssl_redirect.ink
-%%DATADIR%%/tune/navigation_tree.xmlcpp
+bin/tsxs
+%%ETCDIR%%/admin_access.config
+%%ETCDIR%%/ae_ua.config
+%%ETCDIR%%/body_factory/default/.body_factory_info
+%%ETCDIR%%/body_factory/default/README
+%%ETCDIR%%/body_factory/default/access#denied
+%%ETCDIR%%/body_factory/default/access#proxy_auth_required
+%%ETCDIR%%/body_factory/default/access#redirect_url
+%%ETCDIR%%/body_factory/default/access#ssl_forbidden
+%%ETCDIR%%/body_factory/default/cache#not_in_cache
+%%ETCDIR%%/body_factory/default/cache#read_error
+%%ETCDIR%%/body_factory/default/congestion#retryAfter
+%%ETCDIR%%/body_factory/default/connect#dns_failed
+%%ETCDIR%%/body_factory/default/connect#failed_connect
+%%ETCDIR%%/body_factory/default/connect#hangup
+%%ETCDIR%%/body_factory/default/default
+%%ETCDIR%%/body_factory/default/interception#no_host
+%%ETCDIR%%/body_factory/default/redirect#moved_temporarily
+%%ETCDIR%%/body_factory/default/request#cycle_detected
+%%ETCDIR%%/body_factory/default/request#no_content_length
+%%ETCDIR%%/body_factory/default/request#no_host
+%%ETCDIR%%/body_factory/default/request#scheme_unsupported
+%%ETCDIR%%/body_factory/default/request#syntax_error
+%%ETCDIR%%/body_factory/default/response#bad_response
+%%ETCDIR%%/body_factory/default/response#bad_version
+%%ETCDIR%%/body_factory/default/timeout#activity
+%%ETCDIR%%/body_factory/default/timeout#inactivity
+%%ETCDIR%%/body_factory/default/transcoding#unsupported
+%%ETCDIR%%/body_factory/default/urlrouting#no_mapping
+%%ETCDIR%%/cache.config
+%%ETCDIR%%/cluster.config
+%%ETCDIR%%/congestion.config
+%%ETCDIR%%/hosting.config
+%%ETCDIR%%/icp.config
+%%ETCDIR%%/ip_allow.config
+%%ETCDIR%%/log_hosts.config
+%%ETCDIR%%/logs.config
+%%ETCDIR%%/logs_xml.config
+%%ETCDIR%%/mgmt_allow.config
+%%ETCDIR%%/mgr.cnf
+%%ETCDIR%%/parent.config
+%%ETCDIR%%/partition.config
+%%ETCDIR%%/plugin.config
+%%ETCDIR%%/plugin.db
+%%ETCDIR%%/records.config
+%%ETCDIR%%/remap.config
+%%ETCDIR%%/socks.config
+%%ETCDIR%%/splitdns.config
+%%ETCDIR%%/ssl_multicert.config
+%%ETCDIR%%/stats.config.xml
+%%ETCDIR%%/storage.config
+%%ETCDIR%%/trafficserver-release
+%%ETCDIR%%/update.config
+%%ETCDIR%%/vaddrs.config
+include/ts/experimental.h
 include/ts/remap.h
-include/ts/ts_private.h
 include/ts/ts.h
+include/ts/ts_private.h
 include/ts/ts_private_frozen.h
-@dirrmtry libexec/trafficserver
-@dirrmtry include/ts
-@dirrmtry %%DATADIR%%/agent-installer
-@dirrmtry %%DATADIR%%/charting
-@dirrmtry %%DATADIR%%/configure/helper
-@dirrmtry %%DATADIR%%/configure
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%/include
-@dirrmtry %%DATADIR%%/monitor
-@dirrmtry %%DATADIR%%/mrtg
-@dirrmtry %%DATADIR%%/tune
-@dirrmtry %%DATADIR%%
-@dirrmtry etc/trafficserver/body_factory/default
-@dirrmtry etc/trafficserver/body_factory
-@dirrmtry etc/trafficserver/internal
-@dirrmtry etc/trafficserver
+@dirrm %%DATADIR%%
+@dirrm libexec/trafficserver
+@dirrm include/ts
+@dirrm %%ETCDIR%%/internal
+@dirrm %%ETCDIR%%/body_factory/default
+@dirrm %%ETCDIR%%/body_factory
+@dirrmtry %%ETCDIR%%