Add staging support, fix-up plist.

PR:		ports/190207
Submitted by:	Joseph Benden

While here, upgrade from 2.9 to 2.11.

3 files changed, 37 insertions, 12 deletions

diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 8e2b1d812065..2122433384d7 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache-jmeter
-PORTVERSION=	2.9
+PORTVERSION=	2.11
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	jmeter/binaries
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 
 # These are JAR-files installed by other ports. The list should keep
 # growing until all Java applications install just their own JARs -- not
-NO_STAGE=	yes
 # the 3rd-party ones:
 RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:${PORTSDIR}/java/jaf	\
 		${JAVAJARDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework	\
@@ -34,6 +33,8 @@ RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:${PORTSDIR}/java/jaf	\
 		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit	\
 		${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail	\
 		${JAVAJARDIR}/serializer.jar:${PORTSDIR}/textproc/xalan-j	\
+		${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j	\
+		${JAVAJARDIR}/slf4j-nop.jar:${PORTSDIR}/devel/slf4j	\
 		${JAVAJARDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j	\
 		${JAVAJARDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j	\
 		${JAVAJARDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j	\
@@ -68,21 +69,21 @@ do-configure:
 
 do-install:
 	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
+	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}/${DATADIR}/{} \;
 	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type f -not -name '*.orig' -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	  && ${FIND} ${DATAFILES} -type f -not -name '*.orig' -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} \
-	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
 	cd ${WRKSRC} \
-	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 .endif
-	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${PREFIX}/bin/jmeter
+	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${STAGEDIR}${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/
+	@${LN} -s ${BOOTSTRAP_JARS:C|.*|${JAVAJARDIR}/&.jar|} ${STAGEDIR}${DATADIR}/lib/
 
 .include <bsd.port.post.mk>
diff --git a/www/jmeter/distinfo b/www/jmeter/distinfo
index eb3ed7949f3f..3e0e23a2b4a7 100644
--- a/www/jmeter/distinfo
+++ b/www/jmeter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-jmeter-2.9.tgz) = d10291719abf1868cec382087195b29a04e13925ac4ce3329627551092fd2393
-SIZE (apache-jmeter-2.9.tgz) = 26306521
+SHA256 (apache-jmeter-2.11.tgz) = 84a4edefea3a829aa54ac3dd17570b9ba8daa75d5438f6bc378b596c00d723bb
+SIZE (apache-jmeter-2.11.tgz) = 29489945
diff --git a/www/jmeter/pkg-plist b/www/jmeter/pkg-plist
index 43589caed60c..c2a5f8a5438b 100644
--- a/www/jmeter/pkg-plist
+++ b/www/jmeter/pkg-plist
@@ -1,3 +1,16 @@
+%%DATADIR%%/bin/templates/BeanShellSampler.jmx
+%%DATADIR%%/bin/templates/build-adv-web-test-plan.jmx
+%%DATADIR%%/bin/templates/build-ftp-test-plan.jmx
+%%DATADIR%%/bin/templates/build-ldap-ext-test-plan.jmx
+%%DATADIR%%/bin/templates/build-ldap-test-plan.jmx
+%%DATADIR%%/bin/templates/build-web-test-plan.jmx
+%%DATADIR%%/bin/templates/build-webservice-test-plan.jmx
+%%DATADIR%%/bin/templates/jdbc.jmx
+%%DATADIR%%/bin/templates/mongodb.jmx
+%%DATADIR%%/bin/templates/recording.jmx
+%%DATADIR%%/bin/templates/templates.dtd
+%%DATADIR%%/bin/templates/templates.xml
+@dirrm %%DATADIR%%/bin/templates
 %%DATADIR%%/bin/ApacheJMeter.jar
 %%DATADIR%%/bin/BeanShellAssertion.bshrc
 %%DATADIR%%/bin/BeanShellFunction.bshrc
@@ -14,10 +27,11 @@
 %%DATADIR%%/bin/jmeter-server
 %%DATADIR%%/bin/jmeter.properties
 %%DATADIR%%/bin/jmeter.sh
+%%DATADIR%%/bin/jaas.conf
+%%DATADIR%%/bin/krb5.conf
 %%DATADIR%%/bin/log4j.conf
 %%DATADIR%%/bin/logkit.xml
 %%DATADIR%%/bin/mirror-server.sh
-%%DATADIR%%/bin/proxyserver.jks
 %%DATADIR%%/bin/saveservice.properties
 %%DATADIR%%/bin/shutdown.sh
 %%DATADIR%%/bin/stoptest.sh
@@ -47,13 +61,14 @@
 %%DATADIR%%/extras/startup.bsh
 %%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-io.jar
 %%DATADIR%%/lib/commons-lang3-3.1.jar
 %%DATADIR%%/lib/commons-jexl-1.1.jar
 %%DATADIR%%/lib/commons-jexl-2.1.1.jar
+%%DATADIR%%/lib/mongo-java-driver-2.11.3.jar
+%%DATADIR%%/lib/rsyntaxtextarea-2.5.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
@@ -70,6 +85,7 @@
 %%DATADIR%%/lib/ext/ApacheJMeter_junit.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_ldap.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_mail.jar
+%%DATADIR%%/lib/ext/ApacheJMeter_mongodb.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_monitors.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_native.jar
 %%DATADIR%%/lib/ext/ApacheJMeter_report.jar
@@ -87,6 +103,14 @@
 %%DATADIR%%/lib/xpp3_min-1.1.4c.jar
 %%DATADIR%%/lib/xstream.jar
 bin/jmeter
+%%DATADIR%%/bin/examples/PerformanceTestPlanMemoryThread.jmx
+%%DATADIR%%/bin/examples/jsp/memory.jsp
+%%DATADIR%%/lib/jodd-core-3.4.10.jar
+%%DATADIR%%/lib/jodd-lagarto-3.4.10.jar
+%%DATADIR%%/lib/jsoup-1.7.3.jar
+%%DATADIR%%/lib/tika-core-1.4.jar
+%%DATADIR%%/lib/tika-parsers-1.4.jar
+@dirrmtry %%DATADIR%%/bin/examples/jsp
 @dirrm %%DATADIR%%/bin/examples
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%/extras