Make blackdown-j* packages bl3-ready by avoiding to set PREFIX.

Also, add some files to common to make deinstall work cleanly.
And set NO_BUILDLINK, since nothing is built.
Bump PKGREVISION.

4 files changed, 191 insertions, 194 deletions

diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index 65d967b739e..6dec53bc88a 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2003/08/02 19:26:29 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/01 10:56:11 wiz Exp $
 #
 
 BASENAME=	j2re
 DISTNAME=	${EXTNAME}-${BLACKDOWN_ARCH}
 PKGNAME=	blackdown-jre13-1
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Blackdown's Java(tm) Runtime Environment 1.3.1
 
 .if ${MACHINE_ARCH} == "arm"
@@ -21,16 +21,16 @@ PLIST_SRC+=	${PKGDIR}/PLIST.i386
 .endif
 
 USE_PKGINSTALL=	yes
-OWN_DIRS=	${PREFIX}
-OWN_DIRS+=	${PREFIX}/lib
-OWN_DIRS+=	${PREFIX}/lib/${BLACKDOWN_ARCH}
-OWN_DIRS+=	${PREFIX}/lib/applet
-OWN_DIRS+=	${PREFIX}/lib/ext
-OWN_DIRS+=	${PREFIX}/lib/images
-OWN_DIRS+=	${PREFIX}/lib/images/cursors
-OWN_DIRS+=	${PREFIX}/lib/security
-OWN_DIRS+=	${PREFIX}/plugin/${BLACKDOWN_ARCH}
-OWN_DIRS+=	${PREFIX}/plugin
+OWN_DIRS=	${JVM_HOME}
+OWN_DIRS+=	${JVM_HOME}/lib
+OWN_DIRS+=	${JVM_HOME}/lib/${BLACKDOWN_ARCH}
+OWN_DIRS+=	${JVM_HOME}/lib/applet
+OWN_DIRS+=	${JVM_HOME}/lib/ext
+OWN_DIRS+=	${JVM_HOME}/lib/images
+OWN_DIRS+=	${JVM_HOME}/lib/images/cursors
+OWN_DIRS+=	${JVM_HOME}/lib/security
+OWN_DIRS+=	${JVM_HOME}/plugin/${BLACKDOWN_ARCH}
+OWN_DIRS+=	${JVM_HOME}/plugin
 SFILES=		content-types.properties	flavormap.properties
 SFILES+=	font.properties			font.properties.ja
 SFILES+=	font.properties.zh		jvm.cfg
@@ -38,7 +38,7 @@ SFILES+=	images/cursors/cursors.properties	psfont.properties.ja
 SFILES+=	psfontj2d.properties		security/java.security
 SUPPORT_FILES=	# empty
 .for FILE in ${SFILES}
