From f122539501d281e392e748e50e0fc5a0ce26821d Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Sat, 27 Jul 2002 21:32:48 +0000
Subject: We allow several JDKs/JREs to coexist, installing them in separate
 subdirectories under ${PREFIX}/java/ -- Change II of many.

Thus, install this jdk in ${PREFIX}/java/jdk-1.1.8, remove
CONFLICTS with other JDKs/JREs and bump PKGREVISION.
---
 lang/jdk/Makefile | 13 +++++--------
 lang/jdk/PLIST    |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'lang/jdk')

diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index bb6c168667e..6e414fc42c0 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2002/03/01 01:58:35 abs Exp $
+# $NetBSD: Makefile,v 1.28 2002/07/27 21:32:48 jschauma Exp $
 #
 
 VERSION=	1.1.8
 PKGNAME=	jdk-${VERSION}
+PKGREVISION=	1
 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}/
@@ -12,15 +13,11 @@ MAINTAINER=     jwise@netbsd.org
 HOMEPAGE=       http://www.quick.com.au/java/
 COMMENT=	Sun's Java(tm) Development Kit
 
-CONFLICTS=	blackdown-j* sun-j*
-
 LICENSE=	jdk-license
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !defined(JDK_HOME)
-JDK_HOME:=	${LOCALBASE}/java
-.endif
+JDK_HOME:=	${LOCALBASE}/java/${PKGNAME}
 MESSAGE_SUBST+=	JDK_HOME=${JDK_HOME}
 
 .if ${OBJECT_FMT} == "ELF"
@@ -66,8 +63,8 @@ pre-install:
 
 do-install:
 	${RM} -f ${WRKSRC}/*.orig
-	${MKDIR} ${JDK_HOME}
-	cd ${WRKSRC} ; ${GTAR} pcf - . | ( cd ${JDK_HOME} ; ${GTAR} pvxf - )
+	${INSTALL_PROGRAM_DIR} ${JDK_HOME}
+	cd ${WRKSRC} && ${PAX} -rw . ${JDK_HOME}
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/jdk/PLIST b/lang/jdk/PLIST
index 39faf5ab5cc..f45763a4d76 100644
--- a/lang/jdk/PLIST
+++ b/lang/jdk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/27 21:32:48 jschauma Exp $
 bin/i386/green_threads/javah_g
 bin/i386/green_threads/javah
 bin/i386/green_threads/java_g
@@ -574,3 +574,4 @@ index.html
 @dirrm bin/i386/green_threads
 @dirrm bin/i386
 @dirrm bin
+@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
-- 
cgit v1.2.3