Bump PKGREVISION of lang/jdk to 3: we use bsd.pkg.install.mk to handle

copying of config files and handling of directories.

3 files changed, 52 insertions, 32 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index a2995ae8f1b..3525dc66b33 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1310 2003/02/03 20:29:19 drochner Exp $
+$NetBSD: CHANGES,v 1.1311 2003/02/03 23:49:05 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -542,3 +542,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated htmllint to 20030203 [jschauma 2003-02-03]
 	Updated Xft2 to 2.1nb3 [wiz 2003-02-03]
 	Updated ap2-perl to 1.99.8 [drochner 2003-02-03]
+	Updated jdk to 1.1.8nb3 [jlam 2003-02-03]
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 81cd30d5dfb..763a59cd564 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2002/10/13 07:48:52 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2003/02/03 23:48:07 jlam Exp $
 #
 
 VERSION=	1.1.8
 PKGNAME=	jdk-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 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}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://www.quick.com.au/java/
 COMMENT=	Sun's Java(tm) Development Kit
 
 LICENSE=	jdk-license
@@ -32,9 +31,10 @@ PLIST_SRC+=	${PKGDIR}/PLIST
 
 CHECK_SHLIBS=	no
 
-USE_BUILDLINK2=	# defined
-NO_BUILD=	# defined
-NO_MTREE=	# defined, since we change PREFIX below
+USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
+NO_BUILD=	yes
+NO_MTREE=	yes	# since we change PREFIX below
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86
 RESTRICTED=	"No redistribution of the Java(tm) Development Kit"
@@ -43,6 +43,28 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+OWN_DIRS=	${PREFIX} ${PREFIX}/lib ${PREFIX}/lib/security
+SFILES=		appletviewer.properties		awt.properties
+SFILES+=	content-types.properties	font.properties
+SFILES+=	font.properties.ISO8859_15_FDIS	font.properties.cs
+SFILES+=	font.properties.el		font.properties.hu
+SFILES+=	font.properties.ja		font.properties.ko
+SFILES+=	font.properties.lt		font.properties.lv
+SFILES+=	font.properties.pl		font.properties.ru
+SFILES+=	font.properties.tr		font.properties.zh_EUC_CN
+SFILES+=	font.properties.zh_TW_Big5	font.properties.zh_TW_EUC_TW
+SFILES+=	psfont.properties.ja		serialver.properties
+SFILES+=	security/java.security
+SUPPORT_FILES=	# empty
+.for FILE in ${SFILES}
+SUPPORT_FILES+=	${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+.endfor
+
+do-configure:
+	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
+		${MV} -f $$file $$file.default;				\
+	done
+
 .if ${OBJECT_FMT} == "ELF"
 # This gross hack normalizes the shlib names so that automatic
 # shared library handling will work.
diff --git a/lang/jdk/PLIST b/lang/jdk/PLIST
index 6d3e40f4aad..27ddd92ef7d 100644
--- a/lang/jdk/PLIST
+++ b/lang/jdk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/13 07:48:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/03 23:48:08 jlam Exp $
 CHANGES
 COPYRIGHT
 LICENSE
@@ -463,33 +463,32 @@ include/verify.h
 include/wrap.h
 include/zip.h
 index.html
-lib/appletviewer.properties
-lib/awt.properties
+lib/appletviewer.properties.default
+lib/awt.properties.default
 lib/classes.zip
-lib/content-types.properties
-lib/font.properties
-lib/font.properties.ISO8859_15_FDIS
-lib/font.properties.cs
-lib/font.properties.el
-lib/font.properties.hu
-lib/font.properties.ja
-lib/font.properties.ko
-lib/font.properties.lt
-lib/font.properties.lv
-lib/font.properties.pl
-lib/font.properties.ru
-lib/font.properties.tr
-lib/font.properties.zh_EUC_CN
-lib/font.properties.zh_TW_Big5
-lib/font.properties.zh_TW_EUC_TW
+lib/content-types.properties.default
+lib/font.properties.default
+lib/font.properties.ISO8859_15_FDIS.default
+lib/font.properties.cs.default
+lib/font.properties.el.default
+lib/font.properties.hu.default
+lib/font.properties.ja.default
+lib/font.properties.ko.default
+lib/font.properties.lt.default
+lib/font.properties.lv.default
+lib/font.properties.pl.default
+lib/font.properties.ru.default
+lib/font.properties.tr.default
+lib/font.properties.zh_EUC_CN.default
+lib/font.properties.zh_TW_Big5.default
+lib/font.properties.zh_TW_EUC_TW.default
 lib/locale/ja/app-defaults/XApplication
 lib/locale/ja_JP.PCK/app-defaults/XApplication
 lib/locale/ja_JP.UTF-8/app-defaults/XApplication
-lib/psfont.properties.ja
-lib/security/java.security
-lib/serialver.properties
+lib/psfont.properties.ja.default
+lib/security/java.security.default
+lib/serialver.properties.default
 src.zip
-@dirrm lib/security
 @dirrm lib/locale/ja_JP.UTF-8/app-defaults
 @dirrm lib/locale/ja_JP.UTF-8
 @dirrm lib/locale/ja_JP.PCK/app-defaults
@@ -499,7 +498,6 @@ src.zip
 @dirrm lib/locale
 @dirrm lib/i386/green_threads
 @dirrm lib/i386
-@dirrm lib
 @dirrm include/netbsd
 @dirrm include/green_threads/include
 @dirrm include/green_threads
@@ -574,4 +572,3 @@ src.zip
 @dirrm bin/i386/green_threads
 @dirrm bin/i386
 @dirrm bin
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}