3 files changed, 24 insertions, 27 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index fe0dcd7c5f99..25f9a6e025ef 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jmeter
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	jmeter/binaries
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jb.quenot@caraldi.com
+MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Functional behaviour load and performance test application
 
 USE_JAVA=	yes
diff --git a/www/jakarta-jmeter/distinfo b/www/jakarta-jmeter/distinfo
index 862a028bf698..80fc201ee9f3 100644
--- a/www/jakarta-jmeter/distinfo
+++ b/www/jakarta-jmeter/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakarta-jmeter-2.2.tgz) = 9889e814318baade8e68bd20d81e74f1
-SHA256 (jakarta-jmeter-2.2.tgz) = 7468a2a73913f8b5fab714b72ede8dde46c4305878cf58f8a2b26b441d2262d3
-SIZE (jakarta-jmeter-2.2.tgz) = 9744682
+MD5 (jakarta-jmeter-2.3.1.tgz) = 18e9fed5088ebce150e1b47fbbdcd1d0
+SHA256 (jakarta-jmeter-2.3.1.tgz) = 475b7e81e7a24bc2134105306c4713d1670e133704d5eee8901d3faa8d76bd0f
+SIZE (jakarta-jmeter-2.3.1.tgz) = 13545763
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jakarta-jmeter/pkg-plist
index d41e7f329190..057217250003 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jakarta-jmeter/pkg-plist
@@ -2,13 +2,17 @@
 %%DATADIR%%/bin/ApacheJMeter.jar
 %%DATADIR%%/bin/BeanShellAssertion.bshrc
 %%DATADIR%%/bin/BeanShellFunction.bshrc
+%%DATADIR%%/bin/BeanShellListeners.bshrc
 %%DATADIR%%/bin/BeanShellSampler.bshrc
+%%DATADIR%%/bin/httpclient.parameters
 %%DATADIR%%/bin/jmeter
+%%DATADIR%%/bin/jmeter-n-r.cmd
 %%DATADIR%%/bin/jmeter-n.cmd
 %%DATADIR%%/bin/jmeter-report
 %%DATADIR%%/bin/jmeter-server
 %%DATADIR%%/bin/jmeter-t.cmd
 %%DATADIR%%/bin/jmeter.properties
+%%DATADIR%%/bin/jmeter.sh
 %%DATADIR%%/bin/jmeterw.cmd
 %%DATADIR%%/bin/log4j.conf
 %%DATADIR%%/bin/logkit.xml
@@ -30,8 +34,6 @@
 %%DATADIR%%/extras/build.xml
 %%DATADIR%%/extras/collapse.jpg
 %%DATADIR%%/extras/convertjmx.fdl
-%%DATADIR%%/extras/eclipse.readme
-%%DATADIR%%/extras/eclipselaunch.txt
 %%DATADIR%%/extras/execcode.bsh
 %%DATADIR%%/extras/expand.jpg
 %%DATADIR%%/extras/jmeter-results-detail-report.xsl
@@ -42,21 +44,19 @@
 %%DATADIR%%/extras/printvars.bsh
 %%DATADIR%%/extras/remote.bsh
 %%DATADIR%%/extras/startup.bsh
-%%DATADIR%%/lib/LICENSE(XPP3).txt
-%%DATADIR%%/lib/LICENSE(XStream).txt
-%%DATADIR%%/lib/LICENSE(jCharts).txt
-%%DATADIR%%/lib/LICENSE(jdom).txt
-%%DATADIR%%/lib/LICENSE(jtidy).txt
 %%DATADIR%%/lib/Tidy.jar
 %%DATADIR%%/lib/avalon-framework-4.1.4.jar
-%%DATADIR%%/lib/batik-awt-util.jar
-%%DATADIR%%/lib/bsf-2.3.0.jar
+%%DATADIR%%/lib/batik-awt-util-1.6.jar
+%%DATADIR%%/lib/bsf-2.4.0.jar
 %%DATADIR%%/lib/bshclient.jar
 %%DATADIR%%/lib/commons-codec-1.3.jar
-%%DATADIR%%/lib/commons-collections.jar
-%%DATADIR%%/lib/commons-httpclient-3.0.1.jar
-%%DATADIR%%/lib/commons-jexl-1.0.jar
+%%DATADIR%%/lib/commons-collections-3.2.jar
+%%DATADIR%%/lib/commons-httpclient-3.1.jar
+%%DATADIR%%/lib/commons-io-1.3.1.jar
+%%DATADIR%%/lib/commons-jexl-1.1.jar
+%%DATADIR%%/lib/commons-lang-2.3.jar
 %%DATADIR%%/lib/commons-logging-1.1.jar
+%%DATADIR%%/lib/commons-net-1.4.1.jar
 %%DATADIR%%/lib/excalibur-datasource-1.1.1.jar
 %%DATADIR%%/lib/excalibur-instrument-1.0.jar
 %%DATADIR%%/lib/excalibur-logger-1.1.jar
@@ -75,25 +75,23 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_monitors.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_report.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_tcp.jar
-%%DATADIR%%/lib/htmlparser.jar
-%%DATADIR%%/lib/htmlparserparser.jar
-%%DATADIR%%/lib/htmlparserparser16.jar
+%%DATADIR%%/lib/htmllexer-2.0-20060923.jar
+%%DATADIR%%/lib/htmlparser-2.0-20060923.jar
 %%DATADIR%%/lib/jCharts-0.7.5.jar
 %%DATADIR%%/lib/jakarta-oro-2.0.8.jar
 %%DATADIR%%/lib/jdom-1.0.jar
 %%DATADIR%%/lib/jorphan.jar
-%%DATADIR%%/lib/js.jar
-%%DATADIR%%/lib/js_jar_license(mozilla).html
+%%DATADIR%%/lib/js_rhino1_6R5.jar
 %%DATADIR%%/lib/junit/test.jar
-%%DATADIR%%/lib/junit.jar
-%%DATADIR%%/lib/junit_license.html
+%%DATADIR%%/lib/junit3.8.2.jar
 %%DATADIR%%/lib/logkit-1.2.jar
+%%DATADIR%%/lib/serializer.jar
 %%DATADIR%%/lib/soap.jar
 %%DATADIR%%/lib/xalan.jar
 %%DATADIR%%/lib/xercesImpl.jar
 %%DATADIR%%/lib/xml-apis.jar
-%%DATADIR%%/lib/xpp3_min-1.1.3.4.I.jar
-%%DATADIR%%/lib/xstream-1.1.3.jar
+%%DATADIR%%/lib/xpp3_min-1.1.3.4.O.jar
+%%DATADIR%%/lib/xstream-1.2.1.jar
 bin/jmeter
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%/extras/JMeter Ant Task_files