Add entries for the merge of the mkisofs ports into the cdrtools ports.

Based upon submission by:	marius

2 files changed, 15 insertions, 0 deletions

diff --git a/MOVED b/MOVED
index 2dae3c70805f..5e9b7386280f 100644
--- a/MOVED
+++ b/MOVED
@@ -1132,3 +1132,5 @@ x11-toolkits/gtk-qt-engine|x11-themes/gtk-qt-engine|2004-06-02|new category
 x11-toolkits/gtkbe|x11-themes/gtkbe|2004-06-02|new category
 x11-toolkits/gtkstep|x11-themes/gtkstep|2004-06-02|new category
 x11-toolkits/gtkstep-pastel|x11-themes/gtkstep-pastel|2004-06-02|new category
+sysutils/mkisofs|sysutils/cdrtools|2004-06-02|merged
+sysutils/mkisofs-devel|sysutils/cdrtools-devel|2004-06-02|merged
diff --git a/UPDATING b/UPDATING
index beb6994ac978..d54ab83db163 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20040602:
+  AFFECTS: users of sysutils/mkisofs and sysutils/mkisofs-devel
+
+  sysutils/mkisofs and sysutils/mkisofs-devel were merged into
+  sysutils/cdrtools and sysutils/cdrtools-devel respectively.
+
+  To update them generate ("make index") or fetch ("make fetchindex") a
+  new INDEX/INDEX-5. Run "pkgdb -F" and unregister the mkisofs/-devel
+  port. Then forcefully update the cdrtools port and all of its
+  dependencies (e.g. "portupgrade -rf cdrtools"). After the update
+  it may be necessary to rerun "pkgdb -F" and resolve a stale
+  dependency to cdrtools.
+
 20040531:
   AFFECTS: users of lang/perl5.8