Using literal script in files/jmeter instead of patch.

Bumped PORTREVISION.

3 files changed, 11 insertions, 11 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index ba80b2341728..5eccf254597e 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jmeter
 PORTVERSION=	1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-jmeter/release/v${PORTVERSION}/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -24,7 +24,9 @@ APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
-REPLACE_FILES=	${WRKSRC}/bin/jmeter
+REPLACE_FILES=	${FILESDIR}/jmeter
+
+.include <bsd.port.pre.mk>
 
 post-patch:
 	@${ECHO_CMD} -n ">> Removing unneeded files..."
@@ -58,7 +60,7 @@ do-install:
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Creating symlink ${PREFIX}/bin/jmeter..."
-	@${LN} -s ${APP_HOME}/bin/jmeter ${PREFIX}/bin/jmeter
+	@${LN} -sf ${APP_HOME}/bin/jmeter ${PREFIX}/bin/jmeter
 	@${ECHO_CMD} " [ DONE ]"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/jakarta-jmeter/files/jmeter b/www/jakarta-jmeter/files/jmeter
new file mode 100644
index 000000000000..a267203a0eb7
--- /dev/null
+++ b/www/jakarta-jmeter/files/jmeter
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+%%JAVA%% -jar %%APP_HOME%%/bin/ApacheJMeter.jar "$@"
diff --git a/www/jakarta-jmeter/files/patch-aa b/www/jakarta-jmeter/files/patch-aa
deleted file mode 100644
index 106f8b32afa6..000000000000
--- a/www/jakarta-jmeter/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- bin/jmeter.old	Wed Nov 13 11:03:46 2002
-+++ bin/jmeter	Wed Nov 13 11:04:14 2002
-@@ -1,3 +1,3 @@
- #! /bin/sh
- 
--java -Xincgc -jar `dirname $0`/ApacheJMeter.jar "$@"
-+%%JAVA%% -jar %%APP_HOME%%/bin/ApacheJMeter.jar "$@"