svn commit: r361691 - in head: Mk www/apache22 www/apache22/files

[Olli Hauer]

Author: ohauer
Date: Sun Jul 13 15:58:45 2014
New Revision: 361691
URL: http://svnweb.freebsd.org/changeset/ports/361691
QAT: https://qat.redports.org/buildarchive/r361691/

Log:
  - reflect new preferred apache version

Modified:
  head/Mk/bsd.apache.mk
  head/www/apache22/Makefile
  head/www/apache22/files/HEADS_UP
  head/www/apache22/pkg-message

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sun Jul 13 15:56:23 2014	(r361690)
+++ head/Mk/bsd.apache.mk	Sun Jul 13 15:58:45 2014	(r361691)
@@ -84,7 +84,7 @@ WARNING+=	"DEFAULT_APACHE_VER is defined
 .endif
 
 DEFAULT_APACHE_VERSION?=	${APACHE_DEFAULT:S/.//}
-APACHE_SUPPORTED_VERSION=	22 24 # preferred version first
+APACHE_SUPPORTED_VERSION=	24 22 # preferred version first
 
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.

Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile	Sun Jul 13 15:56:23 2014	(r361690)
+++ head/www/apache22/Makefile	Sun Jul 13 15:58:45 2014	(r361691)
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache22
 PORTVERSION=	2.2.27
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}

Modified: head/www/apache22/files/HEADS_UP
==============================================================================
--- head/www/apache22/files/HEADS_UP	Sun Jul 13 15:56:23 2014	(r361690)
+++ head/www/apache22/files/HEADS_UP	Sun Jul 13 15:58:45 2014	(r361691)
@@ -1,13 +1,13 @@
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                       H E A D S - U P
-2014-07-11:
-  The default version will change from www/apache22 to www/apache24,
+2014-07-13:
+  The default version was changed from www/apache22 to www/apache24,
   pre-build apache modules will also reflect this!
 
   In case ports are build by yourself and apache22 is required
   use the following command to keep apache22 as default
 
-  echo "APACHE_DEFAULT=2.2" >> /etc/make.conf
+  echo "DEFAULT_VERSIONS+=apache=2.2" >> /etc/make.conf
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Modified: head/www/apache22/pkg-message
==============================================================================
--- head/www/apache22/pkg-message	Sun Jul 13 15:56:23 2014	(r361690)
+++ head/www/apache22/pkg-message	Sun Jul 13 15:58:45 2014	(r361691)
@@ -7,13 +7,13 @@ have issues starting depending on the mo
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                       H E A D S - U P
-2014-07-11:
-  The default version will change from www/apache22 to www/apache24,
+2014-07-13:
+  The default version was changed from www/apache22 to www/apache24,
   pre-build apache modules will also reflect this!
 
   In case ports are build by yourself and apache22 is required
   use the following command to keep apache22 as default
 
-  echo "APACHE_DEFAULT=2.2" >> /etc/make.conf
+  echo "DEFAULT_VERSIONS+=apache=2.2" >> /etc/make.conf
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!