diff options
| author | nsayer <nsayer@FreeBSD.org> | 2001-05-05 07:17:47 +0800 |
|---|---|---|
| committer | nsayer <nsayer@FreeBSD.org> | 2001-05-05 07:17:47 +0800 |
| commit | 232c2ff1012b5169d3251d1a8d7971d7f5d8e9ca (patch) | |
| tree | 342db056500d8ec171c5d28938ff254b3098e5c3 /net-mgmt | |
| parent | 21811f27b857eb469b7cc71fa29467dfe5188d58 (diff) | |
| download | freebsd-ports-gnome-232c2ff1012b5169d3251d1a8d7971d7f5d8e9ca.tar.gz freebsd-ports-gnome-232c2ff1012b5169d3251d1a8d7971d7f5d8e9ca.tar.zst freebsd-ports-gnome-232c2ff1012b5169d3251d1a8d7971d7f5d8e9ca.zip | |
Make the default installation work. Add an alternative to the shell
script for those who've installed a Java 2 VM. Life will be
exponentially better when we can count on 'javavm -jar foo.jar' just
doing The Right Thing(tm).
Submitted by: dozens of angry scientists
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/airport/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/airport/files/airport | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile index 637e77fc6eb0..c6f4f0040da1 100644 --- a/net-mgmt/airport/Makefile +++ b/net-mgmt/airport/Makefile @@ -32,8 +32,10 @@ do-install: @cd ${WRKSRC}; \ ${MKDIR} ${PREFIX}/share/airport; \ ${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \ - ${SED} -e s,%%PREFIX%%,${PREFIX},g \ + ${SED} \ + -e s,%%PREFIX%%,${PREFIX},g \ -e s/%%JFC_VERSION%%/${JFC_VERSION}/ \ + -e s/%%JDK_VERSION%%/${JDK_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 4e1254dd28bf..5c8303d602b7 100644 --- a/net-mgmt/airport/files/airport +++ b/net-mgmt/airport/files/airport @@ -1,5 +1,9 @@ #! /bin/sh -exec %%PREFIX%%/bin/javavm -cp "%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator +# Use this one for JDK 1.2 and beyond: +# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/airport/AirportBaseStationConfig.jar + +# Use this one for the default installation -- JDK 1.1.x + JFC: +exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator exit 1 |