aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sayer <nsayer@FreeBSD.org>2001-03-07 14:29:56 +0000
committerNick Sayer <nsayer@FreeBSD.org>2001-03-07 14:29:56 +0000
commita340fa575526bd9c4358d0ffad430ef998eff1b2 (patch)
tree416c3e7acde44e626961c1ac3d1dd1c187950905
parentb9f89f3c6b8bb0b17a030c40e773db12e5cc0ffe (diff)
downloadports-a340fa575526bd9c4358d0ffad430ef998eff1b2.tar.gz
ports-a340fa575526bd9c4358d0ffad430ef998eff1b2.zip
Notes
-rw-r--r--net-mgmt/airport/Makefile4
-rw-r--r--net-mgmt/airport/files/airport2
-rw-r--r--net/airport/Makefile4
-rw-r--r--net/airport/files/airport2
4 files changed, 6 insertions, 6 deletions
diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile
index 4d93c63305ff..c5abef19c06c 100644
--- a/net-mgmt/airport/Makefile
+++ b/net-mgmt/airport/Makefile
@@ -14,7 +14,8 @@ DISTFILES= configurator_13${EXTRACT_SUFX}
MAINTAINER= nsayer@freebsd.org
RUN_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \
- ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc
+ ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc \
+ ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
USE_ZIP= YES
@@ -32,7 +33,6 @@ do-install:
${MKDIR} ${PREFIX}/share/airport; \
${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \
${SED} -e s,%%PREFIX%%,${PREFIX},g \
- -e s/%%JDK_VERSION%%/${JDK_VERSION}/ \
-e s/%%JFC_VERSION%%/${JFC_VERSION}/ \
< ${FILESDIR}/airport > ${PREFIX}/bin/airport; \
${CHMOD} a+x ${PREFIX}/bin/airport
diff --git a/net-mgmt/airport/files/airport b/net-mgmt/airport/files/airport
index 54381a2c1299..4e1254dd28bf 100644
--- a/net-mgmt/airport/files/airport
+++ b/net-mgmt/airport/files/airport
@@ -1,5 +1,5 @@
#! /bin/sh
-exec %%PREFIX%%/jdk%%JDK_VERSION%%/bin/jre -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
+exec %%PREFIX%%/bin/javavm -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
exit 1
diff --git a/net/airport/Makefile b/net/airport/Makefile
index 4d93c63305ff..c5abef19c06c 100644
--- a/net/airport/Makefile
+++ b/net/airport/Makefile
@@ -14,7 +14,8 @@ DISTFILES= configurator_13${EXTRACT_SUFX}
MAINTAINER= nsayer@freebsd.org
RUN_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \
- ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc
+ ${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swingall.jar:${PORTSDIR}/java/jfc \
+ ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
USE_ZIP= YES
@@ -32,7 +33,6 @@ do-install:
${MKDIR} ${PREFIX}/share/airport; \
${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \
${SED} -e s,%%PREFIX%%,${PREFIX},g \
- -e s/%%JDK_VERSION%%/${JDK_VERSION}/ \
-e s/%%JFC_VERSION%%/${JFC_VERSION}/ \
< ${FILESDIR}/airport > ${PREFIX}/bin/airport; \
${CHMOD} a+x ${PREFIX}/bin/airport
diff --git a/net/airport/files/airport b/net/airport/files/airport
index 54381a2c1299..4e1254dd28bf 100644
--- a/net/airport/files/airport
+++ b/net/airport/files/airport
@@ -1,5 +1,5 @@
#! /bin/sh
-exec %%PREFIX%%/jdk%%JDK_VERSION%%/bin/jre -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
+exec %%PREFIX%%/bin/javavm -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
exit 1