aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.apache.mk4
-rw-r--r--UPDATING10
2 files changed, 12 insertions, 2 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index efff0c863328..b085b416a6e9 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -83,8 +83,8 @@
Apache_Pre_Include= bsd.apache.mk
-DEFAULT_APACHE_VERSION= 13
-APACHE_SUPPORTED_VERSION= 13 20 22 # preferred version first
+DEFAULT_APACHE_VERSION= 22
+APACHE_SUPPORTED_VERSION= 22 13 20 # preferred version first
# Print warnings
_ERROR_MSG= : Error from bsd.apache.mk.
diff --git a/UPDATING b/UPDATING
index 788d51d9ddd2..2724b166f928 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20110820:
+ AFFECTS: users of www/apache* and depending ports
+ AUTHOR: ohauer@FreeBSD.org
+
+ The default apache version changed from www/apache13 to www/apache22.
+ Users who will continue with apache13 should create the following entry
+ in /etc/make.conf
+
+ APACHE_PORT= www/apache13
+
20110818:
AFFECTS: users of mail/enigmail-* ports
AUTHOR: ale@FreeBSD.org