diff options
| author | abs <abs@pkgsrc.org> | 2001-09-14 10:19:10 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2001-09-14 10:19:10 +0000 |
| commit | 159880625f3cc54f77b04c2a8f64f6eda40c6896 (patch) | |
| tree | e37627a64f0fb4a0fb147078c03780913906ba5e | |
| parent | eb13e77ecd29bd2e00f6ebe97bfe9e518bbdadb0 (diff) | |
| download | pkgsrc-159880625f3cc54f77b04c2a8f64f6eda40c6896.tar.gz | |
Install ${PREFIX}/java/bin/java in jre rather than jdk. Now JAVA_HOME can
be set to ${PREFIX}/java and runtime jre and buildtime jdk both work
| -rw-r--r-- | lang/sun-jdk13/pkg/PLIST | 4 | ||||
| -rw-r--r-- | lang/sun-jre13/Makefile | 8 | ||||
| -rwxr-xr-x | lang/sun-jre13/files/wrap.sh | 3 | ||||
| -rw-r--r-- | lang/sun-jre13/pkg/PLIST | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/lang/sun-jdk13/pkg/PLIST b/lang/sun-jdk13/pkg/PLIST index 65ccd6d313b..f7d909e1739 100644 --- a/lang/sun-jdk13/pkg/PLIST +++ b/lang/sun-jdk13/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/06/12 16:31:46 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/09/14 10:19:10 abs Exp $ COPYRIGHT LICENSE LICENSE.fr @@ -59,7 +59,6 @@ bin/i386/realpath bin/idlj bin/jar bin/jarsigner -bin/java bin/java-rmi.cgi bin/javac bin/javadoc @@ -773,4 +772,3 @@ src.jar @dirrm bin/i386/native_threads @dirrm bin/i386/green_threads @dirrm bin/i386 -@dirrm bin diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index c0b282a8859..dd1d5812eb7 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/08/14 17:23:47 abs Exp $ +# $NetBSD: Makefile,v 1.15 2001/09/14 10:19:11 abs Exp $ # # MASTER_SITES is very special, and must end in "=": @@ -37,7 +37,6 @@ DEPENDS+= suse_x11-*:../../emulators/suse_x11 JDK_HOME:= ${LOCALBASE}/java .endif -NO_BUILD= yes # since we change PREFIX: NO_MTREE= yes @@ -50,10 +49,15 @@ post-fetch: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +do-build: + ${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/wrap.sh >${WRKDIR}/java + # This is ugly. The chown should happen after copying, or tar should have # a way to override permissions. do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX} ${PREFIX}/jre + ${INSTALL_PROGRAM_DIR} ${PREFIX} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/java ${PREFIX}/bin/java ${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC} ${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX}/jre -xpf- diff --git a/lang/sun-jre13/files/wrap.sh b/lang/sun-jre13/files/wrap.sh new file mode 100755 index 00000000000..904b72c6f53 --- /dev/null +++ b/lang/sun-jre13/files/wrap.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# $NetBSD: wrap.sh,v 1.1 2001/09/14 10:19:11 abs Exp $ +exec @PREFIX@/jre/bin/java $@ diff --git a/lang/sun-jre13/pkg/PLIST b/lang/sun-jre13/pkg/PLIST index c61334bc83b..9151678dcc4 100644 --- a/lang/sun-jre13/pkg/PLIST +++ b/lang/sun-jre13/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2001/06/12 16:31:47 skrll Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/09/14 10:19:11 abs Exp $ +bin/java jre/CHANGES jre/COPYRIGHT jre/ControlPanel.html @@ -199,3 +200,4 @@ jre/plugin/i386/ns600/libjavaplugin_oji.so @dirrm jre/bin/i386 @dirrm jre/bin @dirrm jre +@dirrm bin |