Eliminate another usage of ${OPSYS} in bsd.pkg.mk - realy on Darwin

defining _OPSYS_PERL_REQD to the correct value to make sure there's
a valid perl version for that platform.

8 files changed, 17 insertions, 14 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9216cc1efff..cb192b32c42 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1099 2002/12/03 20:53:39 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1100 2002/12/03 21:13:37 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -204,12 +204,8 @@ PERL5_PKGSRCDIR?=	../../lang/perl5
 # _PERL58_PATTERNS contains perl versions >=5.8.0 but before 6.0.
 _PERL58_PATTERNS=	5.8.* 5.9* 5.[1-9][0-9]*
 
-# Darwin support was added to perl beginning with release 5.8.0.  Tweak the
-# value of PERL5_REQD (possible user-supplied) so that it is always at least
-# 5.8.0.
-#
-.if ${OPSYS} == "Darwin"
-_PERL58_REQD?=		5.8.0
+.if ${_OPSYS_PERL_REQD} != ""
+_PERL58_REQD?=		${_OPSYS_PERL_REQD}
 .  for _pattern_ in ${_PERL58_PATTERNS}
 .    if !empty(PERL5_REQD:M${_pattern_})
 _PERL58_REQD:=		${PERL5_REQD}
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 7992b206fe1..0dc4d267c92 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.38 2002/12/03 21:13:37 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -84,6 +84,7 @@ _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
+_OPSYS_PERL_REQD=	5.8.0	# base version of perl required
 _OPSYS_RPATH_NAME=		# no name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG=	-V simple -b -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 6d67c67708d..dc0ce4b087c 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.8 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.9 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -96,6 +96,7 @@ _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
+_OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 126a9cce8d2..ab6f62a037e 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.7 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.IRIX.mk,v 1.8 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -96,6 +96,7 @@ _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
+_OPSYS_PERL_REQD=			# no base version of perl required
 _OPSYS_RPATH_NAME=	-rpath,		# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	no		# native patch(1) can make backups
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 52b0bbdaf61..6571528f918 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.38 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -86,6 +86,7 @@ _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
+_OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG= 	-b -V simple -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 0f40c4e18b1..e763b3bcbb4 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.37 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.38 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -96,6 +96,7 @@ _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
+_OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 395b538759f..eea53852d44 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.6 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.7 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -96,6 +96,7 @@ _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
+_OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 3865316c161..8781a6fc7ff 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.40 2002/12/03 20:53:41 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.41 2002/12/03 21:13:38 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -100,6 +100,7 @@ _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
+_OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_RPATH_NAME=	-R		# name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG= 	-V simple -z	# switch to patch(1) for backup suffix