Attachment 143072 Details for Bug 190207 – file.diff

[patch] file.diff

file.diff (text/plain), 2.73 KB, created by joe on 2014-05-25 20:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-25 20:00:00 UTC

Size: 2.73 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 190207: 143072