* Use buildlink2.

* Minor improvements to the package Makefiles.
* Correct the PLIST.

3 files changed, 62 insertions, 62 deletions

diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index d22e30933fc..39edb349249 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/27 22:17:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/13 07:45:34 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2re-1_4_0-linux-i386
@@ -12,12 +12,4 @@ WRKSRC=		${WRKDIR}/j2re1.4.0
 
 .include "../../lang/sun-jre14/Makefile.common"
 
-.if ${OPSYS} != "Linux"
-DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-# These need to be after bsd.pkg.mk 
-PREFIX:=	${JDK_HOME}
+PREFIX=		${JVM_HOME}
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 5d667c1e145..691b6e71bbf 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2002/09/30 23:56:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/10/13 07:45:34 jlam Exp $
 
 CATEGORIES=	lang
 EXTRACT_SUFX=	.bin
@@ -18,19 +18,21 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 
 .include "../../mk/bsd.prefs.mk"
 
-# We need to overwrite JDK_HOME, since JRE and JDK need to be
-# installed in the same directory
-JDK_HOME:=	${LOCALBASE}/java/sun-1.4.0
-MESSAGE_SUBST+= JDK_HOME=${JDK_HOME}
+JVM_HOME=	${LOCALBASE}/java/sun-1.4.0
 
-# since we change PREFIX:
-NO_MTREE=	yes
+.if ${OPSYS} == "NetBSD"
+DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
+.endif
 
-ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 Linux-*-i[3-6]86
+USE_BUILDLINK2=	# defined
+NO_CONFIGURE=	# defined
+NO_BUILD=	# defined
+NO_MTREE=	# defined, since we change PREFIX
 LDD=		${TRUE}
 
-NO_BUILD=	# defined
-USE_BUILDLINK2=	# defined
+ONLY_FOR_PLATFORM=	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386
+ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
 
 post-fetch:
 	@${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
@@ -38,3 +40,9 @@ post-fetch:
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}
 	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
+
+.if ${OPSYS} == "NetBSD"
+.  include "../../mk/bsd.pkg.mk"
+.else
+.  include "../../emulators/suse_linux/Makefile.application"
+.endif
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index f108734fd3e..2a819b7a630 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/03 19:50:52 jschauma Exp $
-COPYRIGHT
+@comment $NetBSD: PLIST,v 1.4 2002/10/13 07:45:35 jlam Exp $
 CHANGES
+COPYRIGHT
+ControlPanel.html
 LICENSE
 README
-ControlPanel.html
 Welcome.html
 bin/ControlPanel
 bin/java
@@ -16,38 +16,6 @@ bin/rmiregistry
 bin/servertool
 bin/tnameserv
 javaws-1_0_1_02-linux-int.zip
-lib/i386/awt_robot
-lib/i386/client/Xusage.txt
-lib/i386/client/libjsig.so
-lib/i386/client/libjvm.so
-lib/i386/jvm.cfg
-lib/i386/libJdbcOdbc.so
-lib/i386/libawt.so
-lib/i386/libcmm.so
-lib/i386/libdcpr.so
-lib/i386/libdt_socket.so
-lib/i386/libfontmanager.so
-lib/i386/libhprof.so
-lib/i386/libioser12.so
-lib/i386/libjaas_unix.so
-lib/i386/libjava.so
-lib/i386/libjavaplugin_jni.so
-lib/i386/libjawt.so
-lib/i386/libjcov.so
-lib/i386/libjdwp.so
-lib/i386/libjpeg.so
-lib/i386/libjsig.so
-lib/i386/libjsound.so
-lib/i386/libmlib_image.so
-lib/i386/libnet.so
-lib/i386/libnio.so
-lib/i386/librmi.so
-lib/i386/libverify.so
-lib/i386/libzip.so
-lib/i386/native_threads/libhpi.so
-lib/i386/server/Xusage.txt
-lib/i386/server/libjsig.so
-lib/i386/server/libjvm.so
 lib/audio/soundbank.gm
 lib/charsets.jar
 lib/cmm/CIEXYZ.pf
@@ -81,6 +49,38 @@ lib/fonts/LucidaTypewriterBoldOblique.ttf
 lib/fonts/LucidaTypewriterOblique.ttf
 lib/fonts/LucidaTypewriterRegular.ttf
 lib/fonts/fonts.dir
+lib/i386/awt_robot
+lib/i386/client/Xusage.txt
+lib/i386/client/libjsig.so
+lib/i386/client/libjvm.so
+lib/i386/jvm.cfg
+lib/i386/libJdbcOdbc.so
+lib/i386/libawt.so
+lib/i386/libcmm.so
+lib/i386/libdcpr.so
+lib/i386/libdt_socket.so
+lib/i386/libfontmanager.so
+lib/i386/libhprof.so
+lib/i386/libioser12.so
+lib/i386/libjaas_unix.so
+lib/i386/libjava.so
+lib/i386/libjavaplugin_jni.so
+lib/i386/libjawt.so
+lib/i386/libjcov.so
+lib/i386/libjdwp.so
+lib/i386/libjpeg.so
+lib/i386/libjsig.so
+lib/i386/libjsound.so
+lib/i386/libmlib_image.so
+lib/i386/libnet.so
+lib/i386/libnio.so
+lib/i386/librmi.so
+lib/i386/libverify.so
+lib/i386/libzip.so
+lib/i386/native_threads/libhpi.so
+lib/i386/server/Xusage.txt
+lib/i386/server/libjsig.so
+lib/i386/server/libjvm.so
 lib/images/cursors/cursors.properties
 lib/images/cursors/invalid32x32.gif
 lib/images/cursors/motif_CopyDrop32x32.gif
@@ -541,6 +541,10 @@ plugin/i386/ns610/libjavaplugin_oji140.so
 @dirrm plugin/i386/ns4
 @dirrm plugin/i386
 @dirrm plugin
+@dirrm man/man1
+@dirrm man/ja_JP.eucJP/man1
+@dirrm man/ja_JP.eucJP
+@dirrm man
 @dirrm lib/zi/Pacific
 @dirrm lib/zi/Indian
 @dirrm lib/zi/Europe
@@ -592,11 +596,7 @@ plugin/i386/ns610/libjavaplugin_oji140.so
 @dirrm lib/cmm
 @dirrm lib/audio
 @exec ${MKDIR} %D/lib/applet
-@dirrm lib/applet
-@dirrm lib
-@dirrm man/man1
-@dirrm man/ja_JP.eucJP/man1
-@dirrm man/ja_JP.eucJP
-@dirrm man
+@unexec ${RMDIR} %D/lib/applet 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
 @dirrm bin
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}