From 8f38efc632a8be0931e526fd389b5c9942ac97da Mon Sep 17 00:00:00 2001 From: jrmarino Date: Wed, 22 Aug 2018 16:29:54 +0000 Subject: [PATCH] --- docs/howtos/HowToDPorts/index.mdwn | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/howtos/HowToDPorts/index.mdwn b/docs/howtos/HowToDPorts/index.mdwn index d9099ea8..b263e248 100644 --- a/docs/howtos/HowToDPorts/index.mdwn +++ b/docs/howtos/HowToDPorts/index.mdwn @@ -379,4 +379,17 @@ Repeat cycle until every diff patch applies. # make merge-purge # make merge -This takes several minutes. +This takes several minutes. During the merge, you will almost certainly see ports fail to sync due to that port utilizing a "diff" against the freebsd which has changed since the last sync. Take note of all failed ports. If you lost that information, you can execute "make reject-list" command to see which ports failed to merge. + +Each port has to be fixed before continuing. The general process for doing this is: + + # su automaton + # cd ~/Deltaports/ports// + (assuming that the Makefile diff failed to apply in this example): + # cp /usr/ports///Makefile . + # dupe Makefile + # modify Makefile accordingly (see diffs/Makefile.diff) + # genpatch Makefile > diffs/Makefile.diff + # exit + # ./sync / + (if the sync command has no output, then the fix was good) -- 2.41.0