-SUPPORT_FILES+=	${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+SUPPORT_FILES+=	${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
 .endfor
 
 do-configure:
@@ -47,5 +47,3 @@ do-configure:
 	done
 
 .include "../../mk/bsd.pkg.mk"
-
-PREFIX=		${JVM_HOME}
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 4450e7c62fe..0ee834b335c 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/05/05 18:12:11 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/07/01 10:56:11 wiz Exp $
 #
 
 RELVERSION=	1.3.1
@@ -43,10 +43,9 @@ CHECK_SHLIBS=	NO	# This would use NetBSD ldd on Linux shlibs.
 
 .include "../../mk/bsd.prefs.mk"
 
-JVM_HOME=	${LOCALBASE}/java/blackdown-${RELVERSION}
+JVM_HOME=	${PREFIX}/java/blackdown-${RELVERSION}
 
-USE_BUILDLINK3=	yes
-NO_MTREE=	yes	# since we change PREFIX
+NO_BUILDLINK=	yes
 
 PLIST_SUBST+=	BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
 
@@ -68,5 +67,5 @@ post-build:
 	${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
+	${INSTALL_PROGRAM_DIR} ${JVM_HOME}
+	cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
diff --git a/lang/blackdown-jre13/PLIST b/lang/blackdown-jre13/PLIST
index 2f25a8c3e7c..4102fd09017 100644
--- a/lang/blackdown-jre13/PLIST
+++ b/lang/blackdown-jre13/PLIST
@@ -1,163 +1,163 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/29 11:01:02 jlam Exp $
-CHANGES
-COPYRIGHT
-INSTALL
-JavaPluginControlPanel.html
-LICENSE
-README
-bin/.java_wrapper
-bin/JavaPluginControlPanel
-bin/awt_robot
-bin/j2sdk-config
-bin/java
-bin/keytool
-bin/policytool
-bin/realpath
-bin/rmid
-bin/rmiregistry
-bin/tnameserv
-bin/${BLACKDOWN_ARCH}/green_threads/java
-bin/${BLACKDOWN_ARCH}/green_threads/keytool
-bin/${BLACKDOWN_ARCH}/green_threads/policytool
-bin/${BLACKDOWN_ARCH}/green_threads/rmid
-bin/${BLACKDOWN_ARCH}/green_threads/rmiregistry
-bin/${BLACKDOWN_ARCH}/green_threads/tnameserv
-bin/${BLACKDOWN_ARCH}/native_threads/java
-bin/${BLACKDOWN_ARCH}/native_threads/java_vm
-bin/${BLACKDOWN_ARCH}/native_threads/keytool
-bin/${BLACKDOWN_ARCH}/native_threads/policytool
-bin/${BLACKDOWN_ARCH}/native_threads/rmid
-bin/${BLACKDOWN_ARCH}/native_threads/rmiregistry
-bin/${BLACKDOWN_ARCH}/native_threads/tnameserv
-bin/${BLACKDOWN_ARCH}/realpath
-lib/audio/soundbank.gm
-lib/cmm/CIEXYZ.pf
-lib/cmm/GRAY.pf
-lib/cmm/LINEAR_RGB.pf
-lib/cmm/PYCC.pf
-lib/cmm/sRGB.pf
-lib/content-types.properties.default
-lib/flavormap.properties.default
-lib/font.properties.default
-lib/font.properties.ja.default
-lib/font.properties.zh.default
-lib/fonts/LucidaBrightDemiBold.ttf
-lib/fonts/LucidaBrightDemiItalic.ttf
-lib/fonts/LucidaBrightItalic.ttf
-lib/fonts/LucidaBrightRegular.ttf
-lib/fonts/LucidaSansDemiBold.ttf
-lib/fonts/LucidaSansDemiOblique.ttf
-lib/fonts/LucidaSansOblique.ttf
-lib/fonts/LucidaSansRegular.ttf
-lib/fonts/LucidaTypewriterBold.ttf
-lib/fonts/LucidaTypewriterBoldOblique.ttf
-lib/fonts/LucidaTypewriterOblique.ttf
-lib/fonts/LucidaTypewriterRegular.ttf
-lib/fonts/fonts.dir
-lib/i18n.jar
-lib/${BLACKDOWN_ARCH}/classic/Xusage.txt
-lib/${BLACKDOWN_ARCH}/classic/libjvm.so
-lib/${BLACKDOWN_ARCH}/green_threads/libhpi.so
-lib/${BLACKDOWN_ARCH}/libJdbcOdbc.so
-lib/${BLACKDOWN_ARCH}/libawt.so
-lib/${BLACKDOWN_ARCH}/libcmm.so
-lib/${BLACKDOWN_ARCH}/libdcpr.so
-lib/${BLACKDOWN_ARCH}/libfontmanager.so
-lib/${BLACKDOWN_ARCH}/libhprof.so
-lib/${BLACKDOWN_ARCH}/libioser12.so
-lib/${BLACKDOWN_ARCH}/libjava.so
-lib/${BLACKDOWN_ARCH}/libjavaplugin_jni.so
-lib/${BLACKDOWN_ARCH}/libjawt.so
-lib/${BLACKDOWN_ARCH}/libjcov.so
-lib/${BLACKDOWN_ARCH}/libjpeg.so
-lib/${BLACKDOWN_ARCH}/libjsound.so
-lib/${BLACKDOWN_ARCH}/libmlib_image.so
-lib/${BLACKDOWN_ARCH}/libnet.so
-lib/${BLACKDOWN_ARCH}/libpreemptive_close.so
-lib/${BLACKDOWN_ARCH}/libverify.so
-lib/${BLACKDOWN_ARCH}/libzip.so
-lib/${BLACKDOWN_ARCH}/native_threads/libhpi.so
-lib/images/cursors/cursors.properties.default
-lib/images/cursors/invalid32x32.gif
-lib/images/cursors/motif_CopyDrop32x32.gif
-lib/images/cursors/motif_CopyNoDrop32x32.gif
-lib/images/cursors/motif_LinkDrop32x32.gif
-lib/images/cursors/motif_LinkNoDrop32x32.gif
-lib/images/cursors/motif_MoveDrop32x32.gif
-lib/images/cursors/motif_MoveNoDrop32x32.gif
-lib/javaplugin.jar
-lib/jvm.cfg.default
-lib/jvm.hprof.txt
-lib/jvm.jcov.txt
-lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-lib/psfont.properties.ja.default
-lib/psfontj2d.properties.default
-lib/rt.jar
-lib/security/cacerts
-lib/security/java.policy
-lib/security/java.security.default
-lib/sunrsasign.jar
-lib/tzmappings
-man/ja/man1/java.1
-man/ja/man1/keytool.1
-man/ja/man1/rmid.1
-man/ja/man1/rmiregistry.1
-man/ja/man1/tnameserv.1
-man/man1/java.1
-man/man1/keytool.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
-man/man1/tnameserv.1
-plugin/${BLACKDOWN_ARCH}/mozilla/javaplugin_oji.so
-plugin/${BLACKDOWN_ARCH}/netscape6
-@dirrm plugin/${BLACKDOWN_ARCH}/mozilla
-@dirrm man/man1
-@dirrm man/ja/man1
-@dirrm man/ja
-@dirrm man
-@dirrm lib/locale/zh_TW/LC_MESSAGES
-@dirrm lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm lib/locale/zh_TW.BIG5
-@dirrm lib/locale/zh_TW
-@dirrm lib/locale/zh/LC_MESSAGES
-@dirrm lib/locale/zh.GBK/LC_MESSAGES
-@dirrm lib/locale/zh.GBK
-@dirrm lib/locale/zh
-@dirrm lib/locale/sv/LC_MESSAGES
-@dirrm lib/locale/sv
-@dirrm lib/locale/ko/LC_MESSAGES
-@dirrm lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm lib/locale/ko.UTF-8
-@dirrm lib/locale/ko
-@dirrm lib/locale/ja/LC_MESSAGES
-@dirrm lib/locale/ja
-@dirrm lib/locale/it/LC_MESSAGES
-@dirrm lib/locale/it
-@dirrm lib/locale/fr/LC_MESSAGES
-@dirrm lib/locale/fr
-@dirrm lib/locale/es/LC_MESSAGES
-@dirrm lib/locale/es
-@dirrm lib/locale/de/LC_MESSAGES
-@dirrm lib/locale/de
-@dirrm lib/locale
-@dirrm lib/${BLACKDOWN_ARCH}/native_threads
-@dirrm lib/${BLACKDOWN_ARCH}/green_threads
-@dirrm lib/${BLACKDOWN_ARCH}/classic
-@dirrm lib/fonts
-@dirrm lib/cmm
-@dirrm lib/audio
-@dirrm bin/${BLACKDOWN_ARCH}/native_threads
-@dirrm bin/${BLACKDOWN_ARCH}/green_threads
-@dirrm bin/${BLACKDOWN_ARCH}
-@dirrm bin
+@comment $NetBSD: PLIST,v 1.6 2004/07/01 10:56:11 wiz Exp $
+java/blackdown-1.3.1/CHANGES
+java/blackdown-1.3.1/COPYRIGHT
+java/blackdown-1.3.1/INSTALL
+java/blackdown-1.3.1/JavaPluginControlPanel.html
+java/blackdown-1.3.1/LICENSE
+java/blackdown-1.3.1/README
+java/blackdown-1.3.1/bin/.java_wrapper
+java/blackdown-1.3.1/bin/JavaPluginControlPanel
+java/blackdown-1.3.1/bin/awt_robot
+java/blackdown-1.3.1/bin/j2sdk-config
+java/blackdown-1.3.1/bin/java
+java/blackdown-1.3.1/bin/keytool
+java/blackdown-1.3.1/bin/policytool
+java/blackdown-1.3.1/bin/realpath
+java/blackdown-1.3.1/bin/rmid
+java/blackdown-1.3.1/bin/rmiregistry
+java/blackdown-1.3.1/bin/tnameserv
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/java
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/keytool
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/policytool
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/rmid
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/rmiregistry
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/tnameserv
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/java
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/java_vm
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/keytool
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/policytool
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/rmid
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/rmiregistry
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads/tnameserv
+java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/realpath
+java/blackdown-1.3.1/lib/audio/soundbank.gm
+java/blackdown-1.3.1/lib/cmm/CIEXYZ.pf
+java/blackdown-1.3.1/lib/cmm/GRAY.pf
+java/blackdown-1.3.1/lib/cmm/LINEAR_RGB.pf
+java/blackdown-1.3.1/lib/cmm/PYCC.pf
+java/blackdown-1.3.1/lib/cmm/sRGB.pf
+java/blackdown-1.3.1/lib/content-types.properties.default
+java/blackdown-1.3.1/lib/flavormap.properties.default
+java/blackdown-1.3.1/lib/font.properties.default
+java/blackdown-1.3.1/lib/font.properties.ja.default
+java/blackdown-1.3.1/lib/font.properties.zh.default
+java/blackdown-1.3.1/lib/fonts/LucidaBrightDemiBold.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaBrightDemiItalic.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaBrightItalic.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaBrightRegular.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaSansDemiBold.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaSansDemiOblique.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaSansOblique.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaSansRegular.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaTypewriterBold.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaTypewriterBoldOblique.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaTypewriterOblique.ttf
+java/blackdown-1.3.1/lib/fonts/LucidaTypewriterRegular.ttf
+java/blackdown-1.3.1/lib/fonts/fonts.dir
+java/blackdown-1.3.1/lib/i18n.jar
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/classic/Xusage.txt
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/classic/libjvm.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/green_threads/libhpi.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libJdbcOdbc.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libawt.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libcmm.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libdcpr.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libfontmanager.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libhprof.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libioser12.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjava.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjavaplugin_jni.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjawt.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjcov.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjpeg.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libjsound.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libmlib_image.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libnet.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libpreemptive_close.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libverify.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libzip.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/native_threads/libhpi.so
+java/blackdown-1.3.1/lib/images/cursors/cursors.properties.default
+java/blackdown-1.3.1/lib/images/cursors/invalid32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_CopyDrop32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_CopyNoDrop32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_LinkDrop32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_LinkNoDrop32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_MoveDrop32x32.gif
+java/blackdown-1.3.1/lib/images/cursors/motif_MoveNoDrop32x32.gif
+java/blackdown-1.3.1/lib/javaplugin.jar
+java/blackdown-1.3.1/lib/jvm.cfg.default
+java/blackdown-1.3.1/lib/jvm.hprof.txt
+java/blackdown-1.3.1/lib/jvm.jcov.txt
+java/blackdown-1.3.1/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
+java/blackdown-1.3.1/lib/psfont.properties.ja.default
+java/blackdown-1.3.1/lib/psfontj2d.properties.default
+java/blackdown-1.3.1/lib/rt.jar
+java/blackdown-1.3.1/lib/security/cacerts
+java/blackdown-1.3.1/lib/security/java.policy
+java/blackdown-1.3.1/lib/security/java.security.default
+java/blackdown-1.3.1/lib/sunrsasign.jar
+java/blackdown-1.3.1/lib/tzmappings
+java/blackdown-1.3.1/man/ja/man1/java.1
+java/blackdown-1.3.1/man/ja/man1/keytool.1
+java/blackdown-1.3.1/man/ja/man1/rmid.1
+java/blackdown-1.3.1/man/ja/man1/rmiregistry.1
+java/blackdown-1.3.1/man/ja/man1/tnameserv.1
+java/blackdown-1.3.1/man/man1/java.1
+java/blackdown-1.3.1/man/man1/keytool.1
+java/blackdown-1.3.1/man/man1/rmid.1
+java/blackdown-1.3.1/man/man1/rmiregistry.1
+java/blackdown-1.3.1/man/man1/tnameserv.1
+java/blackdown-1.3.1/plugin/${BLACKDOWN_ARCH}/mozilla/javaplugin_oji.so
+java/blackdown-1.3.1/plugin/${BLACKDOWN_ARCH}/netscape6
+@dirrm java/blackdown-1.3.1/plugin/${BLACKDOWN_ARCH}/mozilla
+@dirrm java/blackdown-1.3.1/man/man1
+@dirrm java/blackdown-1.3.1/man/ja/man1
+@dirrm java/blackdown-1.3.1/man/ja
+@dirrm java/blackdown-1.3.1/man
+@dirrm java/blackdown-1.3.1/lib/locale/zh_TW/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/zh_TW.BIG5/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/zh_TW.BIG5
+@dirrm java/blackdown-1.3.1/lib/locale/zh_TW
+@dirrm java/blackdown-1.3.1/lib/locale/zh/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/zh.GBK/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/zh.GBK
+@dirrm java/blackdown-1.3.1/lib/locale/zh
+@dirrm java/blackdown-1.3.1/lib/locale/sv/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/sv
+@dirrm java/blackdown-1.3.1/lib/locale/ko/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/ko.UTF-8/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/ko.UTF-8
+@dirrm java/blackdown-1.3.1/lib/locale/ko
+@dirrm java/blackdown-1.3.1/lib/locale/ja/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/ja
+@dirrm java/blackdown-1.3.1/lib/locale/it/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/it
+@dirrm java/blackdown-1.3.1/lib/locale/fr/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/fr
+@dirrm java/blackdown-1.3.1/lib/locale/es/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/es
+@dirrm java/blackdown-1.3.1/lib/locale/de/LC_MESSAGES
+@dirrm java/blackdown-1.3.1/lib/locale/de
+@dirrm java/blackdown-1.3.1/lib/locale
+@dirrm java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/native_threads
+@dirrm java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/green_threads
+@dirrm java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/classic
+@dirrm java/blackdown-1.3.1/lib/fonts
+@dirrm java/blackdown-1.3.1/lib/cmm
+@dirrm java/blackdown-1.3.1/lib/audio
+@dirrm java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/native_threads
+@dirrm java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads
+@dirrm java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}
+@dirrm java/blackdown-1.3.1/bin
diff --git a/lang/blackdown-jre13/PLIST.i386 b/lang/blackdown-jre13/PLIST.i386
index 2a87cfaad0c..de931827aef 100644
--- a/lang/blackdown-jre13/PLIST.i386
+++ b/lang/blackdown-jre13/PLIST.i386
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2002/11/25 14:07:42 schmonz Exp $
-lib/${BLACKDOWN_ARCH}/client/Xusage.txt
-lib/${BLACKDOWN_ARCH}/client/libjvm.so
-lib/${BLACKDOWN_ARCH}/libsunwjit.so
-lib/${BLACKDOWN_ARCH}/server/Xusage.txt
-lib/${BLACKDOWN_ARCH}/server/libjvm.so
-plugin/${BLACKDOWN_ARCH}/netscape4/javaplugin.so
-@dirrm plugin/${BLACKDOWN_ARCH}/netscape4
-@dirrm lib/${BLACKDOWN_ARCH}/server
-@dirrm lib/${BLACKDOWN_ARCH}/client
+@comment $NetBSD: PLIST.i386,v 1.2 2004/07/01 10:56:11 wiz Exp $
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/client/Xusage.txt
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/client/libjvm.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libsunwjit.so
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/server/Xusage.txt
+java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/server/libjvm.so
+java/blackdown-1.3.1/plugin/${BLACKDOWN_ARCH}/netscape4/javaplugin.so
+@dirrm java/blackdown-1.3.1/plugin/${BLACKDOWN_ARCH}/netscape4
+@dirrm java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/server
+@dirrm java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/client