2 files changed, 73 insertions, 24 deletions

diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index eb0441a610fb..d618895932fc 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trafficserver
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
@@ -48,6 +48,9 @@ BROKEN=		does not compile on 7.X/amd64
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's,|| mv,|| cp -p,' ${WRKSRC}/proxy/config/Makefile.am
+
 post-configure:
 	@${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} \
 	    -e 's,LIBTOOL_LINK_FLAGS = -R -R,LIBTOOL_LINK_FLAGS = -R,' \
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index 9cf48e71921b..084b1fe486c3 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -1,4 +1,27 @@
 @comment $FreeBSD$
+@unexec if cmp %D/%%ETCDIR%%/ae_ua.config %D/%%ETCDIR%%/ae_ua.config.default; then rm %D/%%ETCDIR%%/ae_ua.config; fi
+@unexec if cmp %D/%%ETCDIR%%/cache.config %D/%%ETCDIR%%/cache.config.default; then rm %D/%%ETCDIR%%/cache.config; fi
+@unexec if cmp %D/%%ETCDIR%%/cluster.config %D/%%ETCDIR%%/cluster.config.default; then rm %D/%%ETCDIR%%/cluster.config; fi
+@unexec if cmp %D/%%ETCDIR%%/congestion.config %D/%%ETCDIR%%/congestion.config.default; then rm %D/%%ETCDIR%%/congestion.config; fi
+@unexec if cmp %D/%%ETCDIR%%/hosting.config %D/%%ETCDIR%%/hosting.config.default; then rm %D/%%ETCDIR%%/hosting.config; fi
+@unexec if cmp %D/%%ETCDIR%%/icp.config %D/%%ETCDIR%%/icp.config.default; then rm %D/%%ETCDIR%%/icp.config; fi
+@unexec if cmp %D/%%ETCDIR%%/ip_allow.config %D/%%ETCDIR%%/ip_allow.config.default; then rm %D/%%ETCDIR%%/ip_allow.config; fi
+@unexec if cmp %D/%%ETCDIR%%/log_hosts.config %D/%%ETCDIR%%/log_hosts.config.default; then rm %D/%%ETCDIR%%/log_hosts.config; fi
+@unexec if cmp %D/%%ETCDIR%%/logs_xml.config %D/%%ETCDIR%%/logs_xml.config.default; then rm %D/%%ETCDIR%%/logs_xml.config; fi
+@unexec if cmp %D/%%ETCDIR%%/mgr.cnf %D/%%ETCDIR%%/mgr.cnf.default; then rm %D/%%ETCDIR%%/mgr.cnf; fi
+@unexec if cmp %D/%%ETCDIR%%/parent.config %D/%%ETCDIR%%/parent.config.default; then rm %D/%%ETCDIR%%/parent.config; fi
+@unexec if cmp %D/%%ETCDIR%%/volume.config %D/%%ETCDIR%%/volume.config.default; then rm %D/%%ETCDIR%%/volume.config; fi
+@unexec if cmp %D/%%ETCDIR%%/plugin.config %D/%%ETCDIR%%/plugin.config.default; then rm %D/%%ETCDIR%%/plugin.config; fi
+@unexec if cmp %D/%%ETCDIR%%/plugin.db %D/%%ETCDIR%%/plugin.db.default; then rm %D/%%ETCDIR%%/plugin.db; fi
+@unexec if cmp %D/%%ETCDIR%%/remap.config %D/%%ETCDIR%%/remap.config.default; then rm %D/%%ETCDIR%%/remap.config; fi
+@unexec if cmp %D/%%ETCDIR%%/records.config %D/%%ETCDIR%%/records.config.default; then rm %D/%%ETCDIR%%/records.config; fi
+@unexec if cmp %D/%%ETCDIR%%/socks.config %D/%%ETCDIR%%/socks.config.default; then rm %D/%%ETCDIR%%/socks.config; fi
+@unexec if cmp %D/%%ETCDIR%%/splitdns.config %D/%%ETCDIR%%/splitdns.config.default; then rm %D/%%ETCDIR%%/splitdns.config; fi
+@unexec if cmp %D/%%ETCDIR%%/ssl_multicert.config %D/%%ETCDIR%%/ssl_multicert.config.default; then rm %D/%%ETCDIR%%/ssl_multicert.config; fi
+@unexec if cmp %D/%%ETCDIR%%/stats.config.xml %D/%%ETCDIR%%/stats.config.xml.default; then rm %D/%%ETCDIR%%/stats.config.xml; fi
+@unexec if cmp %D/%%ETCDIR%%/storage.config %D/%%ETCDIR%%/storage.config.default; then rm %D/%%ETCDIR%%/storage.config; fi
+@unexec if cmp %D/%%ETCDIR%%/update.config %D/%%ETCDIR%%/update.config.default; then rm %D/%%ETCDIR%%/update.config; fi
+@unexec if cmp %D/%%ETCDIR%%/vaddrs.config %D/%%ETCDIR%%/vaddrs.config.default; then rm %D/%%ETCDIR%%/vaddrs.config; fi
 bin/trafficserver
 bin/traffic_cop
 bin/traffic_line
@@ -19,8 +42,6 @@ lib/libtsmgmt.a
 lib/libtsmgmt.so.3
 libexec/trafficserver/conf_remap.la
 libexec/trafficserver/conf_remap.so
