Re: pkg/44713, brokennes of GNU patch

[Aleksey Cheusov <cheusov%tut.by@localhost>]

On Fri, Dec 9, 2011 at 6:43 PM, Aleksey Cheusov <cheusov%tut.by@localhost> 
wrote:
> On Fri, Dec 9, 2011 at 6:24 PM, Joerg Sonnenberger
> <joerg%britannica.bec.de@localhost> wrote:
>> On Fri, Dec 09, 2011 at 04:59:42PM +0200, Aleksey Cheusov wrote:
>>> On Fri, Dec 9, 2011 at 5:40 PM, Joerg Sonnenberger
>>> <joerg%britannica.bec.de@localhost> wrote:
>>> > On Fri, Dec 09, 2011 at 05:36:18PM +0300, Aleksey Cheusov wrote:
>>> >> In order to solve this problem I'd like to enable devel/nbpatch
>>> >> unconditionally during bootstrap on Linux and Solaris.
>>> >> Then close pkg/44713.
>>> >
>>> > Don't. Just unset the tool on Linux, Solaris and Mac OS X.
>>>
>>> If you mean unsetting lines in tools/tools.*.mk, it doesn't work.
>>
>> I'm quite sure it does. Try "bmake show-depends VARNAME=BUILD_DEPENDS"
>> e.g. in devel/gmake, with and without commenting out the
>> TOOLS_PLATFORM.patch in tools.${OPSYS}.mk.

You are right. It didn't not work for me because I set TOOLS_PLATFORM.patch
in the file .sincluded from mk.conf. I forgot about that include.

Sorry for badly wrapped text in previous email.

New patch is below.


Index: mk/tools/tools.Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.Linux.mk,v
retrieving revision 1.47
diff -u -r1.47 tools.Linux.mk
--- mk/tools/tools.Linux.mk     13 Feb 2010 08:30:59 -0000      1.47
+++ mk/tools/tools.Linux.mk     9 Dec 2011 16:08:55 -0000
@@ -190,9 +190,7 @@
 .if exists(/usr/bin/openssl)
 TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 .endif
-.if exists(/usr/bin/patch)
-TOOLS_PLATFORM.patch?=         /usr/bin/patch
-.endif
+TOOLS_PLATFORM.patch?=         # pkgsrc version will be used
 .if exists(/usr/bin/printf)
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
 .endif