On Friday, 22 September 2017 20:29:03 Russell Haley wrote: > On Fri, Sep 22, 2017 at 7:01 PM, Russell Haley <russ.ha...@gmail.com> wrote: > > On Thu, Sep 21, 2017 at 1:20 PM, David Naylor <naylor.b.da...@gmail.com> wrote: > >> Hi > >> > >> A quick update on the update to mono5. In theory everything should be > >> working (i.e. mono, monodevelop, etc). > >> > >> A review has also been created (so you can access the patch). Please > >> test > >> it. > >> > >> https://reviews.freebsd.org/D12440 > > > > Hi David, > > > > I created a VM with fdb current and created a ports dir from svn under > > my user. I attempted to apply your patch file and part of it was > > rejected. It's most likely my error as I'm poor at patching. > > > > I haven't even looked it over yet, but I've got to run out for a bit. > > I'll check back later. Here is the output: > > > > Script started on Fri Sep 22 11:44:20 2017 > > > > russellh@fbd-12:~/ports % patch -p0 <../patches/D12440 > So I've failed to apply the patch. I've tried three times now so I'm > clearly doing something wrong or the patch is broken - which is > doubtful. These things are usually my fault. I'm just chasing my tail > trying to spot fix it and it means I haven't validated anything. I > have a ~/patches with the file and a ~/ports with er... the ports.I > tried: > > russellh@fbd-12:~/ports % patch -p0 <../patches/D12440 > and > russellh@fbd-12:~/ports % patch <../patches/D12440 > > There have been various issues. The makefile for mono has a rejected > chunk (see above), the files in the files/ directory weren't removed > (i.e. patch-mono_metadata_socket-io.c) and the /files patches don't > apply cleanly when I try to run the port. > > Any help would be grand. I've attached a svn diff of the ports dir in > case it's helpful?
Hi Apologies, mistakes abound for me :-(. The patch is broken against HEAD. I've since rebased against r450479 and updated the patch per Phabricator. Regards
signature.asc
Description: This is a digitally signed message part.