Abstract out the base value of libtool required into _OPSYS_LIBTOOL_REQD,

and use that rather than a hardcoded ${OPSYS} default in bsd.pkg.mk

8 files changed, 17 insertions, 15 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0265f07d4ab..91621f420e7 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1094 2002/12/03 16:16:37 jschauma Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1095 2002/12/03 18:57:53 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -306,17 +306,12 @@ CPPFLAGS+=	${CPP_PRECOMP_FLAGS}
 # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script.
 # also pass in a CONFIG_SHELL to avoid picking up bash
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=	LIBS="${LIBS}"
+CONFIGURE_ENV+=		LIBS="${LIBS}"
 CONFIG_SHELL?=		${SH}
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 .endif
 
-# FreeBSD shared library naming was fixed in libtool nb10.
-.if ${OPSYS} == "FreeBSD"
-LIBTOOL_REQD=		1.4.20010614nb10
-.else
-LIBTOOL_REQD=		1.4.20010614nb9
-.endif
+LIBTOOL_REQD=		${_OPSYS_LIBTOOL_REQD}
 LIBTOOL=		${LOCALBASE}/bin/libtool
 .if defined(USE_LIBTOOL)
 PKGLIBTOOL=		${LIBTOOL}
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index a6632c423e5..84db481783f 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.32 2002/11/23 04:43:05 schmonz Exp $
+# $NetBSD: defs.Darwin.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -82,6 +82,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make 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
 _PATCH_BACKUP_ARG=	-V simple -b -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		no	# don't add rpath to LDFLAGS
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 6eaeed1ac76..f3d7541584e 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.3 2002/11/24 09:17:44 jdolecek Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.4 2002/12/03 18:57:52 agc Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -94,6 +94,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make 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
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 4091f5ac5b9..c3e18d712de 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.1 2002/12/02 17:07:28 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.2 2002/12/03 18:57:52 agc Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -94,6 +94,7 @@ _IMAKE_MAKE=		${MAKE}		# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make 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
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 858fe90497b..89fe1b917c6 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.32 2002/10/23 12:21:30 wiz Exp $
+# $NetBSD: defs.Linux.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -84,6 +84,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is 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
 _PATCH_BACKUP_ARG= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 99b81ecf7c7..087f035dc36 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.32 2002/11/24 09:17:44 jdolecek Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.33 2002/12/03 18:57:52 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -94,6 +94,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make 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
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 5c54b907b62..5473bbe5eba 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.1 2002/11/30 14:40:55 cjep Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.2 2002/12/03 18:57:53 agc Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -94,6 +94,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make 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
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 44a3d456912..a73ec5176ec 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.35 2002/11/23 00:00:36 salo Exp $
+# $NetBSD: defs.SunOS.mk,v 1.36 2002/12/03 18:57:53 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -98,6 +98,7 @@ _IMAKE_MAKE=	/usr/ccs/bin/make	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make 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
 _PATCH_BACKUP_ARG= 	-V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
 _USE_RPATH=		yes		# add rpath to LDFLAGS