Index: Mk/bsd.apache.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.apache.mk,v
retrieving revision 1.26
diff -u -r1.26 bsd.apache.mk
--- Mk/bsd.apache.mk	7 Jun 2010 14:38:44 -0000	1.26
+++ Mk/bsd.apache.mk	7 Jan 2011 20:21:58 -0000
@@ -19,12 +19,14 @@
 
 Apache_Pre_Include=		bsd.apache.mk
 
+DEFAULT_APACHE_VERSION=	22
+
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.
 APACHE_SUPPORTED_VERSION=	13 20 22
 .if ${USE_APACHE:Mcommon*} != ""
 AP_PORT_IS_SERVER=	YES
-.elif ${USE_APACHE:C/\.//:C/\+//:M[12][320]} != ""
+.elif ${USE_APACHE:C/\.//:C/\+//:S/^13//:S/^20//:S/^22//:S/^24//} == ""
 AP_PORT_IS_MODULE=	YES
 .else
 IGNORE=		${_ERROR_MSG} Illegal use of USE_APACHE
@@ -259,8 +261,12 @@
 .else
 AP_CUR_VERSION=	none
 .   if !defined(APACHE_PORT)
-#Fallback to smallest version...
+#		If we found '13+' or '20+' make apache22 the default
+.		if ${USE_APACHE:C/\.//:S/^13//:S/^20//:C/\+/PLUS/} == "PLUS" 
+APACHE_VERSION=	${DEFAULT_APACHE_VERSION}
+.		else
 APACHE_VERSION=	${AP_VERSION:C/\+//}
+.		endif
 .   endif
 .endif