ports/180705: patching a file with both EXTRA_PATHES and files/patch-* fails

[Rene Ladan]

>Number:         180705
>Category:       ports
>Synopsis:       patching a file with both EXTRA_PATHES and files/patch-* fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 20 19:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Rene Ladan
>Release:        FreeBSD 9.1-amd64
>Organization:
>Environment:
FreeBSD 9.1-amd64
Ports Tree 2013-07-20
>Description:
When there is a file to patch in WRKSRC for which both a patch in EXTRA_PATCHES and a patch in files/patch-* exists, only the latter gets applied.

'make patch' claims to patch both but somehow skips the former, no error is shown.

Files in WRKSRC for which either a patch in EXTRA_PATCHES or a patch in files/patch-* exists get patched correctly.
>How-To-Repeat:
git clone https://github.com/gliaskos/freebsd-chromium.git
cd freebsd-chromium/www/chromium
make config -> deselect CLANG
make patch
cd `make -V WRKSRC`
diff -u base/sys_info_freebsd.cc.orig base/sys_info_freebsd.cc

Now files/patch-base__sys_info_freebsd.cc is applied, but the correspoding chunk from files/extra-patch-gcc is not.
>Fix:
Unknown

>Release-Note:
>Audit-Trail:
>Unformatted: