- move PLIST elements not found on powerpc to PLIST.i386

- include bsd.pkg.mk explicitly, rather than in Makefile.common
- replace dependency on linuxppc_lib with suse_base to get a
    sufficiently recent glibc
- teach the remaining two usages of `uname -m` output about our
    various powerpc platforms

This makes the Blackdown JRE finally work on powerpc again.

Note that suse_base requires a Linux kernel version >= 2.2.
NetBSD-current's COMPAT_LINUX reports itself as 2.4.18 by default
on i386 and powerpc. On NetBSD/powerpc 1.6, you'll need to override
the default value of the "emul.linux.kern.osrelease" sysctl. On
NetBSD < 1.6, you can try setting the sysctl, but the emulation
may be insufficient to run this software properly.

Also note that on powerpc, you must specify the "-green" option,
because the Classic VM hangs.

8 files changed, 55 insertions, 199 deletions

diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index ee24fd99f95..f2009710d6e 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/11/23 19:56:08 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/25 14:07:42 schmonz Exp $
 #
 
 BASENAME=	j2re
@@ -10,12 +10,15 @@ COMMENT=	Blackdown's Java(tm) Runtime Environment 1.3.1
 DISTNAME=	${BASENAME}-RC1-linux-arm
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
-PLIST_SRC=	${.CURDIR}/PLIST.powerpc
-.endif
+.include "../../lang/blackdown-jre13/Makefile.common"
 
 ONLY_FOR_PLATFORM+=	NetBSD-*-arm Linux-*-arm
 
-.include "../../lang/blackdown-jre13/Makefile.common"
+PLIST_SRC=	${PKGDIR}/PLIST
+.if ${BLACKDOWN_ARCH} == "i386"
+PLIST_SRC+=	${PKGDIR}/PLIST.i386
+.endif
+
+.include "../../mk/bsd.pkg.mk"
 
 PREFIX=		${JVM_HOME}
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 5a6819f7f92..2f4df6c96d3 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2002/11/07 18:20:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/11/25 14:07:42 schmonz Exp $
 #
 
 RELVERSION=	1.3.1
@@ -26,7 +26,7 @@ BLACKDOWN_ARCH?=	${MACHINE_ARCH}
 BLACKDOWN_REL=	rc1
 EXTRACT_SUFX=	.tar.bz2
 .elif ${BLACKDOWN_ARCH} == "ppc"
-DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
+DEPENDS+=	suse_base>=7.3:../../emulators/suse_base
 .endif
 
 MAINTAINER=	jschauma@netbsd.org
@@ -75,5 +75,3 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}
 	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/blackdown-jre13/PLIST b/lang/blackdown-jre13/PLIST
index 19f73ccdc7b..653acd77390 100644
--- a/lang/blackdown-jre13/PLIST
+++ b/lang/blackdown-jre13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/13 07:41:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/25 14:07:42 schmonz Exp $
 CHANGES
 COPYRIGHT
 INSTALL
@@ -57,8 +57,6 @@ lib/fonts/fonts.dir
 lib/i18n.jar
 lib/${BLACKDOWN_ARCH}/classic/Xusage.txt
 lib/${BLACKDOWN_ARCH}/classic/libjvm.so
-lib/${BLACKDOWN_ARCH}/client/Xusage.txt
-lib/${BLACKDOWN_ARCH}/client/libjvm.so
 lib/${BLACKDOWN_ARCH}/green_threads/libhpi.so
 lib/${BLACKDOWN_ARCH}/libJdbcOdbc.so
 lib/${BLACKDOWN_ARCH}/libawt.so
@@ -76,12 +74,9 @@ 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}/libsunwjit.so
 lib/${BLACKDOWN_ARCH}/libverify.so
 lib/${BLACKDOWN_ARCH}/libzip.so
 lib/${BLACKDOWN_ARCH}/native_threads/libhpi.so
-lib/${BLACKDOWN_ARCH}/server/Xusage.txt
-lib/${BLACKDOWN_ARCH}/server/libjvm.so
 lib/images/cursors/cursors.properties
 lib/images/cursors/invalid32x32.gif
 lib/images/cursors/motif_CopyDrop32x32.gif
@@ -125,9 +120,7 @@ man/man1/rmid.1
 man/man1/rmiregistry.1
 man/man1/tnameserv.1
 plugin/${BLACKDOWN_ARCH}/mozilla/javaplugin_oji.so
-plugin/${BLACKDOWN_ARCH}/netscape4/javaplugin.so
 plugin/${BLACKDOWN_ARCH}/netscape6
-@dirrm plugin/${BLACKDOWN_ARCH}/netscape4
 @dirrm plugin/${BLACKDOWN_ARCH}/mozilla
 @dirrm plugin/${BLACKDOWN_ARCH}
 @dirrm plugin
@@ -163,22 +156,19 @@ plugin/${BLACKDOWN_ARCH}/netscape6
 @dirrm lib/locale
 @dirrm lib/images/cursors
 @dirrm lib/images
-@dirrm lib/${BLACKDOWN_ARCH}/server
 @dirrm lib/${BLACKDOWN_ARCH}/native_threads
 @dirrm lib/${BLACKDOWN_ARCH}/green_threads
-@dirrm lib/${BLACKDOWN_ARCH}/client
 @dirrm lib/${BLACKDOWN_ARCH}/classic
 @dirrm lib/${BLACKDOWN_ARCH}
 @dirrm lib/fonts
 @exec ${MKDIR} %D/lib/ext
-@unexec ${RMDIR} -p %D/lib/ext 2>/dev/null || ${TRUE}
+@dirrm lib/ext
 @dirrm lib/cmm
 @dirrm lib/audio
 @exec ${MKDIR} %D/lib/applet
