- reorg existing JDKs, update devel/jdk dependencies

- become MAINTAINER for jdk 1.1 and 1.2 (ok MAINTAINERs)
- add jdk 1.3

databases/db/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2001/05/05 23:24:50 lebel Exp $
+# $OpenBSD: Makefile,v 1.23 2001/05/08 00:54:36 matt Exp $
 
 COMMENT=	"Berkeley DB package, revision 3"
 
@@ -29,7 +29,7 @@ FLAVOR?=
 
 .if ${FLAVOR:L:Mjava}
 ONLY_FOR_ARCHS=		i386
-BUILD_DEPENDS=		${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk
+BUILD_DEPENDS=		${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk/1.1
 CONFIGURE_ARGS+=	--enable-java
 PORTPATH=		/usr/bin:/bin:/usr/sbin:/sbin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/jdk${JDK_VERSION}/bin
 .endif

devel/blackdown-jdk12/Makefile

@@ -1,40 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2001/04/20 23:14:27 matt Exp $
-
-COMMENT=	"Blackdown's JDK for Java 2"
-
-DISTNAME=	jdk-blackdown-1.2pre2
-CATEGORIES=	devel
-NEED_VERSION=	1.361
-MASTER_SITES=	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.2/i386/pre-v2/glibc2.0/
-
-JDK_VERSION=	1.2
-JDK_PATH=	${PREFIX}/blackdown-jdk${JDK_VERSION}
-
-HOMEPAGE=	http://www.blackdown.org/
-
-MAINTAINER=	openbsd-java@codemonkey.net
-
-RUN_DEPENDS=	${LOCALBASE}/emul/redhat/usr/X11R6/lib/libXp.so.6::emulators/redhat_base
-
-PERMIT_PACKAGE_CDROM=	No
-PERMIT_PACKAGE_FTP=	No
-PERMIT_DISTFILES_CDROM=	No
-PERMIT_DISTFILES_FTP=	No
-
-ONLY_FOR_ARCHS=	i386
-
-NO_BUILD=	Yes
-DISTFILES=	jdk1.2pre-v2.tar.bz2
-WRKDIST= 	${WRKDIR}/jdk${JDK_VERSION}
-
-# Fix permissions in the tarball
-post-extract:
-	@chmod o+r ${WRKSRC}/jre/lib/i386/libsunwjit.so
-	@chmod o+r ${WRKSRC}/jre/lib/fonts/*.ttf
-
-do-install:
-	@${INSTALL_DATA_DIR} ${JDK_PATH}
-	@cp -Rf ${WRKSRC}/* ${JDK_PATH}
-
-.include <bsd.port.mk>
-

devel/jdk/1.1/Makefile

@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.1 2001/05/08 00:54:38 matt Exp $
+
+ONLY_FOR_ARCHS=	i386
+
+COMMENT=	"Java Development Kit for Java 1.1 platform"
+
+DISTNAME=	jdk-1.1.8
+CATEGORIES=	devel
+NEED_VERSION=	1.407
+
+HOMEPAGE=	http://www.freebsd.org/java/
+MAINTAINER=	Matt Behrens <matt@openbsd.org>
+
+PERMIT_PACKAGE_CDROM=	"Redistribution not permitted"
+PERMIT_PACKAGE_FTP=	"Redistribution not permitted"
+PERMIT_DISTFILES_CDROM=	"Redistribution not permitted"
+PERMIT_DISTFILES_FTP=	"Redistribution not permitted"
+
+MASTER_SITES=	ftp://ftp.nuxi.com/pub/FreeBSD/JDK/ \
+		http://ftp7.de.freebsd.org/pub/FreeBSD/JDK/
+DISTFILES=	jdk1.1.8_AOUT.V1999-11-9.tar.gz
+EXTRACT_ONLY=
+
+RUN_DEPENDS=	/emul/freebsd/usr/lib/compat/aout/libc.so.3.1:freebsd_lib->=2.2.8:emulators/freebsd_lib
+
+NO_BUILD=	Yes
+
+pre-install:
+	@${INSTALL_DATA_DIR} ${PREFIX}/jdk1.1.8
+
+do-install:
+.for DISTFILE in ${DISTFILES}
+	tar -C ${PREFIX} -xzf ${DISTDIR}/${DISTFILE}
+.endfor
+
+.include <bsd.port.mk>
+

devel/jdk/1.1/pkg/DESCR

@@ -0,0 +1,9 @@
+The Java Development Kit is a development environment for writing
+applets and applications that conform to the Java 1.1 platform.
+Its compiler and other tools are run from a shell and have no GUI
+interface.  This version includes improvements in functionality,
+performance, and quality over version 1.0.2 of the Java platform,
+including bug fixes since the previous release of the 1.1 platform.
+
+WWW: ${HOMEPAGE}
+

devel/jdk/1.1/pkg/MESSAGE

@@ -2,5 +2,5 @@
 | This software has restrictive licensing terms which prohibit its
 | redistribution.
 |
-| Read ${PREFIX}/blackdown-jdk1.2/LICENSE for more information.
+| Read ${PREFIX}/jdk1.1.8/LICENSE for more information.
 +---------------

devel/jdk/1.1/pkg/PLIST

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/12/06 02:51:35 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.1 2001/05/08 00:54:39 matt Exp $
+@option no-default-conflict
+@pkgcfl jdk-1.1*
 jdk1.1.8/include/freebsd/byteorder_md.h
 jdk1.1.8/include/freebsd/timeval_md.h
 jdk1.1.8/include/freebsd/sysmacros_md.h

devel/jdk/1.2-blackdown/Makefile

@@ -0,0 +1,41 @@
+# $OpenBSD: Makefile,v 1.1 2001/05/08 00:54:39 matt Exp $
+
+ONLY_FOR_ARCHS=	i386
+
+COMMENT=	"Blackdown Java Development Kit for Java 2 platform"
+
+DISTNAME=	jdk-blackdown-1.2pre2
+CATEGORIES=	devel
+NEED_VERSION=	1.407
+
+HOMEPAGE=	http://www.blackdown.org/
+MAINTAINER=	Matt Behrens <matt@openbsd.org>
+
+PERMIT_PACKAGE_CDROM=	"Redistribution not permitted"
+PERMIT_PACKAGE_FTP=	"Redistribution not permitted"
+PERMIT_DISTFILES_CDROM=	"Redistribution not permitted"
+PERMIT_DISTFILES_FTP=	"Redistribution not permitted"
+
+MASTER_SITES=	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.2/i386/pre-v2/glibc2.0/
+DISTFILES=	jdk1.2pre-v2.tar.bz2
+
+RUN_DEPENDS=	${LOCALBASE}/emul/redhat/usr/X11R6/lib/libXp.so.6:redhat_base->=6.2:emulators/redhat_base
+
+NO_BUILD=	Yes
+
+WRKDIST=	${WRKDIR}/jdk1.2
+JDK_HOME=	${PREFIX}/jdk1.2-blackdown
+
+# Fix permissions in the tarball
+post-extract:
+	@chmod o+r ${WRKSRC}/jre/lib/i386/libsunwjit.so
+	@chmod o+r ${WRKSRC}/jre/lib/fonts/*.ttf
+
+pre-install:
+	@${INSTALL_DATA_DIR} ${JDK_HOME}
+
+do-install:
+	@cp -Rf ${WRKSRC}/* ${JDK_HOME}
+
+.include <bsd.port.mk>
+

devel/jdk/1.2-blackdown/patches/patch-bin_.java-wrapper

@@ -1,4 +1,4 @@
-$OpenBSD: patch-bin_.java-wrapper,v 1.1.1.1 2001/02/26 23:50:26 matt Exp $
+$OpenBSD: patch-bin_.java-wrapper,v 1.1 2001/05/08 00:54:39 matt Exp $
 --- bin/.java_wrapper.orig	Thu Dec 28 01:44:45 2000
 +++ bin/.java_wrapper	Thu Dec 28 01:44:56 2000
 @@ -31,8 +31,8 @@

devel/jdk/1.2-blackdown/pkg/MESSAGE

@@ -0,0 +1,6 @@
++---------------
+| This software has restrictive licensing terms which prohibit its
+| redistribution.
+|
+| Read ${PREFIX}/jdk1.2-blackdown/LICENSE for more information.
++---------------

devel/jdk/1.3-linux/Makefile

@@ -0,0 +1,52 @@
+# $OpenBSD: Makefile,v 1.1 2001/05/08 00:54:40 matt Exp $
+
+ONLY_FOR_ARCHS=	i386
+
+COMMENT=	"Java Development Kit for Java 2 Standard Edition 1.3"
+
+DISTNAME=	jdk1.3.0_02
+PKGNAME=	jdk-linux-1.3.0_02
+CATEGORIES=	devel java
+NEED_VERSION=	1.407
+
+HOMEPAGE=	http://java.sun.com/j2se/
+MAINTAINER=	Christian Gruber <christian.edward.gruber@gmx.net>
+
+RUN_DEPENDS=	${PREFIX}/emul/redhat/usr/X11R6/lib/libXp.so.6:redhat_base->=6.2:emulators/redhat_base
+DISTFILES=	j2sdk-1_3_0_02-linux.bin
+EXTRACT_CASES+=	*.bin) \
+		    tail +253 ${DISTDIR}/$$archive > ${WRKDIR}/$$archive && \
+		    chmod u+x ${WRKDIR}/$$archive && \
+		    ${WRKDIR}/$$archive -q ;; \
+
+PERMIT_PACKAGE_CDROM=	"Redistribution not permitted"
+PERMIT_PACKAGE_FTP=	"Redistribution not permitted"
+PERMIT_DISTFILES_CDROM=	"Redistribution not permitted"
+PERMIT_DISTFILES_FTP=	"Redistribution not permitted"
+
+NO_BUILD=	Yes
+
+do-fetch:
+	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
+	   echo "" ; \
+	   echo " You must fetch the distfile for this port manually" ; \
+	   echo " after agreeing to the license agreement at" ; \
+	   echo "" ; \
+	   echo "     http://java.sun.com/j2se/1.3/download-linux.html" ; \
+	   echo "" ; \
+	   echo " Choose the 'GNUZIP Tar shell script' option and place" ; \
+	   echo " ${DISTFILES} into ${DISTDIR}." ; \
+	   echo "" ; \
+           exit 1 ; \
+	fi
+
+JDK_HOME=	${PREFIX}/jdk1.3.0-linux
+
+pre-install:
+	@${INSTALL_DATA_DIR} ${JDK_HOME}
+
+do-install:
+	@cp -Rp ${WRKDIST}/* ${JDK_HOME}
+	
+.include <bsd.port.mk>
+

devel/jdk/1.3-linux/files/md5

@@ -0,0 +1,3 @@
+MD5 (j2sdk-1_3_0_02-linux.bin) = 76acfd9fd2c6a237db8234bb1237fd25
+RMD160 (j2sdk-1_3_0_02-linux.bin) = bf9c632a2b3ee50b32d51a37637452ec13c30935
+SHA1 (j2sdk-1_3_0_02-linux.bin) = 71ed382de5596a345649f10936c0bd837e7743e8

devel/jdk/1.3-linux/patches/patch-bin__java_wrapper

@@ -0,0 +1,14 @@
+$OpenBSD: patch-bin__java_wrapper,v 1.1 2001/05/08 00:54:40 matt Exp $
+--- bin/.java_wrapper.orig	Thu Apr 12 18:47:07 2001
++++ bin/.java_wrapper	Thu Apr 12 18:47:31 2001
+@@ -31,8 +31,8 @@ esac
+ # Resolve symlinks. See 4152645.
+ while [ -L "$PRG" ]; do
+     ls=`/bin/ls -ld "$PRG"`
+-    link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
+-    if /usr/bin/expr "$link" : '/' > /dev/null; then
++    link=`/bin/expr "$ls" : '.*-> \(.*\)$'`
++    if /bin/expr "$link" : '/' > /dev/null; then
+ 	PRG="$link"
+     else
+ 	PRG="`/usr/bin/dirname $PRG`/$link"

devel/jdk/1.3-linux/patches/patch-jre_bin__java_wrapper

@@ -0,0 +1,14 @@
+$OpenBSD: patch-jre_bin__java_wrapper,v 1.1 2001/05/08 00:54:40 matt Exp $
+--- jre/bin/.java_wrapper.orig	Tue Apr 10 14:24:20 2001
++++ jre/bin/.java_wrapper	Tue Apr 10 14:24:25 2001
+@@ -31,8 +31,8 @@ esac
+ # Resolve symlinks. See 4152645.
+ while [ -L "$PRG" ]; do
+     ls=`/bin/ls -ld "$PRG"`
+-    link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
+-    if /usr/bin/expr "$link" : '/' > /dev/null; then
++    link=`/bin/expr "$ls" : '.*-> \(.*\)$'`
++    if /bin/expr "$link" : '/' > /dev/null; then
+ 	PRG="$link"
+     else
+ 	PRG="`/usr/bin/dirname $PRG`/$link"

devel/jdk/1.3-linux/patches/patch-jre_lib_jvm_cfg

@@ -0,0 +1,12 @@
+$OpenBSD: patch-jre_lib_jvm_cfg,v 1.1 2001/05/08 00:54:40 matt Exp $
+--- jre/lib/jvm.cfg.orig	Tue Apr 10 14:22:36 2001
++++ jre/lib/jvm.cfg	Tue Apr 10 14:22:53 2001
+@@ -8,7 +8,7 @@
+ # List of JVMs that can be used as the first option to java, javac, etc.
+ # Order is important -- first in this list is the default JVM.
+ #
++-classic
+ -client
+ -hotspot
+ -server
+--classic

devel/jdk/1.3-linux/pkg/DESCR

@@ -0,0 +1,3 @@
+Sun's Java Development Kit 1.3, running under Linux emulation.
+
+WWW: ${HOMEPAGE}

devel/jdk/1.3-linux/pkg/MESSAGE

@@ -0,0 +1,6 @@
++---------------
+| This software has restrictive licensing terms which prohibit its
+| redistribution.
+|
+| Read ${PREFIX}/jdk1.3.0-linux/LICENSE for more information.
++---------------

devel/jdk/1.3-linux/pkg/SECURITY

@@ -0,0 +1,6 @@
+The 1.3.0_2 binary linux release of the Sun JDK may be
+subject to several security vulnerabilities that we cannot 
+correct.  More information on those as well as other known 
+Java vulnerabilities can be found at:
+<http://java.sun.com/sfaq/chronology.html>.
+

devel/jdk/Makefile

@@ -1,54 +1,7 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/06 00:13:05 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/05/08 00:54:38 matt Exp $
-#
-# See http://www.freebsd.org/java/ for software updates, etc.
 
-COMMENT=	"Sun's Java Developers Kit"
+SUBDIR+= 1.1
+SUBDIR+= 1.2-blackdown
+SUBDIR+= 1.3-linux
 
-DISTNAME=	jdk-${JDK_VERSION}
+.include <bsd.port.subdir.mk>
-CATEGORIES=	devel
-NEED_VERSION=	1.402
-MASTER_SITES=	ftp://ftp.nuxi.com/pub/FreeBSD/JDK/ \
-		http://ftp7.de.freebsd.org/pub/FreeBSD/JDK/
-
-HOMEPAGE=	http://www.freebsd.org/java/
-
-JDK_VERSION=	1.1.8
-JDK_PATH=	${PREFIX}/jdk${JDK_VERSION}
-
-MAINTAINER=	Chris Cappuccio <chris@openbsd.org>
-
-RUN_DEPENDS=	/emul/freebsd/usr/lib/compat/aout/libc.so.3.1::emulators/freebsd_lib
-
-LICENSE_TYPE=		NOFEE
-PERMIT_PACKAGE_CDROM=	No
-PERMIT_PACKAGE_FTP=	No
-PERMIT_DISTFILES_CDROM=	No
-PERMIT_DISTFILES_FTP=	No
-
-ONLY_FOR_ARCHS=	i386
-
-NO_BUILD=	Yes
-EXTRACT_ONLY=
-
-DISTFILES=	jdk${JDK_VERSION}_AOUT.V1999-11-9.tar.gz
-
-pre-install:
-	@${INSTALL_DATA_DIR} ${JDK_PATH}
-
-do-install:
-.for JDKFILE in ${DISTFILES}
-	@tar -C ${PREFIX} -xzf ${DISTDIR}/${JDKFILE}
-.endfor
-#
-# For loop not needed currently.  However, not having it would be incorrect,
-# as additional distfiles could be added.
-
-post-install:
-	@echo
-	@echo "This software has restrictive licensing terms which prohibit" 
-	@echo "its redistribution."
-	@echo 
-	@echo "Read ${JDK_PATH}/LICENSE for more information."
-	@echo
-
-.include <bsd.port.mk>

devel/jdk/pkg/DESCR

@@ -1,12 +0,0 @@
-Binaries of Sun's Java Developers Kit. Include bytecode machine,
-compiler, demos and sources for most Java runtime classes.
-
-Executables are installed into ${PREFIX}/jdk1.1.8/bin (usually
-/usr/local/jdk1.1.8/bin unless you have changed it.) You may want to
-put this into your PATH or symlink them to /usr/local/bin in case you
-don't have kaffe installed (which shares names with many JDK binaries.)
-
-You may want to build a kernel with
-options         SYSVSEM
-
-WWW: ${HOMEPAGE}

devel/jfc/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/06 00:13:06 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/05/08 00:54:36 matt Exp $
 
 COMMENT=	"java foundation classes (jfc)/swing"
 
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.zip
 
 HOMEPAGE=	http://java.sun.com/products/jfc/
 
-RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk
+RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk/1.1
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 

textproc/xerces/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/05/06 04:11:57 lebel Exp $
+# $OpenBSD: Makefile,v 1.7 2001/05/08 00:54:36 matt Exp $
 
 COMMENT=	"xml parser for Java"
 
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=	http://xml.apache.org/dist/xerces-j/
 
-RUN_DEPENDS=    ${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk
+RUN_DEPENDS=    ${LOCALBASE}/jdk${JDK_VERSION}/bin/java::devel/jdk/1.1
 
 NO_BUILD=	Yes
 

www/hotjava/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 04:22:48 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/05/08 00:54:37 matt Exp $
 # $FreeBSD: ports/www/hotjava/Makefile,v 1.4 2000/02/16 00:19:45 mharo Exp $
 
 COMMENT=	"Sun's Hotjava web browser"
@@ -15,8 +15,8 @@ EXTRACT_CASES=*.sfx) uudecode ${FULLDISTDIR}/$$archive;;
 
 HOMEPAGE=	http://java.sun.com/products/hotjava/
 
-BUILD_DEPENDS=	${LOCALBASE}/${JAR}::devel/jdk
+BUILD_DEPENDS=	${LOCALBASE}/${JAR}::devel/jdk/1.1
-RUN_DEPENDS=	${LOCALBASE}/${JAVA}::devel/jdk
+RUN_DEPENDS=	${LOCALBASE}/${JAVA}::devel/jdk/1.1
 
 MAINTAINER=	Chris Cappuccio <chris@openbsd.org>