From nobody@FreeBSD.org  Sat Jul 20 19:20:13 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id C8B6712F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Jul 2013 19:20:13 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id BAB1B112
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Jul 2013 19:20:13 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r6KJKDMK057497
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 20 Jul 2013 19:20:13 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r6KJKDYb057436;
	Sat, 20 Jul 2013 19:20:13 GMT
	(envelope-from nobody)
Message-Id: <201307201920.r6KJKDYb057436@oldred.freebsd.org>
Date: Sat, 20 Jul 2013 19:20:13 GMT
From: Rene Ladan <rene@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: patching a file with both EXTRA_PATHES and files/patch-* fails
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180705
>Category:       ports
>Synopsis:       [bsd.port.mk] patching a file with both EXTRA_PATCHES and files/patch-* fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>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:  Sat Jul 20 21:09:38 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Jul 20 21:09:14 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180705 
>Unformatted:
