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
<tv at pobox dot com>.  This makes misc/openoffice-linux find the Java2
installation again.

8 files changed, 24 insertions, 11 deletions

diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile
index 04dff4efb96..139a06864f3 100644
--- a/lang/blackdown-jdk13/Makefile
+++ b/lang/blackdown-jdk13/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2003/01/29 11:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/02/11 04:23:15 jlam Exp $
 #
 
 BASENAME=	j2sdk
 DISTNAME=	${EXTNAME}-${BLACKDOWN_ARCH}
 PKGNAME=	blackdown-jdk13-1
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Linux port of the Blackdown Java(tm) Runtime Environment
 
 DEPENDS=	blackdown-jre13>=1:../../lang/blackdown-jre13
@@ -28,6 +28,7 @@ post-extract:
 			${RM} -f $$i;					\
 		fi;							\
 	done
+	${LN} -sf . ${WRKSRC}/jre
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/blackdown-jdk13/PLIST b/lang/blackdown-jdk13/PLIST
index 315f1a6e350..ae49350794c 100644
--- a/lang/blackdown-jdk13/PLIST
+++ b/lang/blackdown-jdk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/29 11:02:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/02/11 04:23:15 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/${BLACKDOWN_ARCH}/green_threads/appletviewer
@@ -594,6 +594,8 @@ include/jvmdi.h
 include/jvmpi.h
 include/linux/jawt_md.h
 include/linux/jni_md.h
+@exec	${LN} -sf . %D/jre
+@unexec	${RM} -f %D/jre
 lib/dt.jar
 lib/htmlconverter.jar
 lib/${BLACKDOWN_ARCH}/libdt_socket.so
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
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 55bb80dc6c2..3fca34fa168 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2003/02/09 16:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/02/11 04:23:15 jlam Exp $
 
 DISTNAME=	j2sdk-1_3_1_07-linux-i586
 PKGNAME=	sun-jdk13-1.0.7
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/jdk1.3.1_07
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
-DEPENDS=	sun-jre13>=1.0.7:../../lang/sun-jre13
+DEPENDS=	sun-jre13>=1.0.7nb1:../../lang/sun-jre13
 
 # Remove parts that are in common with the JRE.
 #
@@ -20,6 +21,7 @@ post-extract:
 			${RM} -f $$i;					\
 		fi;							\
 	done
+	${LN} -sf . ${WRKSRC}/jre
 
 _FETCH_MESSAGE= \
 	${ECHO} "======================================================================"; \
diff --git a/lang/sun-jdk13/PLIST b/lang/sun-jdk13/PLIST
index 12fb7e0ce1d..d645fa837d8 100644
--- a/lang/sun-jdk13/PLIST
+++ b/lang/sun-jdk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/29 11:10:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/11 04:23:15 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/appletviewer
@@ -578,6 +578,8 @@ include/jvmdi.h
 include/jvmpi.h
 include/linux/jawt_md.h
 include/linux/jni_md.h
+@exec	${LN} -sf . %D/jre
+@unexec	${RM} -f %D/jre
 lib/dt.jar
 lib/htmlconverter.jar
 lib/i386/libdt_socket.so
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index bc74ead67d4..ff904dde755 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/29 11:13:28 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/11 04:23:15 jlam Exp $
 
 DISTNAME=	j2sdk-1_4_1_01-linux-i586
 PKGNAME=	sun-jdk14-1.0.1
@@ -20,6 +20,7 @@ post-extract:
 			${RM} -f $$i;					\
 		fi;							\
 	done
+	${LN} -sf . ${WRKSRC}/jre
 
 _FETCH_MESSAGE= \
 	${ECHO} "======================================================================"; \
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index a01672c8207..c3febeec8a2 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/29 11:13:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/11 04:23:15 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/appletviewer
@@ -876,6 +876,8 @@ include/jvmdi.h
 include/jvmpi.h
 include/linux/jawt_md.h
 include/linux/jni_md.h
+@exec	${LN} -sf . %D/jre
+@unexec	${RM} -f %D/jre
 lib/dt.jar
 lib/htmlconverter.jar
 lib/ir.idl