[Bug 283861] OCaml update D48228

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283861

Eygene Ryabinkin <rea@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|New                         |In Progress
                 CC|                            |rea@FreeBSD.org
           Assignee|ports-bugs@FreeBSD.org      |rea@FreeBSD.org

--- Comment #3 from Eygene Ryabinkin <rea@FreeBSD.org> ---
Had tried to apply the latest diff from the Phabricator D48228,
 
https://reviews.freebsd.org/file/data/hdaxva3myulcrlmgoyb6/PHID-FILE-cofby45heskbnwcfh3va/D48228.diff

Have rejections for these files:
{{{
./devel/ocaml-calendar/Makefile.rej
./devel/ocaml-calendar/distinfo.rej
./devel/ocaml-extlib/Makefile.rej
./devel/ocaml-lacaml/Makefile.rej
./devel/ocaml-lwt/Makefile.rej
./devel/ocaml-parmap/Makefile.rej
./devel/ocaml-pcre/Makefile.rej
./devel/ocaml-react/Makefile.rej
./math/ocamlgsl/Makefile.rej
./textproc/ocaml-text/Makefile.rej
}}}

devel/ocaml-calendar was updated to 2.04 recently:
https://cgit.freebsd.org/ports/commit?id=edd0e13e73667f04b36b0e9a658f0095b5686da5

Other rejections are due to mismatch of diff hunks from Phabricator and the
current ports tree.

So, a diff in a 'git format-patch' format, rebased to the current tip of the
ports tree will be very helpful.


And my intention (I'll take this PR) would be to try to split the large code
drop into more manageable pieces, unless there are some serious technical
obstacles to this.

For example, I see that WASH was removed from Uses/ocaml.mk and two ports --
x11-toolkits/ocaml-lablgtk2 and archivers/ocaml-zip (the above-mentioned patch
from Phabricator is missing hunks for archivers/ocaml-zip/Makefile that remove
wash, by the way): it would be a perfect patch that can be committed alone (if
I am not missing anything here).  Changes like USE_GITHUB -> MASTER_SITES can
also be grouped together, but split from other modifications.

Otherwise, I fear, the whole large patch makes too many changes at once and (as
the example of update for devel/ocaml-calendar) aims at the moving target: not
a very manageable thing, in my view.

Anyway, a git-formatted patch will be rather helpful for me: I'll try to split
the changes into the pieces myself (reviewing the changes along the way) and
see what comes up.  But if you see something that will prevent such a split --
please, say so.

Thank you for your work and patience ;)

-- 
You are receiving this mail because:
You are the assignee for the bug.