diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile index 4efff092e83b..4a65b4b0449b 100644 --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -1,86 +1,82 @@ PORTNAME= apache-jmeter PORTVERSION= 2.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www benchmarks java MASTER_SITES= https://archive.apache.org/dist/jmeter/binaries/ MAINTAINER= ports@virtual-estates.net COMMENT= Functional behaviour load and performance test application WWW= https://jmeter.apache.org/ LICENSE= APACHE20 -DEPRECATED= Depends on expiring java/jdom -EXPIRATION_DATE=2025-06-04 - # 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= \ ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ ${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec \ ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \ ${JAVALIBDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \ ${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \ ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/commons-net.jar:net/apache-commons-net \ ${JAVALIBDIR}/httpclient.jar:www/httpclient \ ${JAVALIBDIR}/httpcore.jar:www/httpcore \ ${JAVALIBDIR}/httpmime.jar:www/httpclient \ ${JAVALIBDIR}/jakarta-oro.jar:java/jakarta-oro \ - ${JAVALIBDIR}/jdom.jar:java/jdom \ ${JAVALIBDIR}/junit.jar:java/junit \ ${JAVALIBDIR}/mail.jar:java/javamail \ ${JAVALIBDIR}/serializer.jar:textproc/xalan-j \ ${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \ - ${LOCALBASE}/share/slf4j/slf4j-nop.jar:devel/slf4j \ + ${LOCALBASE}/share/java/slf4j/slf4j-nop.jar:devel/slf4j \ ${JAVALIBDIR}/xalan.jar:textproc/xalan-j \ ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j \ ${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \ ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons \ ${JAVALIBDIR}/xstream.jar:textproc/xstream \ ${LOCALBASE}/share/java/rhino/rhino.jar:lang/rhino USES= java tar:tgz 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= --exclude '*.bat' --exclude '*.cmd' \ ${RUN_DEPENDS:M*.jar*:C|.*/(.+).jar:.*|--exclude '\1-*.jar'|} \ --exclude 'oro-*.jar' OPTIONS_DEFINE= DOCS PORTDOCS= docs printable_docs README LICENSE .include 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 # 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 do-install: cd ${WRKSRC} \ && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}/${DATADIR}/{} \; cd ${WRKSRC} \ && ${FIND} ${DATAFILES} -type f -not -name '*.orig' -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \; cd ${WRKSRC} \ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; cd ${WRKSRC} \ && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; ${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${STAGEDIR}${PREFIX}/bin/jmeter @${LN} -s ${BOOTSTRAP_JARS:C|.*|${JAVAJARDIR}/&.jar|} ${STAGEDIR}${DATADIR}/lib/ .include diff --git a/www/jmeter/pkg-plist b/www/jmeter/pkg-plist index 37918ef1326c..9ada7ba7b500 100644 --- a/www/jmeter/pkg-plist +++ b/www/jmeter/pkg-plist @@ -1,111 +1,112 @@ bin/jmeter %%DATADIR%%/bin/ApacheJMeter.jar %%DATADIR%%/bin/BeanShellAssertion.bshrc %%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/examples/PerformanceTestPlanMemoryThread.jmx %%DATADIR%%/bin/examples/jsp/memory.jsp %%DATADIR%%/bin/hc.parameters %%DATADIR%%/bin/heapdump.sh %%DATADIR%%/bin/httpclient.parameters %%DATADIR%%/bin/jaas.conf %%DATADIR%%/bin/jmeter %%DATADIR%%/bin/jmeter-report %%DATADIR%%/bin/jmeter-server %%DATADIR%%/bin/jmeter.properties %%DATADIR%%/bin/jmeter.sh %%DATADIR%%/bin/krb5.conf %%DATADIR%%/bin/log4j.conf %%DATADIR%%/bin/logkit.xml %%DATADIR%%/bin/mirror-server.sh %%DATADIR%%/bin/saveservice.properties %%DATADIR%%/bin/shutdown.sh %%DATADIR%%/bin/stoptest.sh %%DATADIR%%/bin/system.properties %%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 %%DATADIR%%/bin/upgrade.properties %%DATADIR%%/bin/user.properties %%DATADIR%%/extras/ConvertHTTPSampler.txt %%DATADIR%%/extras/Test.jmx %%DATADIR%%/extras/addons.txt %%DATADIR%%/extras/addons.xml %%DATADIR%%/extras/ant-jmeter-1.1.1.jar %%DATADIR%%/extras/build.xml %%DATADIR%%/extras/collapse.png %%DATADIR%%/extras/convertjmx.fdl %%DATADIR%%/extras/execcode.bsh %%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.sh %%DATADIR%%/extras/remote.bsh %%DATADIR%%/extras/schematic.xml %%DATADIR%%/extras/schematic.xsl %%DATADIR%%/extras/startup.bsh %%DATADIR%%/lib/avalon-framework.jar %%DATADIR%%/lib/bsf-2.4.0.jar %%DATADIR%%/lib/bsh-2.0b5.jar %%DATADIR%%/lib/bshclient.jar %%DATADIR%%/lib/commons-io.jar %%DATADIR%%/lib/commons-jexl-1.1.jar %%DATADIR%%/lib/commons-jexl-2.1.1.jar %%DATADIR%%/lib/commons-lang3-3.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 %%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 %%DATADIR%%/lib/ext/ApacheJMeter_functions.jar %%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_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 %%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/jcharts-0.7.5.jar +%%DATADIR%%/lib/jdom-1.1.3.jar %%DATADIR%%/lib/jodd-core-3.4.10.jar %%DATADIR%%/lib/jodd-lagarto-3.4.10.jar %%DATADIR%%/lib/jorphan.jar %%DATADIR%%/lib/jsoup-1.7.3.jar %%DATADIR%%/lib/jtidy-r938.jar %%DATADIR%%/lib/junit/test.jar %%DATADIR%%/lib/logkit-2.0.jar %%DATADIR%%/lib/mongo-java-driver-2.11.3.jar %%DATADIR%%/lib/rsyntaxtextarea-2.5.1.jar %%DATADIR%%/lib/soap-2.3.1.jar %%DATADIR%%/lib/tika-core-1.4.jar %%DATADIR%%/lib/tika-parsers-1.4.jar %%DATADIR%%/lib/xmlpull-1.1.3.1.jar %%DATADIR%%/lib/xpp3_min-1.1.4c.jar %%DATADIR%%/lib/xstream.jar