[pkgsrc/trunk]: pkgsrc/mk Well, the double libtool BUILD_DEPENDS is already a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/422785c747f2
branches:  trunk
changeset: 483421:422785c747f2
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Nov 12 02:05:20 2004 +0000

description:
Well, the double libtool BUILD_DEPENDS is already annoying people and I'd
rather not force BUILD_DEPENDS through the (slow) reduce-depends dance, so
resurrect LIBTOOL_REQD (though in a bit more succinct manner).

diffstat:

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

diffs (22 lines):

diff -r 558de747b82a -r 422785c747f2 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 12 01:46:51 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 12 02:05:20 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1533 2004/11/11 22:34:12 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1534 2004/11/12 02:05:20 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -401,10 +401,8 @@
 LIBTOOL?=              ${PKG_LIBTOOL}
 SHLIBTOOL?=            ${PKG_SHLIBTOOL}
 .if defined(USE_LIBTOOL)
-.if defined(_OPSYS_LIBTOOL_REQD)
-BUILD_DEPENDS+=                libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base
-.endif
-BUILD_DEPENDS+=                libtool-base>=1.5.10nb1:../../devel/libtool-base
+LIBTOOL_REQD?=         1.5.10nb1
+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