diff --git a/zenmap/install_scripts/macosx/README b/zenmap/install_scripts/macosx/README index 1833eb081..7dfb9330e 100644 --- a/zenmap/install_scripts/macosx/README +++ b/zenmap/install_scripts/macosx/README @@ -81,7 +81,12 @@ changes. First, sync the original ports tree. $PREFIX/bin/port selfupdate -v Restore a pristine partial ports tree: cd $PREFIX + # rsync handles deleting deleted files, but can't pick up new ones like this... rsync -rv --existing --delete --exclude=PortIndex ports.orig/ ports/ + # ...so we copy everything over again. + for x in archivers/xz editors/vim devel/apr-util devel/atk devel/gettext devel/glib2 gnome/gtk2 graphics/fontconfig graphics/gdk-pixbuf2 mail/libidn perl/p5-locale-gettext python/py-gobject python/py-libxml2 textproc/help2man textproc/libxml2 textproc/libxslt x11/pango; do + cp -R ports.orig/$x ports/$(dirname $x); + done Reapply the patch. Resolve any conflicts. patch -p0 --no-backup-if-mismatch < MacPorts-ports.diff Make a new patch.