Add a layer of abstraction into bsd.pkg.mk for Java settings - set the

path to the java home directory depending upon whether the operating
system includes Java by default. Use the operating system-dependent
definitions files to set this value.

8 files changed, 17 insertions, 10 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 55a86eaa368..9216cc1efff 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1098 2002/12/03 19:24:26 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1099 2002/12/03 20:53:39 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -87,7 +87,7 @@ DEPENDS+=		sun-jre14-[0-9]*:../../lang/sun-jre14
 UNLIMIT_RESOURCES+=	datasize
 .  elif ${PKG_JVM} == "sun-jdk13"
 _JAVA_PKGBASE=		sun-jdk13
-.    if ${OPSYS} == "Darwin"
+.    if ${_OPSYS_HAS_JAVA} == "yes"
 _JAVA_HOME_DEFAULT=	/usr
 .    else
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.3.1
@@ -106,7 +106,7 @@ DEPENDS+=		sun-jre1[34]-[0-9]*:../../lang/sun-jre14
 	${MACHINE_PLATFORM:MDarwin-*-*} != "" || \
 	${MACHINE_PLATFORM:MLinux-*-i[3456]86} != ""
 _JAVA_PKGBASE=		sun-jdk1[34]*
-.    if ${OPSYS} == "Darwin"
+.    if ${_OPSYS_HAS_JAVA} == "yes"
 _JAVA_HOME_DEFAULT=	/usr
 .    else
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.3.1
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index a2266eed4d3..7992b206fe1 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.36 2002/12/03 19:24:27 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -80,6 +80,7 @@ PKG_CREATE_USERGROUP?=	NO				# XXX - Until then
 _DO_SHLIB_CHECKS=	yes	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
+_OPSYS_HAS_JAVA=	yes	# Java is standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 0cb562a0f76..6d67c67708d 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.7 2002/12/03 19:24:27 agc Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.8 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -92,6 +92,7 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+_OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb10 # base version of libtool required
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 769c010bbc9..126a9cce8d2 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.6 2002/12/03 20:20:59 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.7 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -92,6 +92,7 @@ USERADD?=		${FALSE}
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}		# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make is not standard
+_OPSYS_HAS_JAVA=	no		# Java is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index e0c6a2777b1..52b0bbdaf61 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.36 2002/12/03 19:24:27 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -82,6 +82,7 @@ ZOULARISBASE?=		/usr/pkg
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
+_OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 28a2066f488..0f40c4e18b1 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.36 2002/12/03 19:24:28 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -92,6 +92,7 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+_OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index d923a170f34..395b538759f 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.5 2002/12/03 19:24:28 agc Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.6 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -92,6 +92,7 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+_OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 7e5e1d3dfae..3865316c161 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.39 2002/12/03 19:24:28 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.40 2002/12/03 20:53:41 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -96,6 +96,7 @@ USERADD?=		/usr/sbin/useradd
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
 _IMAKE_MAKE=	/usr/ccs/bin/make	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make is not standard
+_OPSYS_HAS_JAVA=	no		# Java is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required