-@unexec ${RMDIR} -p %D/lib/applet 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/lib 2>/dev/null || ${TRUE}
+@dirrm lib/applet
+@dirrm lib
 @dirrm bin/${BLACKDOWN_ARCH}/native_threads
 @dirrm bin/${BLACKDOWN_ARCH}/green_threads
 @dirrm bin/${BLACKDOWN_ARCH}
 @dirrm bin
-@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
diff --git a/lang/blackdown-jre13/PLIST.i386 b/lang/blackdown-jre13/PLIST.i386
new file mode 100644
index 00000000000..2a87cfaad0c
--- /dev/null
+++ b/lang/blackdown-jre13/PLIST.i386
@@ -0,0 +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
diff --git a/lang/blackdown-jre13/PLIST.powerpc b/lang/blackdown-jre13/PLIST.powerpc
deleted file mode 100644
index 2317d0690da..00000000000
--- a/lang/blackdown-jre13/PLIST.powerpc
+++ /dev/null
@@ -1,175 +0,0 @@
-@comment $NetBSD: PLIST.powerpc,v 1.1 2002/11/23 19:56:08 wiz Exp $
-CHANGES
-COPYRIGHT
-INSTALL
-JavaPluginControlPanel.html
-LICENSE
-README
-bin/.java_wrapper
-bin/JavaPluginControlPanel
-bin/awt_robot
-bin/java
-bin/keytool
-bin/policytool
-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
-bin/j2sdk-config
-bin/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
-lib/flavormap.properties
-lib/font.properties
-lib/font.properties.ja
-lib/font.properties.zh
-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
-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
-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
-lib/psfontj2d.properties
-lib/rt.jar
-lib/security/cacerts
-lib/security/java.policy
-lib/security/java.security
-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 plugin/${BLACKDOWN_ARCH}
-@dirrm plugin
-@dirrm man/man1
-@dirrm man/ja/man1
-@dirrm man/ja
-@dirrm man
-@dirrm lib/security
-@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/images/cursors
-@dirrm lib/images
-@dirrm lib/${BLACKDOWN_ARCH}/native_threads
-@dirrm lib/${BLACKDOWN_ARCH}/green_threads
-@dirrm lib/${BLACKDOWN_ARCH}/classic
-@dirrm lib/${BLACKDOWN_ARCH}
-@dirrm lib/fonts
-@exec ${MKDIR} %D/lib/ext
-@unexec ${RMDIR} -p %D/lib/ext 2>/dev/null || ${TRUE}
-@dirrm lib/cmm
-@dirrm lib/audio
-@exec ${MKDIR} %D/lib/applet
-@unexec ${RMDIR} -p %D/lib/applet 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/lib 2>/dev/null || ${TRUE}
-@dirrm bin/${BLACKDOWN_ARCH}/native_threads
-@dirrm bin/${BLACKDOWN_ARCH}/green_threads
-@dirrm bin/${BLACKDOWN_ARCH}
-@dirrm bin
-@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
diff --git a/lang/blackdown-jre13/distinfo b/lang/blackdown-jre13/distinfo
index e4cf4a6bc3f..1712ab1384c 100644
--- a/lang/blackdown-jre13/distinfo
+++ b/lang/blackdown-jre13/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/09/08 09:59:52 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2002/11/25 14:07:42 schmonz Exp $
 
 SHA1 (j2re-1.3.1-02b-FCS-linux-i386.bin) = 73ee522135a920c41ec8d7cbe8b06a252ddf94da
 Size (j2re-1.3.1-02b-FCS-linux-i386.bin) = 13435648 bytes
@@ -10,3 +10,5 @@ SHA1 (j2re-1.3.1-02b-FCS-linux-sparc.bin) = 804078914cc4ba3092a2c8a6ff01039b39ea
 Size (j2re-1.3.1-02b-FCS-linux-sparc.bin) = 10636584 bytes
 SHA1 (patch-aa) = 04672c2b7571b9e7ee3cdd84388f5577f89a79ce
 SHA1 (patch-ab) = ef44e24f8737819c05a15ce6d329d46376270b34
+SHA1 (patch-ac) = 16fdfdea9478f5661ca33ba349c9b36f06468599
+SHA1 (patch-ad) = ad981884c73e0d1d6ebcc8e131aa8b7e406df033
diff --git a/lang/blackdown-jre13/patches/patch-ac b/lang/blackdown-jre13/patches/patch-ac
new file mode 100644
index 00000000000..39f31e71bc7
--- /dev/null
+++ b/lang/blackdown-jre13/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2002/11/25 14:07:43 schmonz Exp $
+
+--- bin/j2sdk-config.orig	Mon Nov 25 07:10:07 2002
++++ bin/j2sdk-config
+@@ -25,6 +25,9 @@
+     sparc*)
+         proc=sparc
+         ;;
++    bebox | prep | sandpoint | walnut | *ppc)
++        proc=ppc
++        ;;
+     *)
+         proc="`uname -m`"
+         ;;
diff --git a/lang/blackdown-jre13/patches/patch-ad b/lang/blackdown-jre13/patches/patch-ad
new file mode 100644
index 00000000000..e1ec3086511
--- /dev/null
+++ b/lang/blackdown-jre13/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2002/11/25 14:07:43 schmonz Exp $
+
+--- bin/JavaPluginControlPanel.orig	Mon Nov 25 07:12:04 2002
++++ bin/JavaPluginControlPanel
+@@ -18,6 +18,9 @@
+     sparc*)
+         proc=sparc
+         ;;
++    bebox | prep | sandpoint | walnut | *ppc)
++        proc=ppc
++        ;;
+     *)
+         proc="`uname -m`"
+         ;;