From 30d00c3cf8fd192f0833d80589ce4e90fb40aa58 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 11 Feb 2003 04:23:14 +0000 Subject: Bump PKGREVISIONs for: lang/blackdown-jdk13 lang/jdk lang/sun-jdk13 lang/sun-jdk14 Create a symlink from ${JAVA_HOME} to ${JAVA_HOME}/jre so that the proper JDK hierarchy is found. This addresses PR 20269 by Todd Vierling . This makes misc/openoffice-linux find the Java2 installation again. --- lang/jdk/Makefile | 5 +++-- lang/jdk/PLIST | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lang/jdk') diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 763a59cd564..ebda1cfa8eb 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2003/02/03 23:48:07 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2003/02/11 04:23:14 jlam Exp $ # VERSION= 1.1.8 PKGNAME= jdk-${VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/java/i386/${VERSION}/ \ ftp://ftp.de.netbsd.org/pub/NetBSD/misc/java/i386/${VERSION}/ @@ -81,6 +81,7 @@ pre-install: ${LN} -s $$X.${VERSION} $$X; \ fi ; \ done) + ${LN} -sf . ${WRKSRC}/jre .endif do-install: diff --git a/lang/jdk/PLIST b/lang/jdk/PLIST index 27ddd92ef7d..24319eaddd9 100644 --- a/lang/jdk/PLIST +++ b/lang/jdk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/02/03 23:48:08 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/02/11 04:23:14 jlam Exp $ CHANGES COPYRIGHT LICENSE @@ -463,6 +463,8 @@ include/verify.h include/wrap.h include/zip.h index.html +@exec ${LN} -sf . %D/jre +@unexec ${RM} -f %D/jre lib/appletviewer.properties.default lib/awt.properties.default lib/classes.zip -- cgit v1.2.3