3 files changed, 75 insertions, 4 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index 0c5e950b6dab..49855e734f36 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jmeter
-PORTVERSION=	2.0.3
+PORTVERSION=	2.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 99fa33c4f0ff..8524e1336653 100644
--- a/www/jakarta-jmeter/distinfo
+++ b/www/jakarta-jmeter/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-jmeter-2.0.3.tgz) = a3aade2930396168f7a6ae8cb19db6dc
-SIZE (jakarta-jmeter-2.0.3.tgz) = 6852101
+MD5 (jakarta-jmeter-2.1.tgz) = 75a9d335c062329961509d4480f5891a
+SIZE (jakarta-jmeter-2.1.tgz) = 7899500
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jakarta-jmeter/pkg-plist
index 220fe2bee544..f4f320bd6779 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jakarta-jmeter/pkg-plist
@@ -5,6 +5,62 @@
 %%DATADIR%%/bin/jmeter-test.log
 %%DATADIR%%/bin/jmeter.properties
 %%DATADIR%%/bin/jmetertest.properties
+%%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
@@ -15,23 +71,33 @@
 %%DATADIR%%/extras/addons.txt
 %%DATADIR%%/extras/addons.xml
 %%DATADIR%%/extras/ant-jmeter.jar
+%%DATADIR%%/extras/build.xml
 %%DATADIR%%/extras/collapse.jpg
 %%DATADIR%%/extras/eclipse.readme
 %%DATADIR%%/extras/eclipselaunch.txt
 %%DATADIR%%/extras/execcode.bsh
 %%DATADIR%%/extras/expand.jpg
 %%DATADIR%%/extras/jmeter-results-detail-report.xsl
+%%DATADIR%%/extras/jmeter-results-detail-report_21.xsl
 %%DATADIR%%/extras/jmeter-results-report.xsl
+%%DATADIR%%/extras/jmeter-results-report_21.xsl
+%%DATADIR%%/extras/jmeter.fb
 %%DATADIR%%/extras/remote.bsh
 %%DATADIR%%/extras/startup.bsh
+%%DATADIR%%/lib/LICENSE(XPP3).txt
+%%DATADIR%%/lib/LICENSE(XStream).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/commons-collections.jar
 %%DATADIR%%/lib/commons-httpclient-2.0.jar
 %%DATADIR%%/lib/commons-logging.jar
+%%DATADIR%%/lib/excalibur-datasource-1.1.1.jar
+%%DATADIR%%/lib/excalibur-instrument-1.0.jar
 %%DATADIR%%/lib/excalibur-logger-1.1.jar
+%%DATADIR%%/lib/excalibur-pool-1.2.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_components.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_core.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_ftp.jar
@@ -39,12 +105,14 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_http.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_java.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_jdbc.jar
+%%DATADIR%%/lib/ext/ApacheJMeter_jms.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/jakarta-oro-2.0.8.jar
-%%DATADIR%%/lib/jdom-b9.jar
+%%DATADIR%%/lib/jdom-1.0.jar
 %%DATADIR%%/lib/jorphan.jar
 %%DATADIR%%/lib/js.jar
 %%DATADIR%%/lib/js_jar_license(mozilla).html
@@ -55,7 +123,10 @@
 %%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.2.jar
 bin/jmeter
+@dirrm %%DATADIR%%/bin/testfiles
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%/extras/JMeter Ant Task_files
 @dirrm %%DATADIR%%/extras