Update JMeter from 2.5.1 to 2.7 -- the latest at this moment. Re-arrange

the port to depend on JAR-files already provided by other ports, instead
of installing its own (bundled) versions of same.

Rename from "jakarta-jmeter" to simply "jmeter" -- according to Apache
site, Jakarta is no more and all its projects now live on their own.

Take over maintainership.

Approved by:	beat (the previous maintainer)

9 files changed, 110 insertions, 93 deletions

diff --git a/MOVED b/MOVED
index 3f1bffd63667..7c91cce71bb1 100644
--- a/MOVED
+++ b/MOVED
@@ -3713,3 +3713,4 @@ print/pips770||2012-09-22|Removed
 www/linuxpluginwrapper||2012-09-22|Has expired: doesn't support ELF symbol versioning, yet.
 net/fping+ipv6|net/fping|2012-09-24|IPv6 support has been merged
 textproc/aspell-without-dicten|textproc/aspell|2012-09-24|The dictionary is no longer installed with aspell
+www/jakarta-jmeter|www/jmeter|2012-09-25|Former Jakarta projects now live on their own
diff --git a/www/Makefile b/www/Makefile
index f0b7ffa914e4..647ecf73e62e 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -358,7 +358,7 @@
     SUBDIR += interchange
     SUBDIR += ismail
     SUBDIR += iwebcal
-    SUBDIR += jakarta-jmeter
+    SUBDIR += jmeter
     SUBDIR += jawstats
     SUBDIR += jdresolve
     SUBDIR += jericho-html
diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
deleted file mode 100644
index b60fa118dc0d..000000000000
--- a/www/jakarta-jmeter/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	jakarta-jmeter
-# Date created:		12 August 2002
-# Whom:			Ernst de Haan <znerd@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jmeter
-PORTVERSION=	2.5.1
-CATEGORIES=	www benchmarks java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	jmeter/binaries
-PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	beat@FreeBSD.org
-COMMENT=	Functional behaviour load and performance test application
-
-LICENSE=	AL2
-
-USE_JAVA=	yes
-JAVA_VERSION=	1.5+
-NO_BUILD=	yes
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-SUB_FILES=	jmeter.sh
-DATAFILES=	bin extras lib
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	docs printable_docs README LICENSE
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${FIND} ${WRKSRC} -type f \( -name \*.bat -o -name \*.orig -o -name \*.exe -o -name \*.bak \) -delete
-
-do-install:
-	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} \
-	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
-	cd ${WRKSRC} \
-	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.endif
-	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${PREFIX}/bin/jmeter
-
-.include <bsd.port.post.mk>
diff --git a/www/jakarta-jmeter/distinfo b/www/jakarta-jmeter/distinfo
deleted file mode 100644
index 7a5ef7b16076..000000000000
--- a/www/jakarta-jmeter/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jakarta-jmeter-2.5.1.tgz) = 45f786d4b04f61614ec670c9c0a2372f9f3b63b1435f9c747d1399a6c8d62200
-SIZE (jakarta-jmeter-2.5.1.tgz) = 19385302
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
new file mode 100644
index 000000000000..773770a57a62
--- /dev/null
+++ b/www/jmeter/Makefile
@@ -0,0 +1,91 @@
+# New ports collection makefile for:	jakarta-jmeter
+# Date created:		12 August 2002
+# Whom:			Ernst de Haan <znerd@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	apache-jmeter
+PORTVERSION=	2.7
+CATEGORIES=	www benchmarks java
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	jmeter/binaries
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	mi@aldan.algebra.com
+COMMENT=	Functional behaviour load and performance test application
+
+LICENSE=	AL2
+
+# These are JAR-files installed by other ports. The list should keep
+# growing until all Java applications install just their own JARs -- not
+# the 3rd-party ones:
+RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:${PORTSDIR}/java/jaf	\
+		${JAVAJARDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework	\
+		${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec	\
+		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections	\
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient	\
+		${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
+		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang	\
+		${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging	\
+		${JAVAJARDIR}/commons-net.jar:${PORTSDIR}/net/jakarta-commons-net	\
+		${JAVAJARDIR}/httpclient.jar:${PORTSDIR}/www/httpclient	\
+		${JAVAJARDIR}/httpcore.jar:${PORTSDIR}/www/httpcore	\
+		${JAVAJARDIR}/httpmime.jar:${PORTSDIR}/www/httpclient	\
+		${JAVAJARDIR}/jakarta-oro.jar:${PORTSDIR}/java/jakarta-oro	\
+		${JAVAJARDIR}/jdom.jar:${PORTSDIR}/java/jdom	\
+		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit	\
+		${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail	\
+		${JAVAJARDIR}/serializer.jar:${PORTSDIR}/textproc/xalan-j	\
+		${JAVAJARDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j	\
+		${JAVAJARDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j	\
+		${JAVAJARDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j	\
+		${JAVAJARDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons	\
+		${JAVAJARDIR}/xstream.jar:${PORTSDIR}/textproc/xstream	\
+		${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
+NO_BUILD=	yes
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+SUB_FILES=	jmeter.sh
+DATAFILES=	bin extras lib
+# Do not even extract the MS-DOS files nor the JARs,
+# that are already provided by other ports:
+EXTRACT_AFTER_ARGS=	|${TAR} -xpf - --exclude '*.bat' --exclude '*.cmd'	\
+	${RUN_DEPENDS:M*.jar*:C|.*/(.+).jar:.*|--exclude '\1-*.jar'|}	\
+	--exclude 'oro-*.jar'
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	docs printable_docs README LICENSE
+.endif
+
+.include <bsd.port.pre.mk>
+
+do-configure:
+	${PRINTF} '\nuser.classpath=' >> ${WRKSRC}/bin/system.properties
+.for j in ${RUN_DEPENDS:C/:.*//:M*.jar}
+	${PRINTF} '$j:' >> ${WRKSRC}/bin/system.properties
+.endfor
+	${PRINTF} '\n' >> ${WRKSRC}/bin/system.properties
+
+do-install:
+	cd ${WRKSRC} \
+	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
+	cd ${WRKSRC} \
+	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	cd ${WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${PREFIX}/bin/jmeter
+
+# For some reason, it is not enough for these three to simply be listed in
+# jmeter.properties file. JMeter refuses to start, unless they are found in lib/
+BOOTSTRAP_JARS=	avalon-framework xstream commons-io
+post-install:
+	@${LN} -s ${BOOTSTRAP_JARS:C|.*|${JAVAJARDIR}/&.jar|} ${DATADIR}/lib/
+
+.include <bsd.port.post.mk>
diff --git a/www/jmeter/distinfo b/www/jmeter/distinfo
new file mode 100644
index 000000000000..8f6de0320c93
--- /dev/null
+++ b/www/jmeter/distinfo
@@ -0,0 +1,2 @@
+SHA256 (apache-jmeter-2.7.tgz) = 6f25f11c1286050be8eb287715589525b83c55abae3ac8b311df99035f64b6b6
+SIZE (apache-jmeter-2.7.tgz) = 22960750
diff --git a/www/jakarta-jmeter/files/jmeter.sh.in b/www/jmeter/files/jmeter.sh.in
index d8f106d98d8b..d8f106d98d8b 100644
--- a/www/jakarta-jmeter/files/jmeter.sh.in
+++ b/www/jmeter/files/jmeter.sh.in
diff --git a/www/jakarta-jmeter/pkg-descr b/www/jmeter/pkg-descr
index dfd252e74fcb..ab98c7d20628 100644
--- a/www/jakarta-jmeter/pkg-descr
+++ b/www/jmeter/pkg-descr
@@ -12,4 +12,7 @@ types. You can use it to make a graphical analysis of performance
 or to test your server/script/object behavior under heavy
 concurrent load.
 
-WWW:	http://jakarta.apache.org/jmeter/
+In addition to load-testing, the tool can also be used to verify
+correctness of your web-applications.
+
+WWW:	http://jmeter.apache.org/
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jmeter/pkg-plist
index 1d6426ccdef8..db8923fc2dc5 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jmeter/pkg-plist
@@ -10,66 +10,50 @@
 %%DATADIR%%/bin/hc.parameters
 %%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
-%%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
-%%DATADIR%%/bin/stoptest.cmd
 %%DATADIR%%/bin/stoptest.sh
 %%DATADIR%%/bin/system.properties
 %%DATADIR%%/bin/upgrade.properties
 %%DATADIR%%/bin/user.properties
-%%DATADIR%%/bin/users.dtd
-%%DATADIR%%/bin/users.xml
 %%DATADIR%%/extras/ConvertHTTPSampler.txt
 %%DATADIR%%/extras/Test.jmx
 %%DATADIR%%/extras/addons.txt
 %%DATADIR%%/extras/addons.xml
-%%DATADIR%%/extras/ant-jmeter-1.0.9.jar
+%%DATADIR%%/extras/ant-jmeter-1.1.1.jar
 %%DATADIR%%/extras/build.xml
-%%DATADIR%%/extras/collapse.jpg
+%%DATADIR%%/extras/collapse.png
 %%DATADIR%%/extras/convertjmx.fdl
 %%DATADIR%%/extras/execcode.bsh
-%%DATADIR%%/extras/expand.jpg
+%%DATADIR%%/extras/expand.png
 %%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/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/activation-1.1.1.jar
-%%DATADIR%%/lib/avalon-framework-4.1.4.jar
+%%DATADIR%%/lib/avalon-framework.jar
 %%DATADIR%%/lib/bsf-2.4.0.jar
 %%DATADIR%%/lib/bsf-api-3.1.jar
 %%DATADIR%%/lib/bsh-2.0b5.jar
 %%DATADIR%%/lib/bshclient.jar
-%%DATADIR%%/lib/commons-codec-1.5.jar
-%%DATADIR%%/lib/commons-collections-3.2.1.jar
-%%DATADIR%%/lib/commons-httpclient-3.1.jar
-%%DATADIR%%/lib/commons-io-2.0.1.jar
+%%DATADIR%%/lib/commons-io.jar
 %%DATADIR%%/lib/commons-jexl-1.1.jar
-%%DATADIR%%/lib/commons-lang-2.6.jar
-%%DATADIR%%/lib/commons-logging-1.1.1.jar
-%%DATADIR%%/lib/commons-net-3.0.1.jar
+%%DATADIR%%/lib/commons-jexl-2.1.1.jar
+@comment %%DATADIR%%/lib/commons-net-3.0.1.jar
 %%DATADIR%%/lib/excalibur-datasource-1.1.1.jar
 %%DATADIR%%/lib/excalibur-instrument-1.0.jar
 %%DATADIR%%/lib/excalibur-logger-1.1.jar
@@ -86,32 +70,21 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_ldap.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_mail.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_monitors.jar
+%%DATADIR%%/lib/ext/ApacheJMeter_native.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.1.jar
 %%DATADIR%%/lib/htmlparser-2.1.jar
-%%DATADIR%%/lib/httpclient-4.1.2.jar
-%%DATADIR%%/lib/httpcore-4.1.3.jar
-%%DATADIR%%/lib/httpmime-4.1.2.jar
-%%DATADIR%%/lib/jCharts-0.7.5.jar
-%%DATADIR%%/lib/jdom-1.1.jar
+%%DATADIR%%/lib/jcharts-0.7.5.jar
 %%DATADIR%%/lib/jorphan.jar
-%%DATADIR%%/lib/js-1.6R5.jar
 %%DATADIR%%/lib/jtidy-r938.jar
-%%DATADIR%%/lib/junit-4.9.jar
 %%DATADIR%%/lib/junit/test.jar
 %%DATADIR%%/lib/logkit-2.0.jar
-%%DATADIR%%/lib/mail-1.4.4.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/xmlpull-1.1.3.1.jar
 %%DATADIR%%/lib/xpp3_min-1.1.4c.jar
-%%DATADIR%%/lib/xstream-1.3.1.jar
+%%DATADIR%%/lib/xstream.jar
 bin/jmeter
 @dirrm %%DATADIR%%/bin/examples
 @dirrm %%DATADIR%%/bin