[pkgsrc/trunk]: pkgsrc/mk/wrapper Made sure the :sh operator does not result ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77cbb6f5a331
branches:  trunk
changeset: 494209:77cbb6f5a331
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri May 20 22:40:36 2005 +0000

description:
Made sure the :sh operator does not result in an empty string. Rewrote the
variable substitution for the find(1) command to be more readable.

diffstat:

 mk/wrapper/bsd.wrapper.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 809b962f3928 -r 77cbb6f5a331 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Fri May 20 22:18:13 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Fri May 20 22:40:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.31 2005/05/20 21:36:05 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.32 2005/05/20 22:40:36 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -696,10 +696,14 @@
 _UNWRAP_PATTERNS+=     *Conf.sh
 _UNWRAP_PATTERNS+=     *.pc
 _UNWRAP_PATTERNS_FIND_cmd=     \
-       cd ${WRKSRC} && ${FIND} . \( ${_UNWRAP_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \) -print | ${SED} -e 's|^\./||' | ${SORT} -u
+       cd ${WRKSRC} && \
+       ${ECHO} "__dummy-entry__" && \
+       ${FIND} . \( ${_UNWRAP_PATTERNS:C/.*/-o -name "&"/g:S/-o//1} \) -print \
+       | ${SED} -e 's|^\./||' \
+       | ${SORT} -u
 UNWRAP_FILES?=         # empty
 _UNWRAP_FILES=         ${UNWRAP_FILES}                                 \
-                       ${_UNWRAP_PATTERNS_FIND_cmd:sh}
+                       ${_UNWRAP_PATTERNS_FIND_cmd:sh:N__dummy-entry__}
 _UNWRAP_SED?=          # empty
 
 SUBST_CLASSES+=                unwrap