[pkgsrc/trunk]: pkgsrc/mk Change the way _OPSYS_LIBTOOL_REQD works slightly.

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/352fc3229ee4
branches:  trunk
changeset: 483406:352fc3229ee4
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Nov 11 22:32:45 2004 +0000

description:
Change the way _OPSYS_LIBTOOL_REQD works slightly.
Rather than replacing the LIBTOOL_REQD value, add two BUILD_DEPENDS lines.
That way, the higher numbered BUILD_DEPENDS wins -- allowing the version
in bsd.pkg.mk to be bumped beyond the value in the platform .mk and still
be enforced properly.

diffstat:

 mk/bsd.pkg.mk |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 0b2103cb290c -r 352fc3229ee4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Nov 11 22:29:40 2004 +0000
+++ b/mk/bsd.pkg.mk     Thu Nov 11 22:32:45 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1531 2004/11/02 08:31:45 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1532 2004/11/11 22:32:45 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -387,11 +387,6 @@
 CONFIGURE_ENV+=                install_sh=${INSTALL:Q}
 .endif
 
-.if defined(_OPSYS_LIBTOOL_REQD)
-LIBTOOL_REQD=          ${_OPSYS_LIBTOOL_REQD}
-.else
-LIBTOOL_REQD?=         1.5.10nb1
-.endif
 #
 # PKG_LIBTOOL is the path to the libtool script installed by libtool-base.
 # _LIBTOOL is the path the libtool used by the build, which could be the
@@ -406,7 +401,10 @@
 LIBTOOL?=              ${PKG_LIBTOOL}
 SHLIBTOOL?=            ${PKG_SHLIBTOOL}
 .if defined(USE_LIBTOOL)
-BUILD_DEPENDS+=                libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
+.if defined(_OPSYS_LIBTOOL_REQD)
+BUILD_DEPENDS+=                libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base
+.endif
+BUILD_DEPENDS+=                libtool-base>=1.5.10nb6:../../devel/libtool-base
 CONFIGURE_ENV+=                LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=             LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 LIBTOOL_OVERRIDE?=     libtool */libtool */*/libtool