pkg/31867: php-mbstring-4.4.0nb1 does not patch cleanly

[neil.hoggarth%physiol.ox.ac.uk@localhost]

>Number:         31867
>Category:       pkg
>Synopsis:       php-mbstring-4.4.0nb1 does not patch cleanly
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 19 08:59:00 +0000 2005
>Originator:     Neil Hoggarth
>Release:        Solaris 9
>Organization:
Laboratory of Physiology, Oxford University
>Environment:
SunOS saros 5.9 Generic_118558-10 sun4u sparc SUNW,Ultra-30
>Description:
I just tried to build php-mbstring-4.4.0nb1. The build fails at the
patching stage:

bash-3.00# bmake clean
===> Cleaning for php-mbstring-4.4.0nb1
bash-3.00# bmake     
===> Checking for vulnerabilities in php-mbstring-4.4.0nb1
=> Checksum SHA1 OK for php-4.4.0.tar.bz2.
=> Checksum RMD160 OK for php-4.4.0.tar.bz2.
===> Extracting for php-mbstring-4.4.0nb1
===> Required installed package php-4.4.*: php-4.4.0nb2 found
===> Required installed package php>=4.4.0: php-4.4.0nb2 found
===> Required installed package libtool-base>=1.5.18nb5: libtool-base-1.5.18nb5 
found
===> Required installed package automake>=1.9: automake-1.9.6 found
===> Required installed package autoconf>=2.58: autoconf-2.59nb2 found
===> Required installed package patch>=2.2: patch-2.5.4nb2 found
===> Required installed package gcc3-c>=3.3.5: gcc3-c-3.3.5 found
===> Patching for php-mbstring-4.4.0nb1
cd /export/scratch/pkgsrc/misc/php-mbstring/work/php-4.4.0/ext/mbstring;  for p 
in `/usr/xpg4/bin/grep -E -l '^\+\+\+ ext/mbstring/' 
/usr/pkgsrc/misc/php-mbstring/../../www/php4/patches/patch-*`;do 
/usr/pkg/bin/nbsed -e 's,^+++ ext/mbstring/,+++ ,' $p | /usr/pkg/bin/gpatch;  
done
can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $
|
|--- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig  2005-10-16 14:09:17.000000000 
+0200
|+++ libmbfl/mbfl/mbfilter.c    2005-10-16 14:09:21.000000000 +0200
--------------------------
File to patch: ^C


>How-To-Repeat:
cd /usr/pkgsrc/misc/php-mbstring && bmake

>Fix: