diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-03-06 00:38:48 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-03-06 00:38:48 +0000 |
| commit | 4021f1476f566246e90b5620c99aee525b7b13ab (patch) | |
| tree | 8620d2a461a7d298e0e3165a43ef5054bb0b431e /java | |
| parent | Update to 1.2. (diff) | |
Fix javaws launcher. This shell script now uses bash extensions.
Notes
Notes:
svn path=/head/; revision=292789
Diffstat (limited to 'java')
| -rw-r--r-- | java/icedtea-web/Makefile | 6 | ||||
| -rw-r--r-- | java/icedtea-web/files/patch-launcher-javaws.in | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index dba5f76d357e..a6b260159566 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -7,6 +7,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://icedtea.classpath.org/download/source/ @@ -37,6 +38,7 @@ PORTDOCS= netx BUILD_DEPENDS+= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config +RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash CONFIGURE_ARGS+=--with-ecj=no --with-jdk-home="${JAVA_HOME}" @@ -79,6 +81,10 @@ BUILD_DEPENDS+= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit CONFIGURE_ARGS+=--with-junit=no .endif +post-patch: + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/launcher/javaws.in + pre-extract: @${ECHO_MSG} @${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option" diff --git a/java/icedtea-web/files/patch-launcher-javaws.in b/java/icedtea-web/files/patch-launcher-javaws.in index 171d66c8c019..a8917295168b 100644 --- a/java/icedtea-web/files/patch-launcher-javaws.in +++ b/java/icedtea-web/files/patch-launcher-javaws.in @@ -1,6 +1,11 @@ ---- launcher/javaws.in.orig 2011-06-08 15:42:40.284750000 -0400 -+++ launcher/javaws.in 2011-07-12 14:12:11.000000000 -0400 -@@ -5,7 +5,7 @@ +--- launcher/javaws.in.orig 2012-03-05 11:04:20.493026000 -0500 ++++ launcher/javaws.in 2012-03-05 19:04:39.000000000 -0500 +@@ -1,11 +1,11 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + + JAVA=@JAVA@ + LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m CLASSNAME=net.sourceforge.jnlp.runtime.Boot BINARY_LOCATION=@JAVAWS_BIN_LOCATION@ @@ -8,4 +13,4 @@ +PROGRAM_NAME=itweb-javaws CP=@JRE@/lib/rt.jar - JAVA_ARGS= + JAVA_ARGS=( ) |