pkg/30247: logic pkgsrc-wrapper script transforming is not correct.

[mikawa%terra.dti.ne.jp@localhost]

>Number:         30247
>Category:       pkg
>Synopsis:       logic pkgsrc-wrapper script transforming is not correct.
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 16 18:31:00 +0000 2005
>Originator:     mikawa%terra.dti.ne.jp@localhost
>Release:        NetBSD 3.99.3
>Organization:
>Environment:
System: NetBSD raven 3.99.3 NetBSD 3.99.3 (RAVEN) #0: Mon May 16 21:49:14 JST 
2005 root@raven:/a/usr/obj/sys/arch/i386/compile/RAVEN i386
Architecture: i386
Machine: i386
>Description:
`logic' wrapper script skips some arguments.
The problem is in bsd.pkg.mk. pkgsrc-wrappers needs expr command
but the command is not listed in PKGSRC_USE_TOOLS (except bulk-build).
>How-To-Repeat:
Build some package that uses wrapper scripts.

# cd /usr/pkgsrc/pkgtools/digest
# make
[ ... ]
===> Building for digest-20050323
cc -DHAVE_CONFIG_H -I. -I. -DHOST=\"i386--netbsdelf\" -DVERSION=\"20050323\" 
-O2 -c bits.c -o bits.o
1: not found
test: 0: unexpected operator
-: not found
test: 0: unexpected operator
-: not found
[ ... ]

And see WRKDIR/.wrapper/bin/* scripts and WRKDIR/.work.log file.
>Fix:

$NetBSD$

--- mk/bsd.pkg.mk.orig  2005-05-16 14:11:51.000000000 +0900
+++ mk/bsd.pkg.mk
@@ -831,13 +831,13 @@ BUILD_DEFS+=              PKG_SYSCONFBASEDIR PKG_SYS
 #
 PKGSRC_USE_TOOLS+=                                                     \
        [ awk basename cat chgrp chmod chown cmp cp cut dirname echo    \
-       egrep env false file find grep head hostname id install ln ls   \
-       mkdir mv pax pwd rm rmdir sed sh sort tail test touch tr true   \
-       wc xargs
+       egrep env expr false file find grep head hostname id install ln \
+       ls mkdir mv pax pwd rm rmdir sed sh sort tail test touch tr     \
+       true wc xargs
 
 # bsd.bulk-pkg.mk uses certain tools
 .if defined(BATCH)
-PKGSRC_USE_TOOLS+=     expr tee tsort
+PKGSRC_USE_TOOLS+=     tee tsort
 .endif
 
 .if !defined(NO_MTREE)