- Update to 2.4

- Add LICENSE information

Reported by:	portscout

3 files changed, 33 insertions, 24 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index a5aeddf66b58..fc5b16f43772 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jmeter
-PORTVERSION=	2.3.4
+PORTVERSION=	2.4
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	jmeter/binaries
@@ -17,8 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Functional behaviour load and performance test application
 
+LICENSE=	ASL
+
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	jmeter.sh
diff --git a/www/jakarta-jmeter/distinfo b/www/jakarta-jmeter/distinfo
index e18508bc7e0f..797dcc97a935 100644
--- a/www/jakarta-jmeter/distinfo
+++ b/www/jakarta-jmeter/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakarta-jmeter-2.3.4.tgz) = cef24a84bcfc814f9b5b1f7b6a8f389f
-SHA256 (jakarta-jmeter-2.3.4.tgz) = dc88d13646dc75891dd41e1b5d9665a362d6bde0d30d0f0392877aa10bb66d6f
-SIZE (jakarta-jmeter-2.3.4.tgz) = 16720805
+MD5 (jakarta-jmeter-2.4.tgz) = 01ac101b161643a77267baec99b3acfe
+SHA256 (jakarta-jmeter-2.4.tgz) = e94a8409e3d837053eefd115f23b1a9a2ae22c63289f1d92b62df85ceb85ecf1
+SIZE (jakarta-jmeter-2.4.tgz) = 18288518
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jakarta-jmeter/pkg-plist
index a3ab93121c0f..dfc2630f7b18 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jakarta-jmeter/pkg-plist
@@ -4,20 +4,24 @@
 %%DATADIR%%/bin/BeanShellFunction.bshrc
 %%DATADIR%%/bin/BeanShellListeners.bshrc
 %%DATADIR%%/bin/BeanShellSampler.bshrc
+%%DATADIR%%/bin/examples/CSVSample.jmx
+%%DATADIR%%/bin/examples/CSVSample_actions.csv
+%%DATADIR%%/bin/examples/CSVSample_user.csv
 %%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/mirror-server.cmd
-%%DATADIR%%/bin/mirror-server.sh
 %%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
+%%DATADIR%%/bin/mirror-server.cmd
+%%DATADIR%%/bin/mirror-server.sh
+%%DATADIR%%/bin/proxyserver.jks
 %%DATADIR%%/bin/saveservice.properties
 %%DATADIR%%/bin/shutdown.cmd
 %%DATADIR%%/bin/shutdown.sh
@@ -28,9 +32,6 @@
 %%DATADIR%%/bin/user.properties
 %%DATADIR%%/bin/users.dtd
 %%DATADIR%%/bin/users.xml
-%%DATADIR%%/bin/examples/CSVSample.jmx
-%%DATADIR%%/bin/examples/CSVSample_actions.csv
-%%DATADIR%%/bin/examples/CSVSample_user.csv
 %%DATADIR%%/extras/ConvertHTTPSampler.txt
 %%DATADIR%%/extras/Test.jmx
 %%DATADIR%%/extras/addons.txt
@@ -47,18 +48,21 @@
 %%DATADIR%%/extras/jmeter-results-report_21.xsl
 %%DATADIR%%/extras/jmeter.fb
 %%DATADIR%%/extras/printvars.bsh
+%%DATADIR%%/extras/proxycert.cmd
+%%DATADIR%%/extras/proxycert.sh
 %%DATADIR%%/extras/remote.bsh
 %%DATADIR%%/extras/schematic.cmd
 %%DATADIR%%/extras/schematic.xml
 %%DATADIR%%/extras/schematic.xsl
 %%DATADIR%%/extras/startup.bsh
-%%DATADIR%%/lib/Tidy.jar
+%%DATADIR%%/lib/activation-1.1.1.jar
 %%DATADIR%%/lib/avalon-framework-4.1.4.jar
 %%DATADIR%%/lib/bsf-2.4.0.jar
-%%DATADIR%%/lib/bsh-2.0b4.jar
+%%DATADIR%%/lib/bsf-api-3.1.jar
+%%DATADIR%%/lib/bsh-2.0b5.jar
 %%DATADIR%%/lib/bshclient.jar
-%%DATADIR%%/lib/commons-codec-1.3.jar
-%%DATADIR%%/lib/commons-collections-3.2.jar
+%%DATADIR%%/lib/commons-codec-1.4.jar
+%%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/lib/commons-io-1.4.jar
 %%DATADIR%%/lib/commons-jexl-1.1.jar
@@ -83,23 +87,26 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_monitors.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_report.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_tcp.jar
+%%DATADIR%%/lib/geronimo-jms_1.1_spec-1.1.1.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.1.jar
 %%DATADIR%%/lib/jorphan.jar
-%%DATADIR%%/lib/js_rhino1_6R5.jar
+%%DATADIR%%/lib/js-1.6R5.jar
+%%DATADIR%%/lib/jtidy-r938.jar
+%%DATADIR%%/lib/junit-4.8.1.jar
 %%DATADIR%%/lib/junit/test.jar
-%%DATADIR%%/lib/junit3.8.2.jar
-%%DATADIR%%/lib/logkit-1.2.jar
-%%DATADIR%%/lib/serializer-2_9_1.jar
-%%DATADIR%%/lib/soap.jar
-%%DATADIR%%/lib/xalan_2_7_1.jar
-%%DATADIR%%/lib/xercesImpl-2_9_1.jar
-%%DATADIR%%/lib/xml-apis-2_9_1.jar
-%%DATADIR%%/lib/xpp3_min-1.1.4c.jar
+%%DATADIR%%/lib/logkit-2.0.jar
+%%DATADIR%%/lib/mail-1.4.3.jar
+%%DATADIR%%/lib/oro-2.0.8.jar
+%%DATADIR%%/lib/serializer-2.7.1.jar
+%%DATADIR%%/lib/soap-2.3.1.jar
+%%DATADIR%%/lib/xalan-2.7.1.jar
+%%DATADIR%%/lib/xercesImpl-2.9.1.jar
+%%DATADIR%%/lib/xml-apis-1.3.04.jar
 %%DATADIR%%/lib/xmlgraphics-commons-1.3.1.jar
+%%DATADIR%%/lib/xpp3_min-1.1.4c.jar
 %%DATADIR%%/lib/xstream-1.3.1.jar
 bin/jmeter
 @dirrm %%DATADIR%%/bin/examples