-%%ETCDIR%%/ae_ua.config
-%%ETCDIR%%/volume.config
 %%ETCDIR%%/body_factory/default/.body_factory_info
 %%ETCDIR%%/body_factory/default/README
 %%ETCDIR%%/body_factory/default/access#denied
@@ -47,28 +68,30 @@ libexec/trafficserver/conf_remap.so
 %%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_xml.config
-%%ETCDIR%%/mgr.cnf
-%%ETCDIR%%/parent.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%%/ae_ua.config.default
+%%ETCDIR%%/cache.config.default
+%%ETCDIR%%/cluster.config.default
+%%ETCDIR%%/congestion.config.default
+%%ETCDIR%%/hosting.config.default
+%%ETCDIR%%/icp.config.default
+%%ETCDIR%%/ip_allow.config.default
+%%ETCDIR%%/log_hosts.config.default
+%%ETCDIR%%/logs_xml.config.default
+%%ETCDIR%%/mgr.cnf.default
+%%ETCDIR%%/parent.config.default
+%%ETCDIR%%/plugin.config.default
+%%ETCDIR%%/plugin.db.default
+%%ETCDIR%%/records.config.default
+%%ETCDIR%%/remap.config.default
+%%ETCDIR%%/socks.config.default
+%%ETCDIR%%/splitdns.config.default
+%%ETCDIR%%/ssl_multicert.config.default
+%%ETCDIR%%/stats.config.xml.default
+%%ETCDIR%%/storage.config.default
 %%ETCDIR%%/trafficserver-release
-%%ETCDIR%%/update.config
-%%ETCDIR%%/vaddrs.config
+%%ETCDIR%%/update.config.default
+%%ETCDIR%%/vaddrs.config.default
+%%ETCDIR%%/volume.config.default
 include/ts/experimental.h
 include/ts/mgmtapi.h
 include/ts/remap.h
@@ -80,3 +103,26 @@ include/ts/ts.h
 @dirrm %%ETCDIR%%/body_factory/default
 @dirrm %%ETCDIR%%/body_factory
 @dirrmtry %%ETCDIR%%
+@exec if [ ! -f %D/%%ETCDIR%%/ae_ua.config ]; then cp -p %D/%%ETCDIR%%/ae_ua.config.default %D/%%ETCDIR%%/ae_ua.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/cache.config ]; then cp -p %D/%%ETCDIR%%/cache.config.default %D/%%ETCDIR%%/cache.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/cluster.config ]; then cp -p %D/%%ETCDIR%%/cluster.config.default %D/%%ETCDIR%%/cluster.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/congestion.config ]; then cp -p %D/%%ETCDIR%%/congestion.config.default %D/%%ETCDIR%%/congestion.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/hosting.config ]; then cp -p %D/%%ETCDIR%%/hosting.config.default %D/%%ETCDIR%%/hosting.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/icp.config ]; then cp -p %D/%%ETCDIR%%/icp.config.default %D/%%ETCDIR%%/icp.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/ip_allow.config ]; then cp -p %D/%%ETCDIR%%/ip_allow.config.default %D/%%ETCDIR%%/ip_allow.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/log_hosts.config ]; then cp -p %D/%%ETCDIR%%/log_hosts.config.default %D/%%ETCDIR%%/log_hosts.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/logs_xml.config ]; then cp -p %D/%%ETCDIR%%/logs_xml.config.default %D/%%ETCDIR%%/logs_xml.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/mgr.cnf ]; then cp -p %D/%%ETCDIR%%/mgr.cnf.default %D/%%ETCDIR%%/mgr.cnf; fi
+@exec if [ ! -f %D/%%ETCDIR%%/parent.config ]; then cp -p %D/%%ETCDIR%%/parent.config.default %D/%%ETCDIR%%/parent.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/volume.config ]; then cp -p %D/%%ETCDIR%%/volume.config.default %D/%%ETCDIR%%/volume.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/plugin.config ]; then cp -p %D/%%ETCDIR%%/plugin.config.default %D/%%ETCDIR%%/plugin.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/plugin.db ]; then cp -p %D/%%ETCDIR%%/plugin.db.default %D/%%ETCDIR%%/plugin.db; fi
+@exec if [ ! -f %D/%%ETCDIR%%/records.config ]; then cp -p %D/%%ETCDIR%%/records.config.default %D/%%ETCDIR%%/records.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/remap.config ]; then cp -p %D/%%ETCDIR%%/remap.config.default %D/%%ETCDIR%%/remap.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/socks.config ]; then cp -p %D/%%ETCDIR%%/socks.config.default %D/%%ETCDIR%%/socks.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/splitdns.config ]; then cp -p %D/%%ETCDIR%%/splitdns.config.default %D/%%ETCDIR%%/splitdns.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/ssl_multicert.config ]; then cp -p %D/%%ETCDIR%%/ssl_multicert.config.default %D/%%ETCDIR%%/ssl_multicert.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/stats.config.xml ]; then cp -p %D/%%ETCDIR%%/stats.config.xml.default %D/%%ETCDIR%%/stats.config.xml; fi
+@exec if [ ! -f %D/%%ETCDIR%%/storage.config ]; then cp -p %D/%%ETCDIR%%/storage.config.default %D/%%ETCDIR%%/storage.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/update.config ]; then cp -p %D/%%ETCDIR%%/update.config.default %D/%%ETCDIR%%/update.config; fi
+@exec if [ ! -f %D/%%ETCDIR%%/vaddrs.config ]; then cp -p %D/%%ETCDIR%%/vaddrs.config.default %D/%%ETCDIR%%/vaddrs.config; fi