[pkgsrc/trunk]: pkgsrc/mk Propagate $ECHO, $GREP, $SORT to print-la-libnames;...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3706a8f318b
branches:  trunk
changeset: 482002:a3706a8f318b
user:      tv <tv%pkgsrc.org@localhost>
date:      Sat Oct 16 22:37:29 2004 +0000

description:
Propagate $ECHO, $GREP, $SORT to print-la-libnames; fixes this on IRIX.
Noted by Georg Schwarz <geos%epost.de@localhost>.

diffstat:

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

diffs (46 lines):

diff -r 42da9179dc0b -r a3706a8f318b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Oct 16 22:27:40 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Oct 16 22:37:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1519 2004/10/13 18:42:19 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1520 2004/10/16 22:37:29 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -3466,7 +3466,7 @@
 ${DLIST}: ${WRKDIR}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        { ${PKG_DELETE} -n "${PKGWILDCARD}" 2>&1 |                      \
-               grep '^ ' |                                             \
+               ${GREP} '^      ' |                                             \
                ${AWK} '{ l[NR]=$$0 } END { for (i=NR;i>0;--i) print l[i] }' \
        || ${TRUE}; } > ${DLIST}
 
@@ -4485,7 +4485,8 @@
        ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} \! -type d -print
 _PRINT_PLIST_DIRS_CMD= \
        ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print
-_PRINT_LA_LIBNAMES=    ${.CURDIR}/../../mk/scripts/print-la-libnames
+_PRINT_LA_LIBNAMES=    ${SETENV} ECHO=${ECHO:Q} GREP=${GREP:Q} SORT=${SORT:Q} \
+                       ${SH} ${.CURDIR}/../../mk/scripts/print-la-libnames
 
 _PRINT_PLIST_LIBTOOLIZE_FILTER?=                                       \
        (                                                               \
@@ -4499,7 +4500,7 @@
          while read file; do                                           \
                case $$file in                                          \
                *.la)                                                   \
-                       ${SH} ${_PRINT_LA_LIBNAMES} $$file >> $$libslist; \
+                       ${_PRINT_LA_LIBNAMES} $$file >> $$libslist;     \
                        ;;                                              \
                esac;                                                   \
                ${ECHO} "$$file";                                       \
@@ -4960,7 +4961,7 @@
 .else
 _PLIST_AWK_LIBTOOL?=                                                   \
 /^[^@].*\.la$$/ {                                                      \
-       system("cd ${PREFIX} && ${SH} ${_PRINT_LA_LIBNAMES} " $$0)      \
+       system("cd ${PREFIX} && ${_PRINT_LA_LIBNAMES} " $$0)            \
 }
 .endif