Update to 2.8.1, remove needless patches.

Also welcome back ReportGen subdir.

Approved by:	maintainer (timeout > 3 weeks)

5 files changed, 17 insertions, 31 deletions

diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 2eb7c1a8ea46..4877bf2e6761 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	polygraph
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/benchmarks/polygraph/distinfo b/benchmarks/polygraph/distinfo
index dddc4b79c985..bf3b8cdf1d45 100644
--- a/benchmarks/polygraph/distinfo
+++ b/benchmarks/polygraph/distinfo
@@ -1,2 +1,2 @@
-MD5 (polygraph-2.8.0-src.tgz) = e006ecd99637aa78c47d6b9b13774eaa
-SIZE (polygraph-2.8.0-src.tgz) = 710102
+MD5 (polygraph-2.8.1-src.tgz) = f42e70d3fa383f42bf3676c086b2d16c
+SIZE (polygraph-2.8.1-src.tgz) = 710841
diff --git a/benchmarks/polygraph/files/patch-src::loganalyzers::SideInfo.cc b/benchmarks/polygraph/files/patch-src::loganalyzers::SideInfo.cc
deleted file mode 100644
index 5b5f5adf8f4d..000000000000
--- a/benchmarks/polygraph/files/patch-src::loganalyzers::SideInfo.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/loganalyzers/SideInfo.cc.orig	Thu Feb 26 16:55:36 2004
-+++ src/loganalyzers/SideInfo.cc	Thu Feb 26 16:56:05 2004
-@@ -1166,9 +1166,9 @@
- 			XmlTag descr("description");
- 
- 			XmlTextTag<XmlParagraph> p1;
--			p1.buf() << "The 'Errors' table shows detected errors. For each
--				error type, the number of errors and their contribution towards
--				total error count are shown.";
-+			p1.buf() << "The 'Errors' table shows detected errors. For each "
-+				"error type, the number of errors and their contribution towards "
-+				"total error count are shown.";
- 			descr << p1;
- 
- 			blob << descr;
diff --git a/benchmarks/polygraph/files/patch-src::xparser::SynSym.h b/benchmarks/polygraph/files/patch-src::xparser::SynSym.h
deleted file mode 100644
index f13ebb464464..000000000000
--- a/benchmarks/polygraph/files/patch-src::xparser::SynSym.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xparser/SynSym.h.orig	Thu Feb 26 18:21:19 2004
-+++ src/xparser/SynSym.h	Thu Feb 26 18:21:49 2004
-@@ -54,8 +54,8 @@
- 		String theType;
- };
- 
--#define SymCast(Type, var) ((Type&)((var).cast(Type##::TheType)))
--#define ConstSymCast(Type, var) ((const Type&)((var).cast(Type##::TheType)))
-+#define SymCast(Type, var) ((Type&)((var).cast(Type::TheType)))
-+#define ConstSymCast(Type, var) ((const Type&)((var).cast(Type::TheType)))
- 
- inline ostream &operator <<(ostream &os, const SynSym &sym) { return sym.print(os); }
- 
diff --git a/benchmarks/polygraph/pkg-plist b/benchmarks/polygraph/pkg-plist
index fe305ecb7c2c..927b65a85e09 100644
--- a/benchmarks/polygraph/pkg-plist
+++ b/benchmarks/polygraph/pkg-plist
@@ -20,6 +20,19 @@ bin/reporter
 bin/rng_test
 bin/tcp2xmld
 bin/udp2tcpd
+%%DATADIR%%/ReportGen/label_results
+%%DATADIR%%/ReportGen/make_report
+%%DATADIR%%/ReportGen/make_card
+%%DATADIR%%/ReportGen/plot_traces
+%%DATADIR%%/ReportGen/plot_table
+%%DATADIR%%/ReportGen/Globs.pm
+%%DATADIR%%/ReportGen/Line.pm
+%%DATADIR%%/ReportGen/ObjDbase.pm
+%%DATADIR%%/ReportGen/ObjManip.pm
+%%DATADIR%%/ReportGen/Opts.pm
+%%DATADIR%%/ReportGen/Plot.pm
+%%DATADIR%%/ReportGen/RepFormat.pm
+%%DATADIR%%/ReportGen/reportgen.cfg
 %%DATADIR%%/workloads/datacomm-1.pg
 %%DATADIR%%/workloads/downtime-2.pg
 %%DATADIR%%/workloads/include/benches.pg
@@ -44,6 +57,7 @@ bin/udp2tcpd
 %%DATADIR%%/workloads/webaxe-1.pg
 %%DATADIR%%/workloads/webaxe-3.pg
 %%DATADIR%%/workloads/webaxe-4.pg
+@dirrm %%DATADIR%%/ReportGen
 @dirrm %%DATADIR%%/workloads/include
 @dirrm %%DATADIR%%/workloads
 @dirrm %%DATADIR%%