new MULTI_PACKAGES

devel/jdk/1.5/Makefile

@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.27 2006/11/17 20:19:33 kurt Exp $
+# $OpenBSD: Makefile,v 1.28 2006/11/22 19:42:54 kurt Exp $
 
 ONLY_FOR_ARCHS= 	amd64 i386
 
-COMMENT=		"Java2(TM) Standard Edition Dev Kit v${V}"
+COMMENT-main=		"Java2(TM) Standard Edition Dev Kit v${V}"
 COMMENT-jre=		"Java2(TM) Standard Edition Runtime Environment v${V}"
 V=			1.5.0
 DISTNAME=		jdk-1_5_0
-PKGNAME=		jdk-${V}p22
-PKGNAME-jre=		jre-${V}p22
+PKGNAME-main=		jdk-${V}p23
+PKGNAME-jre=		jre-${V}p23
 
 CATEGORIES=		devel/jdk java
 
-MULTI_PACKAGES= 	-jre
-SUBPACKAGE?=
+MULTI_PACKAGES= 	-main -jre
 
 # wwws is not a typo in the following:
 HOMEPAGE=		http://wwws.sun.com/software/communitysource/j2se/java2/
@@ -41,9 +40,7 @@ USE_MOTIF=		openmotif
 MODULES=		converters/libiconv
 WANTLIB=		X11 Xext Xi Xp Xt Xtst c m ossaudio pthread stdc++ z
 
-.if defined(PACKAGING) && empty(SUBPACKAGE)
-WANTLIB+=		Xmu
-.endif
+WANTLIB-main=		${WANTLIB} Xmu
 
 USE_X11=		Yes
 USE_GMAKE=		Yes

devel/jdk/1.5/pkg/PFRAG.client_vm-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.client_vm,v 1.1 2006/05/15 18:11:23 ian Exp $
+@comment $OpenBSD: PFRAG.client_vm-main,v 1.1 2006/11/22 19:42:54 kurt Exp $
 ${JDKHOME}/bin/java-rmi.cgi
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/client/Xusage.txt

devel/jdk/1.5/pkg/PFRAG.no-no_web-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.no-no_web,v 1.2 2006/05/26 17:32:21 steven Exp $
+@comment $OpenBSD: PFRAG.no-no_web-main,v 1.1 2006/11/22 19:42:54 kurt Exp $
 ${JDKHOME}/bin/ControlPanel
 ${JDKHOME}/bin/HtmlConverter
 ${JDKHOME}/bin/javaws

devel/jdk/1.5/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/05/26 17:32:21 steven Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/22 19:42:54 kurt Exp $
 @option no-default-conflict
 @conflict jdk->=1.5,<1.6
 @pkgpath devel/jdk/1.5,native_bootstrap