Date: Sun, 25 May 2014 18:50:04 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190207: [patch] Add staging support to www/jmeter Message-ID: <201405251850.s4PIo4e5016135@cgiserv.freebsd.org> Resent-Message-ID: <201405251900.s4PJ001K053162@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190207
>Category: ports
>Synopsis: [patch] Add staging support to www/jmeter
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 25 19:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Joseph Benden
>Release: FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support to www/jmeter.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 8e2b1d8..eb5c9b9 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -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 \
@@ -68,21 +67,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/pkg-plist b/www/jmeter/pkg-plist
index 43589ca..676a63e 100644
--- a/www/jmeter/pkg-plist
+++ b/www/jmeter/pkg-plist
@@ -47,7 +47,6 @@
%%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
@@ -87,6 +86,15 @@
%%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.1.jar
+%%DATADIR%%/lib/jodd-lagarto-3.4.1.jar
+%%DATADIR%%/lib/jsoup-1.7.1.jar
+%%DATADIR%%/lib/slf4j-api-1.7.2.jar
+%%DATADIR%%/lib/tika-core-1.3.jar
+%%DATADIR%%/lib/tika-parsers-1.3.jar
+@dirrmtry %%DATADIR%%/bin/examples/jsp
@dirrm %%DATADIR%%/bin/examples
@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%/extras
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405251850.s4PIo4e5016135>