* Use buildlink2.

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

3 files changed, 31 insertions, 37 deletions

diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index 3994b0d5b41..b2e37fc8fe1 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2002/08/29 14:07:30 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/10/13 07:45:33 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2re-1_3_1_02-linux-i386
 PKGNAME=	sun-jre13-1.0.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/jre1.3.1_02
 MASTER_SITES=	http://java.sun.com/Download4?config-file=j2re-1_3_1_02.config&platform=linux-i386&protocol=HTTP+download&download-name=
 
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
-WRKSRC=		${WRKDIR}/jre1.3.1_02
-NO_CONFIGURE=	# defined
-
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 .include "../../lang/sun-jre13/Makefile.common"
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 490d0b3a5c3..fb343082977 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2002/09/30 23:43:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2002/10/13 07:45:33 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang
@@ -19,16 +19,12 @@ 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
 .if ${OPSYS} == "Darwin"
-JDK_HOME=	/usr
+JVM_HOME=	/usr
 .else
-JDK_HOME:=	${LOCALBASE}/java/sun-1.3.1
+JVM_HOME=	${LOCALBASE}/java/sun-1.3.1
 .endif
-MESSAGE_SUBST+=	JDK_HOME=${JDK_HOME}
 
-# Needs to be after bsd.prefs.mk
 .if ${OPSYS} == "NetBSD"
 DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
@@ -42,39 +38,39 @@ NO_BUILD=	# defined
 PLIST_SRC=	${PKGDIR}/PLIST.Darwin
 .endif
 
-# since we change PREFIX:
-NO_MTREE=	yes
+.if ${OPSYS} == "Linux"
+NO_PATCH=	# defined -- no need for patches on Linux
+.endif
 
-ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
-LDD=		${TRUE}
-NO_BUILD=	# defined
 USE_BUILDLINK2=	# defined
+NO_CONFIGURE=	# defined
+NO_BUILD=	# defined
+NO_MTREE=	# defined, since we change PREFIX
+LDD=		${TRUE}
+
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
 
+.if ${OPSYS} != "Darwin"
 post-fetch:
-.	if ${OPSYS} != "Darwin"
 	@-${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-.	endif
+.endif
+
+post-build:
+	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
+.if ${OPSYS} == "Darwin"
+do-install:
+	@${ECHO_MSG} "Darwin ships with a JRE/JDK based on Sun's 1.3.1 release."
+.else
 do-install:
-.	if ${OPSYS} == "Darwin"
-	@${ECHO_MSG} "Darwin ships with a JRE and a JDK based on Sun's 1.3.1 release."
-.	else
 	${INSTALL_PROGRAM_DIR} ${PREFIX}
 	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
-.	endif
-
-# These need to be after bsd.pkg.mk 
-
-.if ${OPSYS} == "Linux"
-# No patches on linux
-NO_PATCH= #defined
 .endif
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
-.include "../../mk/bsd.pkg.mk"
-.elif ${OPSYS} != "Linux"
-.include "../../emulators/suse_linux/Makefile.application"
+.if ${OPSYS} == "NetBSD"
+.  include "../../mk/bsd.pkg.mk"
+.else
+.  include "../../emulators/suse_linux/Makefile.application"
 .endif
 
-
-PREFIX:=	${JDK_HOME}
+PREFIX=		${JVM_HOME}
diff --git a/lang/sun-jre13/PLIST b/lang/sun-jre13/PLIST
index b21386b297c..77dac5c4dca 100644
--- a/lang/sun-jre13/PLIST
+++ b/lang/sun-jre13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/27 21:54:32 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/10/13 07:45:34 jlam Exp $
 CHANGES
 COPYRIGHT
 ControlPanel.html
@@ -197,4 +197,4 @@ plugin/i386/ns600/libjavaplugin_oji.so
 @dirrm bin/i386/green_threads
 @dirrm bin/i386
 @dirrm bin
-@unexec ${RMDIR} %D
+@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}