[pkgsrc/trunk]: pkgsrc/mk Finish removing instances of _USE_NEW_TOOLS from pk...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2a11949c6b2
branches:  trunk
changeset: 494288:d2a11949c6b2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 22 20:15:40 2005 +0000

description:
Finish removing instances of _USE_NEW_TOOLS from pkgsrc.

diffstat:

 mk/bsd.pkg.mk |  24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diffs (60 lines):

diff -r 198129c4c44b -r d2a11949c6b2 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun May 22 20:07:36 2005 +0000
+++ b/mk/bsd.pkg.mk     Sun May 22 20:15:40 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1676 2005/05/22 19:11:12 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1677 2005/05/22 20:15:40 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -421,12 +421,6 @@
 
 LIBABISUFFIX?=
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-TOOLS_M4?=             ${M4}
-TOOLS_YACC?=           ${YACC}
-CONFIGURE_ENV+=                M4=${TOOLS_M4:Q} YACC=${TOOLS_YACC:Q}
-.endif
-
 TOUCH_FLAGS?=          -f
 
 # Figure out where the local mtree file is
@@ -893,11 +887,8 @@
 # Patch
 .include "../../mk/bsd.pkg.patch.mk"
 
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+# Tools
 .include "../../mk/tools/bsd.tools.mk"
-.else
-.include "../../mk/tools.mk"
-.endif
 
 # If NO_BUILD is defined, default to not needing a compiler.
 .if defined(NO_BUILD)
@@ -1842,13 +1833,6 @@
 pre-configure-override: ${_CONFIGURE_PREREQ}
        @${DO_NADA}
 
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-_INSTALL_CMD=  ${INSTALL}
-.else
-_INSTALL_CMD=  `${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`
-TOOLS_AWK=     ${AWK}
-.endif
-
 .PHONY: do-configure
 .if !target(do-configure)
 do-configure:
@@ -1856,8 +1840,8 @@
 .    for DIR in ${CONFIGURE_DIRS}
        ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} \
            AWK="${TOOLS_AWK}" \
-           INSTALL="${_INSTALL_CMD} -c -o ${BINOWN} -g ${BINGRP}" \
-           ac_given_INSTALL="${_INSTALL_CMD} -c -o ${BINOWN} -g ${BINGRP}" \
+           INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
+           ac_given_INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
            INSTALL_DATA="${INSTALL_DATA}"                              \
            INSTALL_PROGRAM="${INSTALL_PROGRAM}"                        \
            INSTALL_GAME="${INSTALL_GAME}"                              \