4 files changed, 19 insertions, 27 deletions

diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 5f1f5c5637ff..e6faf04da54b 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	trafficserver
-PORTVERSION=	2.1.5
+PORTVERSION=	3.0.0
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-unstable
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	A fast, scalable and extensible HTTP proxy server
@@ -39,14 +39,10 @@ RUN_DEPENDS=	xz>0:${PORTSDIR}/archivers/xz
 BROKEN=		does not compile on 7.X
 .endif
 
-pre-configure:
-	@cd ${WRKSRC} && ${AUTORECONF} -i
-
-# XXX: no, I don't know why this is needed for libtool > 2.2.10 but it's
-#      the only one, and a dirty hack will suffice.  Of course, using both
-#      autoreconf and the bsd.autotools.mk targets is bad too.
-#
 post-configure:
-	@${CP} ${LIBTOOL} ${WRKSRC}/libtool
+	@${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e \
+	    's,LIBTOOL_LINK_FLAGS = -R -R/usr/local/lib,LIBTOOL_LINK_FLAGS = -R/usr/local/lib,'
+	@${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e \
+	    's,LDFLAGS = -rdynamic  *-R -R,LDFLAGS = -rdynamic -R,'
 
 .include <bsd.port.post.mk>
diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo
index e196ab39efff..18c05f80f344 100644
--- a/www/trafficserver/distinfo
+++ b/www/trafficserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trafficserver-2.1.5-unstable.tar.bz2) = 1940e6836c81f7d719cab5e446e8e385c90c5b878975193ecafad7695f13be95
-SIZE (trafficserver-2.1.5-unstable.tar.bz2) = 2697636
+SHA256 (trafficserver-3.0.0.tar.bz2) = 70d3abda009719d272bc87288bf47beaa5966cb964c9dfbb5fd32c602ac1354e
+SIZE (trafficserver-3.0.0.tar.bz2) = 2418416
diff --git a/www/trafficserver/files/patch-rc__Makefile b/www/trafficserver/files/patch-rc__Makefile
deleted file mode 100644
index 620b2c8e7538..000000000000
--- a/www/trafficserver/files/patch-rc__Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- rc/Makefile.am.orig	2010-08-15 22:00:12.940238878 +0800
-+++ rc/Makefile.am	2010-08-15 22:00:28.382362165 +0800
-@@ -25,9 +25,6 @@
-   -I$(top_srcdir)/proxy/cache \
-   -I$(top_srcdir)/proxy/logging
- 
--dist_bin_SCRIPTS = \
--  trafficserver
--
- noinst_PROGRAMS = update_records
- 
- update_records_SOURCES = update_records.cc 
diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist
index 96a862537864..9cf48e71921b 100644
--- a/www/trafficserver/pkg-plist
+++ b/www/trafficserver/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/trafficserver
 bin/traffic_cop
 bin/traffic_line
 bin/traffic_logcat
@@ -8,10 +9,18 @@ bin/traffic_sac
 bin/traffic_server
 bin/traffic_shell
 bin/tsxs
+lib/libtsmgmt.so
+lib/libtsutil.a
+lib/libtsutil.so.3
+lib/libtsmgmt.la
+lib/libtsutil.so
+lib/libtsutil.la
+lib/libtsmgmt.a
+lib/libtsmgmt.so.3
 libexec/trafficserver/conf_remap.la
 libexec/trafficserver/conf_remap.so
-%%ETCDIR%%/admin_access.config
 %%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
@@ -46,10 +55,8 @@ libexec/trafficserver/conf_remap.so
 %%ETCDIR%%/ip_allow.config
 %%ETCDIR%%/log_hosts.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
@@ -63,6 +70,7 @@ libexec/trafficserver/conf_remap.so
 %%ETCDIR%%/update.config
 %%ETCDIR%%/vaddrs.config
 include/ts/experimental.h
+include/ts/mgmtapi.h
 include/ts/remap.h
 include/ts/ts.h
 @dirrm %%DATADIR%%