4 files changed, 41 insertions, 20 deletions

diff --git a/net-mgmt/tas/Makefile b/net-mgmt/tas/Makefile
index 5df04cc4c069..4af928b92f4d 100644
--- a/net-mgmt/tas/Makefile
+++ b/net-mgmt/tas/Makefile
@@ -1,21 +1,20 @@
 # New ports collection makefile for:   tas
 # Date created:        25 December 2000
-# Whom:                anton
+# Whom:                Anton Voronin <anton@urc.ac.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tas
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	net
-MASTER_SITES=	http://tas.net-conex.com/ \
-		http://rnoc.urc.ac.ru/~anton/projects/tas/
+MASTER_SITES=	http://rnoc.urc.ac.ru/~anton/projects/tas/
 DISTNAME=	tas-${PORTVERSION}
 
 MAINTAINER=	anton@urc.ac.ru
 
 WRKSRC=		${WRKDIR}/tas
 
-NO_BUILD=	yes
+NO_BUILD=	YES
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/tas/distinfo b/net-mgmt/tas/distinfo
index ae03d2089bac..4f9de33e50bf 100644
--- a/net-mgmt/tas/distinfo
+++ b/net-mgmt/tas/distinfo
@@ -1 +1 @@
-MD5 (tas-1.1.tar.gz) = 70b4a436296d5cec2fe6f5dad6e88c82
+MD5 (tas-1.2.1.tar.gz) = 82d6c8b3b1ec8b8f1444f5bc0fc42760
diff --git a/net-mgmt/tas/pkg-descr b/net-mgmt/tas/pkg-descr
index 46db2a5ebc64..3df3cfb0b076 100644
--- a/net-mgmt/tas/pkg-descr
+++ b/net-mgmt/tas/pkg-descr
@@ -1,8 +1,24 @@
 TAS is a traffic accounting system that picks up ip and application level
-traffic statistics, stores it and processes to build reports. Report is a
-set of user-defined tables. Table columns and rows are groups of hosts
-(traffic sources or destinations) aggregated according to the rules defined
-by user.
+traffic statistics, stores it and processes to build reports. Report is a set
+of user-defined tables. Table columns and rows are groups of hosts (traffic
+sources or destinations) aggregated according to the rules defined by user.
+What TAS can let you, in a few words:
+- Do traffic accounting on IP-level and application level
+- Store all accounting data for the desirable number of months for later
+  data extraction
+- Generate complex reports (in HTML or plain text) according to the
+  specified rules either on periodic basis or on demand
+- Have a convinient web interface for easy definition of report rules and
+  quick report generation
+What TAS is not intended for:
+- Time accounting
+- Accounting for non IP or IP-based traffic
+- Accounting by username (in case of password-based internet access)
+- Charging/Pricing/Billing/Client management
+- Gathering traffic accounting information from the router interfaces
+  like trafd, bpft, ipacctd, or ipa do (TAS is just a front-end for such kind
+  of programs)
+- Reports generation for arbitrary time intervals
 
 WWW:	http://tas.net-conex.com
 	http://rnoc.urc.ac.ru/~anton/projects/tas/TAS.html
diff --git a/net-mgmt/tas/pkg-plist b/net-mgmt/tas/pkg-plist
index adf50982dd04..a18e11a95350 100644
--- a/net-mgmt/tas/pkg-plist
+++ b/net-mgmt/tas/pkg-plist
@@ -1,11 +1,11 @@
 etc/periodic/daily/accounting
 etc/periodic/monthly/accounting
-etc/tas/AcctLog.conf
-etc/tas/AcctLog.conf.default
-etc/tas/accounting.conf
-etc/tas/accounting.conf.default
-etc/tas/tas.conf
-etc/tas/tas.conf.default
+etc/tas/AcctLog.conf.sample
+etc/tas/accounting.conf.sample
+etc/tas/cgi.conf.en
+etc/tas/cgi.conf.ru
+etc/tas/tas.conf.sample
+sbin/AcctConvert
 sbin/AcctFetch
 sbin/AcctJoin
 sbin/AcctLog
@@ -14,8 +14,14 @@ sbin/AcctMax
 sbin/AcctSendmail
 sbin/AcctSquid
 share/doc/tas/TAS.html
-@dirrm share/doc/tas
+share/doc/tas/model.png
+share/doc/tas/newcolumn.png
+share/doc/tas/newlist.png
+share/doc/tas/report.html
+share/tas/cgi/AcctLog.cgi
+share/tas/cgi/Client.cgi
+@unexec if [ -L %D/etc/tas/cgi.conf ] ; then /bin/rm %D/etc/tas/cgi.conf ; fi
 @dirrm etc/tas
-@dirrm etc/periodic/monthly
-@dirrm etc/periodic/daily
-@dirrm etc/periodic
+@dirrm share/doc/tas
+@dirrm share/tas/cgi
+@dirrm share/tas