From d3fbad8b8396113be36421dcbe86df3031a8a6d0 Mon Sep 17 00:00:00 2001
From: kurt <kurt@openbsd.org>
Date: Wed, 22 Nov 2006 19:42:54 +0000
Subject: [PATCH] new MULTI_PACKAGES

---
 devel/jdk/1.5/Makefile                            | 15 ++++++---------
 devel/jdk/1.5/pkg/{DESCR => DESCR-main}           |  0
 devel/jdk/1.5/pkg/{MESSAGE => MESSAGE-main}       |  0
 .../pkg/{PFRAG.client_vm => PFRAG.client_vm-main} |  2 +-
 .../pkg/{PFRAG.no-no_web => PFRAG.no-no_web-main} |  2 +-
 devel/jdk/1.5/pkg/{PLIST => PLIST-main}           |  2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename devel/jdk/1.5/pkg/{DESCR => DESCR-main} (100%)
 rename devel/jdk/1.5/pkg/{MESSAGE => MESSAGE-main} (100%)
 rename devel/jdk/1.5/pkg/{PFRAG.client_vm => PFRAG.client_vm-main} (81%)
 rename devel/jdk/1.5/pkg/{PFRAG.no-no_web => PFRAG.no-no_web-main} (99%)
 rename devel/jdk/1.5/pkg/{PLIST => PLIST-main} (99%)

diff --git a/devel/jdk/1.5/Makefile b/devel/jdk/1.5/Makefile
index 0dcb82b93ce..2914cb62f09 100644
--- a/devel/jdk/1.5/Makefile
+++ b/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
diff --git a/devel/jdk/1.5/pkg/DESCR b/devel/jdk/1.5/pkg/DESCR-main
similarity index 100%
rename from devel/jdk/1.5/pkg/DESCR
rename to devel/jdk/1.5/pkg/DESCR-main
diff --git a/devel/jdk/1.5/pkg/MESSAGE b/devel/jdk/1.5/pkg/MESSAGE-main
similarity index 100%
rename from devel/jdk/1.5/pkg/MESSAGE
rename to devel/jdk/1.5/pkg/MESSAGE-main
diff --git a/devel/jdk/1.5/pkg/PFRAG.client_vm b/devel/jdk/1.5/pkg/PFRAG.client_vm-main
similarity index 81%
rename from devel/jdk/1.5/pkg/PFRAG.client_vm
rename to devel/jdk/1.5/pkg/PFRAG.client_vm-main
index 239664953a1..0977f17f98a 100644
--- a/devel/jdk/1.5/pkg/PFRAG.client_vm
+++ b/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
diff --git a/devel/jdk/1.5/pkg/PFRAG.no-no_web b/devel/jdk/1.5/pkg/PFRAG.no-no_web-main
similarity index 99%
rename from devel/jdk/1.5/pkg/PFRAG.no-no_web
rename to devel/jdk/1.5/pkg/PFRAG.no-no_web-main
index 57c06722f45..4b0ca9a5bd1 100644
--- a/devel/jdk/1.5/pkg/PFRAG.no-no_web
+++ b/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
diff --git a/devel/jdk/1.5/pkg/PLIST b/devel/jdk/1.5/pkg/PLIST-main
similarity index 99%
rename from devel/jdk/1.5/pkg/PLIST
rename to devel/jdk/1.5/pkg/PLIST-main
index 5c58bfb1f87..2178f678b89 100644
--- a/devel/jdk/1.5/pkg/PLIST
+++ b/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