Date: Sun, 1 Dec 2013 19:56:34 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: "Mikhail T." <mi+thun@aldan.algebra.com> Cc: pkg-fallout@FreeBSD.org, Current FreeBSD <freebsd-current@FreeBSD.org> Subject: Re: patch -p broken on HEAD? Message-ID: <2D565D54-82B9-47DD-B52F-7C657D9129FC@FreeBSD.org> In-Reply-To: <529B7DE4.5030906@aldan.algebra.com> References: <201311301824.rAUIOg9S075512@beefy1.isc.freebsd.org> <529B7DE4.5030906@aldan.algebra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_0D17A4BD-1640-4508-8E4E-7390E5410401 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 01 Dec 2013, at 19:20, Mikhail T. <mi+thun@aldan.algebra.com> wrote: > On 30.11.2013 13:24, pkg-fallout@FreeBSD.org wrote: >> =3D=3D=3D> 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 --Apple-Mail=_0D17A4BD-1640-4508-8E4E-7390E5410401 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iEYEARECAAYFAlKbhmoACgkQsF6jCi4glqNmzQCfcUMBv9RSb7Zikm+BapoZ0pGl v58Amwf4NaGFTK7GkDuemcae6rwcwrrp =2vNg -----END PGP SIGNATURE----- --Apple-Mail=_0D17A4BD-1640-4508-8E4E-7390E5410401--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2D565D54-82B9-47DD-B52F-7C657D9129FC>