From: jrmarino <jrmarino@web>
Date: Wed, 22 Aug 2018 16:33:27 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://gitweb.dragonflybsd.org/ikiwiki.git/commitdiff_plain/14b2a4540c545c042435f386dbb0e7a41365f9b2

---

diff --git a/docs/howtos/HowToDPorts/index.mdwn b/docs/howtos/HowToDPorts/index.mdwn
index b263e248..360f3600 100644
--- a/docs/howtos/HowToDPorts/index.mdwn
+++ b/docs/howtos/HowToDPorts/index.mdwn
@@ -383,13 +383,22 @@ This takes several minutes.  During the merge, you will almost certainly see por
 
 Each port has to be fixed before continuing.  The general process for doing this is:
 
-   # su automaton
-   # cd ~/Deltaports/ports/<category>/<portname>
-     (assuming that the Makefile diff failed to apply in this example):
-   # cp /usr/ports/<category>/<portname>/Makefile .
-   # dupe Makefile
-   # modify Makefile accordingly (see diffs/Makefile.diff)
-   # genpatch Makefile > diffs/Makefile.diff
-   # exit
-   # ./sync <category>/<portname>
-     (if the sync command has no output, then the fix was good)
+    # su automaton
+    # cd ~/Deltaports/ports/<category>/<portname>
+      (assuming that the Makefile diff failed to apply in this example):
+    # cp /usr/ports/<category>/<portname>/Makefile .
+    # dupe Makefile
+    # modify Makefile accordingly (see diffs/Makefile.diff)
+    # genpatch Makefile > diffs/Makefile.diff
+    # exit
+    # ./sync <category>/<portname>
+      (if the sync command has no output, then the fix was good)
+
+## Finish merge
+
+    # make rsync-tree
+
+## Remove dports where the freebsd ports have been removed
+
+    # make prune-confirm
+