Mk/bsd.apache.mk: [patch] default to www/apache22

[Philip M. Gollucci]

>Submitter-Id:	current-users
>Originator:	Philip M. Gollucci
>Organization:	RideCharge Inc.
>Confidential:	no 
>Synopsis:	Mk/bsd.apache.mk: [patch] default to www/apache22
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		maintainer-update
>Release:	FreeBSD 9.0-CURRENT amd64
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010 root at frieza.p6m7g8.net:/usr/obj/usr/src/sys/FRIEZA amd64
>Description:
Default 'APACHE_PORT' to www/apache22!

Roughly 308 ports depend on apache in the default builds
Roughly 1276 ports optionally depend on apache usually grandfather deps
Roughly 142 of them are mod_ ports

  76 USE_APACHE= 13
  70 USE_APACHE= 20+
  47 USE_APACHE= 13+
  11 USE_APACHE= 22+
   9 USE_APACHE= 20
   7 USE_APACHE= 22

$ ip INDEX-9 lrdep apache-[^a] M |xargs grep USE_APACHE= |sed -e 's,.*:,,' -e 's,\?,,' -e 's,=,= ,' -e 's,\.,,' |perl -pi -e 's,\s+, ,' |sort |uniq -c |sort -nr

>How-To-Repeat:
>Fix:
--- apache22.diff begins here ---
Index: bsd.apache.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.apache.mk,v
retrieving revision 1.25
diff -u -r1.25 bsd.apache.mk
--- bsd.apache.mk	25 May 2010 20:59:42 -0000	1.25
+++ bsd.apache.mk	26 May 2010 03:41:05 -0000
@@ -257,8 +257,14 @@
 .else
 AP_CUR_VERSION=	none
 .   if !defined(APACHE_PORT)
-#Fallback to smallest version...
+## If nothing is set, Default to www/apache22
+_plus!=	${ECHO_CMD} "${AP_VERSION}+" | ${GREP} -c "+" 2>/dev/null
+.		if ${_plus} == 2
+APACHE_VERSION=	22
+.		else
+# Use exactly specified version in Makefile
 APACHE_VERSION=	${AP_VERSION:C/\+//}
+.		endif
 .   endif
 .endif
 
--- apache22.diff ends here ---