[pkgsrc/trunk]: pkgsrc/mk Put back the proper variable construct for LIBTOOL_...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71ce5e1f0289
branches:  trunk
changeset: 487401:71ce5e1f0289
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Jan 13 20:19:57 2005 +0000

description:
Put back the proper variable construct for LIBTOOL_REQD that was borken in
previous.  (_OPSYS_LIBTOOL_REQD is only defined on some platforms, so the
:U clause provides the next best choice if that's not defined.)

diffstat:

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

diffs (23 lines):

diff -r 92e5bc8ef0e9 -r 71ce5e1f0289 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jan 13 19:52:00 2005 +0000
+++ b/mk/bsd.pkg.mk     Thu Jan 13 20:19:57 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1557 2005/01/12 15:32:01 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1558 2005/01/13 20:19:57 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -381,11 +381,9 @@
 .if defined(USE_LIBTOOL)
 .  if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran)
 LIBTOOL_REQD?=         1.5.10nb7
-BUILD_DEPENDS+=                libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
-.  else
+.  endif
 LIBTOOL_REQD?=         1.5.10nb1
-BUILD_DEPENDS+=                libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base
-.  endif
+BUILD_DEPENDS+=                libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
 CONFIGURE_ENV+=                LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=             LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 LIBTOOL_OVERRIDE?=     libtool */libtool */*/libtool