From owner-svn-ports-all@FreeBSD.ORG Sat Oct 4 10:53:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00BBDD0F; Sat, 4 Oct 2014 10:53:21 +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 D64951A1; Sat, 4 Oct 2014 10:53:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s94ArL4L077915; Sat, 4 Oct 2014 10:53:21 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s94ArLlC077914; Sat, 4 Oct 2014 10:53:21 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201410041053.s94ArLlC077914@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 4 Oct 2014 10:53:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369952 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sat, 04 Oct 2014 10:53:22 -0000 Author: ohauer Date: Sat Oct 4 10:53:21 2014 New Revision: 369952 URL: https://svnweb.freebsd.org/changeset/ports/369952 QAT: https://qat.redports.org/buildarchive/r369952/ Log: - fix documentation of user controlled parameters for usage in /etc/make.conf. APACHE_PORT should be used only in combination with "DEFAULT_VERSIONS+=apache2.2" - ripp AP_BUILDEXT, it is only used in bsd.apache.mk and not exported Modified: head/Mk/bsd.apache.mk Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Sat Oct 4 10:29:54 2014 (r369951) +++ head/Mk/bsd.apache.mk Sat Oct 4 10:53:21 2014 (r369952) @@ -7,18 +7,26 @@ # Please view me with 4 column tabs! # ========================================================================= -# Parameter APACHE_PORT (user controlled): +# User controlled parameters for usage in /etc/make.conf: # -# The parameter APACHE_PORT can be used in /etc/make.conf to -# overwrite the default apache port. +# DEFAULT_VERSIONS - define the default apache version +# valid args: apache=2.2, apache=2.4 # -# This parameter should never be used in the Makefile of a port! +# APACHE_PORT - use www/apache22-(event|itk|peruser|worker)-mpm +# instead www/apache22. Use this parameter only in +# combination with "DEFAULT_VERSIONS+= apache=2.2" # # Example entry in /etc/make.conf: -# APACHE_PORT= www/apache22 +# - Set apache22 as default version +# DEFAULT_VERSIONS+= apache=2.2 # -# To get a list of "possible" valid values execute the command: -# $> egrep 'apache[12]' ports/www/Makefile | awk '{print "www/" $3}' +# - Additional use a special www/apache22-$MPM port +# APACHE_PORT= www/apache22-event-mpm +# +# Note: +# - This parameters should never be used in the Makefile of a port! +# - To get a list of "possible" APACHE_PORT values execute the command: +# $> awk '/apache22-/ {print "www/" $3}' ports/www/Makefile # # ========================================================================= # @@ -354,7 +362,6 @@ IGNORE?= PREFIX must be equal to APXS_PR . endif .endif -AP_BUILDEXT= la APACHEMODDIR= libexec/apache${APACHE_VERSION} APACHEINCLUDEDIR=include/apache${APACHE_VERSION} APACHEETCDIR= etc/apache${APACHE_VERSION} @@ -494,13 +501,13 @@ ap-gen-plist: .if !target(do-build) do-build: ap-gen-plist - @cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE} + (cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.la ${SRC_FILE}) .endif .if !target(do-install) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - @${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} + ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.la . if !defined(DEBUG) @${ECHO_MSG} "===> strip ${APACHEMODDIR}/${MODULENAME}.so" @[ -e ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so