From owner-svn-ports-head@FreeBSD.ORG  Sun Sep  7 15:58:06 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B293D8E;
 Sun,  7 Sep 2014 15:58:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EBBB015B2;
 Sun,  7 Sep 2014 15:58:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87Fw5V3056441;
 Sun, 7 Sep 2014 15:58:05 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87Fw5q7056440;
 Sun, 7 Sep 2014 15:58:05 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201409071558.s87Fw5q7056440@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ohauer set sender to
 ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 7 Sep 2014 15:58:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367561 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Sep 2014 15:58:06 -0000

Author: ohauer
Date: Sun Sep  7 15:58:05 2014
New Revision: 367561
URL: http://svnweb.freebsd.org/changeset/ports/367561
QAT: https://qat.redports.org/buildarchive/r367561/

Log:
  - fix build for ports defining USE_APACHE=22, USE_APACHE_(BUILD|RUN)=22
  
  spotted by adam@

Modified:
  head/Mk/bsd.apache.mk

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sun Sep  7 15:56:30 2014	(r367560)
+++ head/Mk/bsd.apache.mk	Sun Sep  7 15:58:05 2014	(r367561)
@@ -288,8 +288,9 @@ APACHE_MPM!=		${APXS} -q MPM_NAME
 .	endif
 .elif defined(APACHE_PORT)
 _APACHE_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
-.else
-_APACHE_VERSION:=	${DEFAULT_APACHE_VERSION}
+#.else
+# the next line breaks ports with USE_APACHE(_RUN|_BUILD)=22
+#_APACHE_VERSION:=	${DEFAULT_APACHE_VERSION}
 .endif
 
 .if defined(USE_APACHE)