summaryrefslogtreecommitdiff
path: root/net/flan
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2002-07-24 13:47:36 +0000
committerschmonz <schmonz@pkgsrc.org>2002-07-24 13:47:36 +0000
commit3af1c014c634134882638a90a2125233a794007c (patch)
tree34967353edd7597144ce5f0405afc0477161ac4d /net/flan
parent90b3c14329c1d4213a8b9241ddb84cca210e6bc2 (diff)
downloadpkgsrc-3af1c014c634134882638a90a2125233a794007c.tar.gz
Use ${JAVA_HOME} instead of ${PREFIX}/java (they're not the same
on Darwin). While I'm here, move the WRKSRC definition up to a more visible spot.
Diffstat (limited to 'net/flan')
-rw-r--r--net/flan/Makefile12
-rw-r--r--net/flan/files/flan2
2 files changed, 8 insertions, 6 deletions
diff --git a/net/flan/Makefile b/net/flan/Makefile
index 1dce43f3af2..d73c7ff6f62 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/24 11:59:01 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/24 13:47:36 schmonz Exp $
#
DISTNAME= Flan
@@ -13,9 +13,13 @@ COMMENT= Simulator for IP networks writen in Java
USE_JAVA= yes
USE_GMAKE= yes
+WRKSRC= ${WRKDIR}/src
+
post-build:
- cd ${WRKSRC} ; ${PREFIX}/java/bin/jar cf flan.jar flan/ graphic/
- ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/flan > ${WRKDIR}/flan
+ cd ${WRKSRC} ; ${JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
+ ${SED} -e 's,@JAVA_HOME@,${JAVA_HOME},g' \
+ -e 's,@PREFIX@,${PREFIX},g' \
+ < ${FILESDIR}/flan > ${WRKDIR}/flan
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/java/flan
@@ -25,6 +29,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/flan.jar ${PREFIX}/lib/java/flan
${INSTALL_SCRIPT} ${WRKDIR}/flan ${PREFIX}/bin
-WRKSRC= ${WRKDIR}/src
-
.include "../../mk/bsd.pkg.mk"
diff --git a/net/flan/files/flan b/net/flan/files/flan
index 6e0b559af6f..d642b4f1c35 100644
--- a/net/flan/files/flan
+++ b/net/flan/files/flan
@@ -1 +1 @@
-@PREFIX@/java/bin/java -classpath $CLASSPATH:@PREFIX@/lib/java/flan/flan.jar:@PREFIX@/lib/java/flan/crimson.jar:@PREFIX@/lib/java/flan/xalan2.jar:@PREFIX@/lib/java/flan/xmlcode.jar flan.frontend.Interface
+@JAVA_HOME@/bin/java -classpath $CLASSPATH:@PREFIX@/lib/java/flan/flan.jar:@PREFIX@/lib/java/flan/crimson.jar:@PREFIX@/lib/java/flan/xalan2.jar:@PREFIX@/lib/java/flan/xmlcode.jar flan.frontend.Interface