Re: patch -p broken on HEAD?

On 01 Dec 2013, at 19:20, Mikhail T. <mi+thun_at_aldan.algebra.com> wrote:
> On 30.11.2013 13:24, pkg-fallout_at_FreeBSD.org wrote:
>> ===>  Applying FreeBSD patches for xmdiary-3.0.3_3
>> removing the malloc.h includes
>> /bin/sh /usr/ports/deskutils/xmdiary/scripts/nomalloc /wrkdirs/usr/ports/deskutils/xmdiary/work/xmdiary-3.0.3 2>&1 > /dev/zero
>> patch: option requires an argument -- p
>> usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
>>             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
>>             [-r rej-name] [-V t | nil | never] [-x number] [-z backup-ext]
>>             [--posix] [origfile [patchfile]]
>>       patch <patchfile
>> patch: option requires an argument -- p
> It looks like the -p option can no longer be given to patch(1) by
> itself. Is this deliberate? Thanks,

I think so, yes.  It was removed 10 years ago from OpenBSD's patch:

http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/patch/patch.c#rev1.34

'Historically, patch would treat a bare -p as -p0.  This contradicts
POSIX and GNU patch has also removed this, so we will too.  No
objections on icb (no one even seemed to know about this "feature").'

Just add -p0, and you should be fine.

-Dimitry