3 files changed, 13 insertions, 61 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index 49855e734f36..532f260a1c37 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jmeter
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	jmeter/binaries
diff --git a/www/jakarta-jmeter/distinfo b/www/jakarta-jmeter/distinfo
index 867498272521..4427f52952ce 100644
--- a/www/jakarta-jmeter/distinfo
+++ b/www/jakarta-jmeter/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakarta-jmeter-2.1.tgz) = 75a9d335c062329961509d4480f5891a
-SHA256 (jakarta-jmeter-2.1.tgz) = 0635037cfad74e93d47f822f59035b4c3cf1b850aecd19a541c10d42e173559d
-SIZE (jakarta-jmeter-2.1.tgz) = 7899500
+MD5 (jakarta-jmeter-2.1.1.tgz) = 115e967bec28b4c3c72c96dd06702f9f
+SHA256 (jakarta-jmeter-2.1.1.tgz) = 19f4ec886420933046fa80fe117dcfc32fbcf5a48739eb2e1ff3fdfd0cab433e
+SIZE (jakarta-jmeter-2.1.1.tgz) = 8491541
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jakarta-jmeter/pkg-plist
index f4f320bd6779..fb17770b943c 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jakarta-jmeter/pkg-plist
@@ -1,66 +1,14 @@
 @comment $FreeBSD$
 %%DATADIR%%/bin/ApacheJMeter.jar
+%%DATADIR%%/bin/BeanShellAssertion.bshrc
+%%DATADIR%%/bin/BeanShellFunction.bshrc
+%%DATADIR%%/bin/BeanShellSampler.bshrc
 %%DATADIR%%/bin/jmeter
 %%DATADIR%%/bin/jmeter-server
-%%DATADIR%%/bin/jmeter-test.log
 %%DATADIR%%/bin/jmeter.properties
 %%DATADIR%%/bin/jmetertest.properties
+%%DATADIR%%/bin/logkit.xml
 %%DATADIR%%/bin/saveservice.properties
-%%DATADIR%%/bin/testfiles/AssertionTestPlan.jmx
-%%DATADIR%%/bin/testfiles/AuthManagerTestPlan.jmx
-%%DATADIR%%/bin/testfiles/BeanShellTest.bsh
-%%DATADIR%%/bin/testfiles/GuiTest.jmx
-%%DATADIR%%/bin/testfiles/GuiTest_2.jmx
-%%DATADIR%%/bin/testfiles/HTMLParserTestCase.all
-%%DATADIR%%/bin/testfiles/HTMLParserTestCase.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCase.set
-%%DATADIR%%/bin/testfiles/HTMLParserTestCase2.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCase3.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseFrames.all
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseFrames.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseFrames.set
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseWithBaseHRef.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseWithComments.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestCaseWithMissingBaseHRef.html
-%%DATADIR%%/bin/testfiles/HTMLParserTestFrames.all
-%%DATADIR%%/bin/testfiles/HTMLParserTestFrames.html
-%%DATADIR%%/bin/testfiles/HTMLScript.all
-%%DATADIR%%/bin/testfiles/HTMLScript.html
-%%DATADIR%%/bin/testfiles/HTMLScript.set
-%%DATADIR%%/bin/testfiles/HeaderManagerTestPlan.jmx
-%%DATADIR%%/bin/testfiles/IfTest.jmx
-%%DATADIR%%/bin/testfiles/InterleaveTestPlan.jmx
-%%DATADIR%%/bin/testfiles/InterleaveTestPlan2.jmx
-%%DATADIR%%/bin/testfiles/Load_JMeter_Page.jmx
-%%DATADIR%%/bin/testfiles/LoopTestPlan.jmx
-%%DATADIR%%/bin/testfiles/Modification Manager.jmx
-%%DATADIR%%/bin/testfiles/OnceOnlyTestPlan.jmx
-%%DATADIR%%/bin/testfiles/ProxyServerTestPlan.jmx
-%%DATADIR%%/bin/testfiles/RenderTreeTest.jmx
-%%DATADIR%%/bin/testfiles/SFFTest1.txt
-%%DATADIR%%/bin/testfiles/SFFTest2.txt
-%%DATADIR%%/bin/testfiles/SFFTest3.txt
-%%DATADIR%%/bin/testfiles/SimpleTestPlan.jmx
-%%DATADIR%%/bin/testfiles/Test Plan.jmx
-%%DATADIR%%/bin/testfiles/Test Plan_out.jmx
-%%DATADIR%%/bin/testfiles/TestAuth.txt
-%%DATADIR%%/bin/testfiles/TestDisable.jmx
-%%DATADIR%%/bin/testfiles/URLRewritingExample.jmx
-%%DATADIR%%/bin/testfiles/XMLSchema-fail.xsd
-%%DATADIR%%/bin/testfiles/XMLSchema-pass.xsd
-%%DATADIR%%/bin/testfiles/XMLSchematest.xml
-%%DATADIR%%/bin/testfiles/assertion.jmx
-%%DATADIR%%/bin/testfiles/configurationTest.xml
-%%DATADIR%%/bin/testfiles/jmeter_home_page.html
-%%DATADIR%%/bin/testfiles/jmeter_home_page_with_base_href.html
-%%DATADIR%%/bin/testfiles/jmeter_home_page_with_relative_links.html
-%%DATADIR%%/bin/testfiles/load_bug_list.jmx
-%%DATADIR%%/bin/testfiles/proxy.jmx
-%%DATADIR%%/bin/testfiles/test.csv
-%%DATADIR%%/bin/testfiles/test.tsv
-%%DATADIR%%/bin/testfiles/test_config.xml
-%%DATADIR%%/bin/testfiles/testblank.csv
-%%DATADIR%%/bin/testfiles/testempty.csv
 %%DATADIR%%/bin/upgrade.properties
 %%DATADIR%%/bin/users.dtd
 %%DATADIR%%/bin/users.xml
@@ -86,6 +34,7 @@
 %%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
@@ -106,16 +55,19 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_java.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_jdbc.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_jms.jar
+%%DATADIR%%/lib/ext/ApacheJMeter_junit.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_ldap.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_mail.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_monitors.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_tcp.jar
 %%DATADIR%%/lib/htmlparser.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/junit/test.jar
 %%DATADIR%%/lib/junit.jar
 %%DATADIR%%/lib/junit_license.html
 %%DATADIR%%/lib/logkit-1.2.jar
@@ -126,10 +78,10 @@
 %%DATADIR%%/lib/xpp3_min-1.1.3.4.I.jar
 %%DATADIR%%/lib/xstream-1.1.2.jar
 bin/jmeter
-@dirrm %%DATADIR%%/bin/testfiles
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%/extras/JMeter Ant Task_files
 @dirrm %%DATADIR%%/extras
 @dirrm %%DATADIR%%/lib/ext
+@dirrm %%DATADIR%%/lib/junit
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%