- www/apache22 depends on devel/apr1

- www/apache20 depends on devel/apr0
  which previously had some CONFLICTS
  portmaster/portupgrade will have issues with this due to ordering
  ordering

  document an upgrade path: delete, move, reinstall, update

Discussed with: cperciva on #bsdports

1 files changed, 14 insertions, 1 deletions

diff --git a/UPDATING b/UPDATING
index 1db5b99f2e05..88fe194c1dea 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,11 +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.
 
 20100518:
-  AFFECTS: users of devel/apr
+  AFFECTS: users of devel/apr0, devel/apr1, www/apache20, www/apache22
   AUTHOR: pgollucci@FreeBSD.org
 
   devel/apr has been renamed to devel/apr1
 
+  WITH_APR_FROM_PORTS=yes for www/apache22 has been dissolved and
+  may be removed from your configs. devel/apr1 is always used now.
+
+  Please manually delete apache-2.\* if installed _before_ updating using either
+  portmaster or portupgrade.  
+
+    # pkg_deinstall -f apache-2.\*
+
   If you use portmaster:
 
     portmaster -o devel/apr1 devel/apr
@@ -19,6 +27,11 @@ you update your ports collection, before attempting any port upgrades.
 
     portupgrade -f -o devel/apr1 devel/apr
 
+  Finally re-install apache if you deleted it earlier and update ports as usual.
+  (where XX is either 20 or 22)
+
+    portinstall www/apacheXX
+
 20100512:
   AFFECTS: users of www/apache20
   AUTHOR: pgollucci@FreeBSD.org