[pkgsrc/trunk]: pkgsrc/mk Remove ECHO_WRAPPER_MSG and just use ECHO_BUILDLINK...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9683f32dff11
branches:  trunk
changeset: 650888:9683f32dff11
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Apr 27 19:38:03 2015 +0000

description:
Remove ECHO_WRAPPER_MSG and just use ECHO_BUILDLINK_MSG, which was set
to the same value anyway.  Also removes a comment from 2005 which was
possibly wrong at the time it was committed, given the same construct
has been used in bsd.buildlink3.mk unchanged since 2004.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |   4 ++--
 mk/wrapper/bsd.wrapper.mk       |  19 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diffs (72 lines):

diff -r 86e86e99c575 -r 9683f32dff11 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Mon Apr 27 19:24:17 2015 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Mon Apr 27 19:38:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.234 2015/03/15 21:18:32 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.235 2015/04/27 19:38:03 jperkin Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -77,7 +77,7 @@
 .if ${PKG_DEBUG_LEVEL} > 0
 ECHO_BUILDLINK_MSG?=   ${ECHO}
 .else
-ECHO_BUILDLINK_MSG?=   ${ECHO_WRAPPER_MSG}
+ECHO_BUILDLINK_MSG?=   ${TRUE}
 .endif
 BUILDLINK_DIR=         ${WRKDIR}/.buildlink
 BUILDLINK_BINDIR=      ${BUILDLINK_DIR}/bin
diff -r 86e86e99c575 -r 9683f32dff11 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Mon Apr 27 19:24:17 2015 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Mon Apr 27 19:38:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.91 2014/11/25 18:27:49 joerg Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.92 2015/04/27 19:38:03 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,15 +49,6 @@
 
 .include "../../mk/wrapper/wrapper-defs.mk"
 
-# pkgsrc bmake does not (yet) correctly handle ${VAR} > 0 because
-# ${VAR} is treated as a string, so we must use a string comparison
-# operator.
-.if ${PKG_DEBUG_LEVEL} != "0" || defined(PKG_VERBOSE)
-ECHO_WRAPPER_MSG?=     ${ECHO}
-.else
-ECHO_WRAPPER_MSG?=     ${TRUE}
-.endif
-
 .PHONY: generate-wrappers
 
 .include "../../mk/buildlink3/bsd.buildlink3.mk"
@@ -451,8 +442,8 @@
                ${_WRAP_TRANSFORM.${_wrappee_}}
        ${RUN}                                                          \
        wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
-       if [ -x "$$wrapper" ]; then ${ECHO_WRAPPER_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
-       ${ECHO_WRAPPER_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
+       if [ -x "$$wrapper" ]; then ${ECHO_BUILDLINK_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
+       ${ECHO_BUILDLINK_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
         gen_wrapper=yes;                                               \
        wrappee="${PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
        case $$wrappee in                                               \
@@ -476,7 +467,7 @@
                IFS="$$save_IFS";                                       \
                if ${TEST} ! -x "$$wrappee"; then                       \
                        gen_wrapper=no;                                 \
-                       ${ECHO_WRAPPER_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
+                       ${ECHO_BUILDLINK_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
                fi;                                                     \
                ;;                                                      \
        esac;                                                           \
@@ -500,7 +491,7 @@
        ${RUN}                                                          \
        wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
        if [ ! -x ${.TARGET} -a -x $$wrapper ]; then                    \
-               ${ECHO_WRAPPER_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
+               ${ECHO_BUILDLINK_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
                ${LN} -f${WRAPPER_USE_SYMLINK:Ds} $$wrapper ${.TARGET}; \
        fi
 .    endif