MOVED/UPDATING: Improve cmake-modules entries

Clarify the wording around the devel/cmake-modules deletion (merge into
devel/cmake), and provide explicit instructions for users on how to
proceed.

PR:             222000

2 files changed, 10 insertions, 6 deletions

diff --git a/MOVED b/MOVED
index 2bb4c7f76f47..80996b6ec34a 100644
--- a/MOVED
+++ b/MOVED
@@ -9544,6 +9544,6 @@ devel/py33-setuptools||2017-09-03|Removed, please update to Python 3.6
 x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6
 devel/py3-enum34||2017-09-03|Removed, Python 3.3 only
 security/clambc||2017-09-14|Has expired: Practically unmaintained, featuring issues elsewhere solved 6 years ago
-devel/cmake-modules||2017-09-14|Merged with devel/cmake
+devel/cmake-modules||2017-09-14|Deleted, merged into devel/cmake
 devel/cargo|lang/rust|2017-09-15|Merged with lang/rust
 sysutils/filelight-kde4|sysutils/filelight|2017-09-16|Renamed to sysutils/filelight
diff --git a/UPDATING b/UPDATING
index 2878f43033e8..30d254e10b69 100644
--- a/UPDATING
+++ b/UPDATING
@@ -13,14 +13,18 @@ you update your ports collection, before attempting any port upgrades.
   devel/cargo was merged into lang/rust.
 
 20170914:
-  AFFECTS: users of CMake
+  AFFECTS: users of CMake & CMake Modules
   AUTHOR: adridg@freebsd.org
 
-  The ports devel/cmake and devel/cmake-modules have been merged into
-  devel/cmake. The benefit of being able to update the modules without
-  the binary is outweighed by the issues caused by having the binary
-  out-of-sync with the modules.
+  The devel/cmake-modules port has been merged into devel/cmake.
 
+  The benefit of being able to update the modules without the binary
+  is outweighed by the issues caused by having the binary out-of-sync
+  with the modules.
+
+  Users should delete the devel/cmake-modules package and then
+  upgrade or reinstall devel/cmake.
+ 
   All ports have been updated to depend only on CMake.
 
 20170904