[pkgsrc/trunk]: pkgsrc/mk Make these two files aware of the new tools framewo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee06d4f7e0ff
branches:  trunk
changeset: 493677:ee06d4f7e0ff
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed May 11 22:17:26 2005 +0000

description:
Make these two files aware of the new tools framework to ease integration.
These files would normally go away after packages have been taught to
replace including autoconf.mk with "USE_TOOLS+= autoconf", and similarly
for automake.mk.

diffstat:

 mk/autoconf.mk |  16 ++++++++++++++--
 mk/automake.mk |  14 +++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diffs (93 lines):

diff -r 7a3d762f416c -r ee06d4f7e0ff mk/autoconf.mk
--- a/mk/autoconf.mk    Wed May 11 22:08:18 2005 +0000
+++ b/mk/autoconf.mk    Wed May 11 22:17:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.6 2004/10/29 12:30:20 darcy Exp $
+# $NetBSD: autoconf.mk,v 1.7 2005/05/11 22:17:26 jlam Exp $
 #
 # makefile fragment for packages that use autoconf
 # AUTOCONF_REQD can be set to the minimum version required.
@@ -15,21 +15,32 @@
 # minimal required version
 AUTOCONF_REQD?= 2.50
 
+.include "../../mk/bsd.prefs.mk"
+
 .if empty(AUTOCONF_REQD:M2.1[0-9]*)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            autoconf
+.  else
 BUILD_DEPENDS+=                autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 AUTOCONF=              ${LOCALBASE}/bin/autoconf
 AUTORECONF=            ${LOCALBASE}/bin/autoreconf
 AUTOHEADER=            ${LOCALBASE}/bin/autoheader
+.  endif
 .else
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            autoconf213
+.  else
 BUILD_DEPENDS+=                autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
 AUTOCONF=              ${LOCALBASE}/bin/autoconf-2.13
 AUTORECONF=            ${LOCALBASE}/bin/autoreconf-2.13
 AUTOHEADER=            ${LOCALBASE}/bin/autoheader-2.13
-.  if defined(USE_LIBTOOL)
+.    if defined(USE_LIBTOOL)
 pre-configure: do-libtool-m4-override
+.    endif
 .  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 # LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
 # will be created.  The libtool.m4 is only created if a GNU configure
 # script exists at that location.
@@ -56,5 +67,6 @@
                fi;                                                     \
        done
 .endfor
+.endif
 
 .endif # AUTOCONF_MK
diff -r 7a3d762f416c -r ee06d4f7e0ff mk/automake.mk
--- a/mk/automake.mk    Wed May 11 22:08:18 2005 +0000
+++ b/mk/automake.mk    Wed May 11 22:17:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.8 2004/08/13 14:19:24 wiz Exp $
+# $NetBSD: automake.mk,v 1.9 2005/05/11 22:17:26 jlam Exp $
 #
 # makefile fragment for packages that use automake
 # AUTOMAKE_REQD can be set to the minimum version required.
@@ -16,16 +16,27 @@
 # minimal required version
 AUTOMAKE_REQD?= 1.9
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(AUTOMAKE_REQD:M1.4*)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            automake14
+.  else
 BUILD_DEPENDS+=                automake14>=${AUTOMAKE_REQD}:../../devel/automake14
 _AUTOMAKE_API_VERSION= 1.4
 AUTOCONF_REQD?=                2.13
+.  endif
 .else
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=            automake
+.  else
 BUILD_DEPENDS+=                automake>=${AUTOMAKE_REQD}:../../devel/automake
 _AUTOMAKE_API_VERSION= 1.9
 AUTOCONF_REQD?=                2.58
+.  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AUTOMAKE=              ${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
 ACLOCAL=               ${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
 
@@ -34,4 +45,5 @@
 .endif
 
 .include "../mk/autoconf.mk"
+.endif
 .endif # AUTOMAKE_MK