Date: Mon, 15 May 2017 23:19:36 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: freebsd-current@freebsd.org Cc: bapt@FreeBSD.org, alexander@wittig.name Subject: Re: ports-mgmt/pkg_rmleaves stops working properly on -head after bsdiff became default diff (r317209) Message-ID: <20170515231936.9aba0763a8eef73f64ced0c1@dec.sakura.ne.jp> In-Reply-To: <20170514160355.5da31fb2f3c8a163e024acdf@dec.sakura.ne.jp> References: <20170514160355.5da31fb2f3c8a163e024acdf@dec.sakura.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Mon__15_May_2017_23_19_36_+0900_1DgCE4km7A6rwgdD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Revised like Boris did for misc/mc [1]. Now attached raw Makefile and patch (renamed), as patch does not handle new files on nonexistent files directory. :-( PORTREVISION bumped, as this port is small enough and NO_BUILD, and need updating for recent -head. But at least 2 ports is affected for now, and possibly more. IMHO, these Gnu diff compatible group-format related options would be worth implemented by bsdiff. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219277 On Sun, 14 May 2017 16:03:55 +0900 Tomoaki AOKI <junchoon@dec.sakura.ne.jp> wrote: > Hi. > Posting on freebsd-current as this only affects -head. > > I recently noticed ports-mgmt/pkg_rmleaves failes to process > new leaf ports after removal of leaf ports on -head with error > messages below. > > > diff: unrecognized option `--unchanged-line-format=' > > usage: diff [-abdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case] > > [--no-ignore-case] [--normal] [--strip-trailing-cr] > > [--tabsize] [-I pattern] [-L label] file1 file2 > > diff [-abdilpTtw] [-I pattern] [-L label] [--ignore-case] > > [--no-ignore-case] [--normal] [--strip-trailing-cr] > > [--tabsize] -C number file1 file2 > > diff [-abdiltw] [-I pattern] [--ignore-case] [--no-ignore-case] > > [--normal] [--strip-trailing-cr] [--tabsize] -D string > > file1 file2 diff [-abdilpTtw] [-I pattern] [-L label] [--ignore-case] > > [--no-ignore-case] [--normal] [--tabsize] > > [--strip-trailing-cr] -U number file1 file2 > > diff [-abdilNPprsTtw] [-c | -e | -f | -n | -q | -u] > > [--ignore-case] [--no-ignore-case] [--normal] [--tabsize] [-I pattern] > > [-L label] [-S name] [-X file] [-x pattern] dir1 dir2 > > stable/11 was OK, and the difference is that stable/11 has gnu diff > as diff, while -head has bsdiff as diff. > > There's 2 (or possibly 3) options. > > a) Let pkg_rmleaves use gnu diff via textprocs/diffutils. > This is easiest (Minimal diff is attached), but doesn't help > any other ports affected. Just change diff to gdiff and RUN_DEPENDS > on textproc/diffutils. > > b) Update bsdiff to support missing options below. > This is over my hand, but if possible, would help others. > > c) If the missing options below are implemented as different > (non-documented) options on bsdiff, use them for bsdiff instead. > Will need OSVERSION check in ports Makefile. > > Please note that attached diff is really MINIMAL to work on -head. > No OSVERSION switching is implemented and no bumps so forcibly > installs textproc/diffutils on revisions with gnu diff is /usr/bin/diff. > And patch wouldn't work properly as files directory doesn't exist > in pkg-mgmt/pkg_rmleaves. (At least system patch.) > > I wonder which option should be taken, so not yet filed PR on bugzilla. > It should be filed differently with which option is taken. > > -- > Tomoaki AOKI <junchoon@dec.sakura.ne.jp> -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp> --Multipart=_Mon__15_May_2017_23_19_36_+0900_1DgCE4km7A6rwgdD Content-Type: application/octet-stream; name="Makefile" Content-Disposition: attachment; filename="Makefile" Content-Transfer-Encoding: base64 IyBDcmVhdGVkIGJ5OiBUaW1vdGh5IFJlZGFlbGxpIDxkcml6enRAZ3VmaS5vcmc+CiMgJEZyZWVC U0Q6IGhlYWQvcG9ydHMtbWdtdC9wa2dfcm1sZWF2ZXMvTWFrZWZpbGUgMzQ1Njg4IDIwMTQtMDIt MjMgMDE6NTE6MjRaIGpoYWxlICQKClBPUlROQU1FPQlwa2dfcm1sZWF2ZXMKUE9SVFZFUlNJT049 CTIwMTQwMjIyClBPUlRSRVZJU0lPTj0JMQpDQVRFR09SSUVTPQlwb3J0cy1tZ210Ck1BU1RFUl9T SVRFUz0JaHR0cDovL2FsZXgud2l0dGlnLm5hbWUvJHtQT1JUTkFNRX0vCgpNQUlOVEFJTkVSPQlh bGV4YW5kZXJAd2l0dGlnLm5hbWUKQ09NTUVOVD0JSW50ZXJhY3RpdmUgc2NyaXB0IGZvciBkZWlu c3RhbGxpbmcgbGVhZiBwYWNrYWdlcwoKTElDRU5TRT0JQlNEMkNMQVVTRQoKLmluY2x1ZGUgPGJz ZC5wb3J0LnByZS5taz4KCi5pZiAke09QU1lTfSA9PSBGcmVlQlNEICYmICR7T1NWRVJTSU9OfSA+ PSAxMjAwMDMwClJVTl9ERVBFTkRTPQlnZGlmZjp0ZXh0cHJvYy9kaWZmdXRpbHMKCkVYVFJBX1BB VENIRVM9CSR7RklMRVNESVJ9L2V4dHJhLXBhdGNoLXBrZ19ybWxlYXZlcwouZW5kaWYKCk5PX0JV SUxEPQl5ZXMKCldSS1NSQz0JCSR7V1JLRElSfQoKUExJU1RfRklMRVM9CXNiaW4vcGtnX3JtbGVh dmVzIG1hbi9tYW4xL3BrZ19ybWxlYXZlcy4xLmd6Cgpkby1pbnN0YWxsOgoJJHtJTlNUQUxMX1ND UklQVH0gJHtXUktTUkN9L3BrZ19ybWxlYXZlcyAke1NUQUdFRElSfSR7UFJFRklYfS9zYmluL3Br Z19ybWxlYXZlcwoJJHtJTlNUQUxMX01BTn0gJHtXUktTUkN9L3BrZ19ybWxlYXZlcy4xICR7U1RB R0VESVJ9JHtNQU4xUFJFRklYfS9tYW4vbWFuMQoKLmluY2x1ZGUgPGJzZC5wb3J0LnBvc3QubWs+ Cg== --Multipart=_Mon__15_May_2017_23_19_36_+0900_1DgCE4km7A6rwgdD Content-Type: application/octet-stream; name="extra-patch-pkg_rmleaves" Content-Disposition: attachment; filename="extra-patch-pkg_rmleaves" Content-Transfer-Encoding: base64 LS0tIHBrZ19ybWxlYXZlcy5vcmlnCTIwMTQtMDItMjIgMjE6MjE6NDcuMDAwMDAwMDAwICswOTAw CisrKyBwa2dfcm1sZWF2ZXMJMjAxNy0wNS0xNCAwMjoxNjo1NS43NTE0NDMwMDAgKzA5MDAKQEAg LTc0LDcgKzc0LDcgQEAgY2hlY2tMZWFmcygpIHsKIAlmaSB8IHNvcnQgfCBzZWQgLWUgInkvXCIv Jy8iIC1lICdzLyMmcXVvdDsjLyIvZycgPiAiJFBLR0ZJTEUiCiAKIAlpZiBbIC1mICIkUFJFViIg XTsgdGhlbgotCQlkaWZmIC0tdW5jaGFuZ2VkLWxpbmUtZm9ybWF0PScnIC0tb2xkLWxpbmUtZm9y bWF0PScnIC0tbmV3LWxpbmUtZm9ybWF0PSclTCcgIiRQUkVWIiAiJFBLR0ZJTEUiID4gIiRUTVBG SUxFIgorCQlnZGlmZiAtLXVuY2hhbmdlZC1saW5lLWZvcm1hdD0nJyAtLW9sZC1saW5lLWZvcm1h dD0nJyAtLW5ldy1saW5lLWZvcm1hdD0nJUwnICIkUFJFViIgIiRQS0dGSUxFIiA+ICIkVE1QRklM RSIKIAllbHNlCiAJCWNwICIkUEtHRklMRSIgIiRUTVBGSUxFIgogCWZpCgo= --Multipart=_Mon__15_May_2017_23_19_36_+0900_1DgCE4km7A6rwgdD--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170515231936.9aba0763a8eef73f64ced0c1>