From owner-svn-ports-all@FreeBSD.ORG Mon Jul 23 21:19:53 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 140D1106564A; Mon, 23 Jul 2012 21:19:53 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F21688FC18; Mon, 23 Jul 2012 21:19:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6NLJqFW050925; Mon, 23 Jul 2012 21:19:52 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6NLJqR4050922; Mon, 23 Jul 2012 21:19:52 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201207232119.q6NLJqR4050922@svn.freebsd.org> From: Olli Hauer Date: Mon, 23 Jul 2012 21:19:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301415 - head/Mk X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2012 21:19:53 -0000 Author: ohauer Date: Mon Jul 23 21:19:52 2012 New Revision: 301415 URL: http://svn.freebsd.org/changeset/ports/301415 Log: - remove old apache13 parts with hat apache@ Modified: head/Mk/bsd.apache.mk Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Mon Jul 23 21:14:48 2012 (r301414) +++ head/Mk/bsd.apache.mk Mon Jul 23 21:19:52 2012 (r301415) @@ -120,6 +120,7 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE IGNORE= Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} .endif +# used by www/cakeph* ports .if defined(SLAVE_PORT_MODULES) DEFAULT_MODULES_CATEGORIES+= SLAVE_PORT ALL_MODULES_CATEGORIES+= SLAVE_PORT @@ -142,9 +143,7 @@ ${module}_PLIST_SUB= "@comment " # Configure # dirty hacks to make sure all modules are disabled before we select them -.if ${USE_APACHE} == common13 -CONFIGURE_ARGS+= --disable-module="all" -.elif ${USE_APACHE} == common20 +.if ${USE_APACHE} == common20 CONFIGURE_ARGS+= --disable-access --disable-auth \ --disable-charset-lite --disable-include \ --disable-log-config --disable-env --disable-setenvif \ @@ -212,10 +211,7 @@ WITH_ALL_STATIC_MODULES= YES .endif .if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) -. if ${USE_APACHE} == common13 -SUEXEC_CONFARGS= suexec -CONFIGURE_ARGS+= --enable-suexec -. elif ${USE_APACHE:Mcommon2*} != "" +. if ${USE_APACHE:Mcommon2*} != "" _APACHE_MODULES+= ${SUEXEC_MODULES} SUEXEC_CONFARGS= with-suexec . endif @@ -255,13 +251,8 @@ APACHE_MODULES!= \ .endif .if defined(WITH_STATIC_MODULES) -. if ${USE_APACHE} == common13 -STATIC_MODULE_CONFARG= --enable-module=$${module} -DSO_MODULE_CONFARG= --enable-module=$${module} --enable-shared=$${module} -. else STATIC_MODULE_CONFARG= --enable-$${module} DSO_MODULE_CONFARG= --enable-$${module}=shared -. endif _CONFIGURE_ARGS!= \ for module in ${APACHE_MODULES} ; do \ ${ECHO_CMD} ${WITH_STATIC_MODULES} | \ @@ -274,21 +265,9 @@ _CONFIGURE_ARGS!= \ CONFIGURE_ARGS+= ${_CONFIGURE_ARGS} .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES) WITH_STATIC_MODULES= ${APACHE_MODULES} -. if ${USE_APACHE} == common13 -. for module in ${APACHE_MODULES} -CONFIGURE_ARGS+= --enable-module=${module} -. endfor -. else CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}" -. endif .else -. if ${USE_APACHE} == common13 -. for module in ${APACHE_MODULES} -CONFIGURE_ARGS+= --enable-module=${module} --enable-shared=${module} -. endfor -. else CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES}" -. endif .endif .if defined(WITH_STATIC_MODULES) @@ -322,7 +301,10 @@ SRC_FILE?= ${MODULENAME}.c .if exists(${HTTPD}) _APACHE_VERSION!= ${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p' -. if ${_APACHE_VERSION} > 13 +# Apache 2.4 and onwards doesn't require linking the MPM module +# directly in the httpd binary anymore. APXS lost the MPM_NAME query, +# so we can't assume a given MPM anymore. +. if ${_APACHE_VERSION} <= 22 APACHE_MPM!= ${APXS} -q MPM_NAME . endif .elif defined(APACHE_PORT) @@ -389,12 +371,6 @@ APACHEMODDIR= libexec/apache${APACHE_VER APACHEINCLUDEDIR=include/apache${APACHE_VERSION} APACHEETCDIR= etc/apache${APACHE_VERSION} APACHE_PORT?= www/apache${APACHE_VERSION} -.else -AP_BUILDEXT= so -APACHEMODDIR= libexec/apache -APACHEINCLUDEDIR=include/apache -APACHEETCDIR= etc/apache -APACHE_PORT?= www/apache13 .endif PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \