* Use buildlink2.

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

10 files changed, 103 insertions, 134 deletions

diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 086e35e2324..8b652741e29 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2002/07/27 22:01:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2002/10/13 07:45:30 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2sdk-1_3_1_02-linux-i386
 PKGNAME=	sun-jdk13-1.0.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/jdk1.3.1_02
 MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_3_1_02.config&platform=linux-i386&protocol=HTTP+download&download-name=
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
 DEPENDS=	sun-jre13>=1:../../lang/sun-jre13
 
-WRKSRC=		${WRKDIR}/jdk1.3.1_02
-
-# these are part of JRE
-do-configure:
-	@${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/bin/.java_wrapper
+# these are part of the JRE
+post-extract:
+	${RM} -fr ${WRKSRC}/jre
+	${RM} -f ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/bin/.java_wrapper
 
 .include "../../lang/sun-jre13/Makefile.common"
diff --git a/lang/sun-jdk13/distinfo b/lang/sun-jdk13/distinfo
index 890517cd215..652c3bcead0 100644
--- a/lang/sun-jdk13/distinfo
+++ b/lang/sun-jdk13/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/03/19 16:33:58 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/10/13 07:45:31 jlam Exp $
 
 SHA1 (j2sdk-1_3_1_02-linux-i386.bin) = ebeee5f0f32faf14bdc6beacac54c851b309c7ba
 Size (j2sdk-1_3_1_02-linux-i386.bin) = 26311391 bytes
-SHA1 (patch-aa) = 69de53e20bab7edaeb84dfc94b67a85d07cdcc99
diff --git a/lang/sun-jdk13/patches/patch-aa b/lang/sun-jdk13/patches/patch-aa
deleted file mode 100644
index 06b349103d9..00000000000
--- a/lang/sun-jdk13/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/06/12 16:31:46 skrll Exp $
-
---- bin/.java_wrapper.orig	Tue Jun 12 16:44:23 2001
-+++ bin/.java_wrapper	Tue Jun 12 16:44:48 2001
-@@ -31,17 +31,6 @@
-         ;;
- esac
- 
--# Resolve symlinks. See 4152645.
--while [ -L "$PRG" ]; do
--    ls=`ls -ld "$PRG"`
--    link=`expr "$ls" : '.*-> \(.*\)$'`
--    if expr "$link" : '/' > /dev/null; then
--	PRG="$link"
--    else
--	PRG="`dirname $PRG`/$link"
--    fi
--done
--
- APPHOME=`dirname "$PRG"`/.. 
- JREHOME=$APPHOME/jre
- 
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 80b37c57199..446f5d32cfc 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/27 22:21:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/13 07:45:32 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2sdk-1_4_0-linux-i386
@@ -13,11 +13,9 @@ DEPENDS=	sun-jre14>=0:../../lang/sun-jre14
 WRKSRC=		${WRKDIR}/j2sdk1.4.0
 
 # these are part of JRE
-do-configure:
+post-extract:
 	${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README
 
 .include "../../lang/sun-jre14/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
 
-# These need to be after bsd.pkg.mk 
-PREFIX:=	${JDK_HOME}
+PREFIX=		${JVM_HOME}
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}
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}