[pkgsrc/trunk]: pkgsrc/mk/configure Normalized the way test(1) is used. Since...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41d530475b81
branches:  trunk
changeset: 521106:41d530475b81
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 05 12:40:01 2006 +0000

description:
Normalized the way test(1) is used. Since I have no idea whether ${TEST}
or [] is better, I have used [ to keep the code shorter. Noticed by wiz.

diffstat:

 mk/configure/config-override.mk  |   8 ++++----
 mk/configure/libtool-override.mk |  10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 416631f1f982 -r 41d530475b81 mk/configure/config-override.mk
--- a/mk/configure/config-override.mk   Sun Nov 05 09:10:17 2006 +0000
+++ b/mk/configure/config-override.mk   Sun Nov 05 12:40:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: config-override.mk,v 1.4 2006/11/05 07:41:06 rillig Exp $
+# $NetBSD: config-override.mk,v 1.5 2006/11/05 12:40:01 rillig Exp $
 
 ######################################################################
 ### config-{guess,sub,rpath}-override (PRIVATE)
@@ -33,16 +33,16 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        for file in ${${_OVERRIDE_VAR.${_sub_}}}; do                    \
-               ${TEST} -f "$$file" || ${TEST} -h "$$file" || continue; \
+               [ -f "$$file" ] || [ -h "$$file" ] || continue;         \
                ${_SCRIPT.${.TARGET}};                                  \
        done
 .  else
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        depth=0; pattern=config.${_sub_};                               \
-       while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}}; do \
+       while [ $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}} ]; do  \
                for file in $$pattern; do                               \
-                       test -f "$$file" || test -h "$$file" || continue; \
+                       [ -f "$$file" ] || [ -h "$$file" ] || continue; \
                        ${_SCRIPT.${.TARGET}};                          \
                done;                                                   \
                depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern";     \
diff -r 416631f1f982 -r 41d530475b81 mk/configure/libtool-override.mk
--- a/mk/configure/libtool-override.mk  Sun Nov 05 09:10:17 2006 +0000
+++ b/mk/configure/libtool-override.mk  Sun Nov 05 12:40:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.8 2006/11/05 07:41:06 rillig Exp $
+# $NetBSD: libtool-override.mk,v 1.9 2006/11/05 12:40:01 rillig Exp $
 
 ######################################################################
 ### {libtool,shlibtool}-override (PRIVATE)
@@ -32,7 +32,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        set -- dummy ${LIBTOOL_OVERRIDE}; shift;                        \
-       while ${TEST} $$# -gt 0; do                                     \
+       while [ $$# -gt 0 ]; do                                         \
                file="$$1"; shift;                                      \
                [ -f "$$file" ] || [ -h "$$file" ] || continue;         \
                ${_SCRIPT.${.TARGET}};                                  \
@@ -41,7 +41,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        depth=0; pattern=libtool;                                       \
-       while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.libtool}; do      \
+       while [ $$depth -le ${OVERRIDE_DIRDEPTH.libtool} ]; do          \
                for file in $$pattern; do                               \
                        [ -f "$$file" ] || [ -h "$$file" ] || continue; \
                        ${_SCRIPT.${.TARGET}};                          \
@@ -57,7 +57,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        set -- dummy ${SHLIBTOOL_OVERRIDE}; shift;                      \
-       while ${TEST} $$# -gt 0; do                                     \
+       while [ $$# -gt 0 ]; do                                         \
                file="$$1"; shift;                                      \
                [ -f "$$file" ] || [ -h "$$file" ] || continue;         \
                ${_SCRIPT.${.TARGET}};                                  \
@@ -66,7 +66,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        depth=0; pattern=libtool;                                       \
-       while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool}; do    \
+       while [ $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool} ]; do        \
                for file in $$pattern; do                               \
                        [ -f "$$file" ] || [ -h "$$file" ] || continue; \
                        ${_SCRIPT.${.TARGET}};                          \