From owner-freebsd-apache@FreeBSD.ORG Wed May 26 04:11:11 2010 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25E41106566C; Wed, 26 May 2010 04:11:11 +0000 (UTC) (envelope-from pgollucci@frieza.p6m7g8.net) Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) by mx1.freebsd.org (Postfix) with ESMTP id D6C9A8FC0A; Wed, 26 May 2010 04:11:10 +0000 (UTC) Received: from frieza.p6m7g8.net (localhost [127.0.0.1]) by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o4Q4B9cB027515; Wed, 26 May 2010 00:11:09 -0400 (EDT) (envelope-from pgollucci@frieza.p6m7g8.net) Received: (from pgollucci@localhost) by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o4Q4B9Iq027495; Wed, 26 May 2010 00:11:09 -0400 (EDT) (envelope-from pgollucci) Date: Wed, 26 May 2010 00:11:09 -0400 (EDT) Message-Id: <201005260411.o4Q4B9Iq027495@frieza.p6m7g8.net> To: FreeBSD-gnats-submit@freebsd.org From: "Philip M. Gollucci" X-send-pr-version: 3.113 X-GNATS-Notify: Cc: apache@freebsd.org Subject: Mk/bsd.apache.mk: [patch] default to www/apache22 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Philip M. Gollucci" List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2010 04:11:11 -0000 >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@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 ---