From owner-freebsd-apache@FreeBSD.ORG Sun Aug 12 22:03:43 2012 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 945081065673 for ; Sun, 12 Aug 2012 22:03:43 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 4F8F98FC08 for ; Sun, 12 Aug 2012 22:03:43 +0000 (UTC) Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id B63E92087E for ; Mon, 13 Aug 2012 00:03:33 +0200 (CEST) Message-ID: <50282839.6060800@FreeBSD.org> Date: Mon, 13 Aug 2012 00:03:37 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: "apache@FreeBSD.org" X-Enigmail-Version: 1.4.3 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Subject: bsd.apache.mk rewrite / cleanup X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "apache@FreeBSD.org" List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2012 22:03:43 -0000 Hi all, the bsd.apache.mk script has undergone a rewrite for better support of options NG. changed: - make.conf pa-rams like WITH(OUT)_MODULES should be given in UPPER case. Code to convert make.conf pa-rams to UPPER case is in place - cleanup old constructs which are working in a sub-shell (@for ... ${GREP} ...) the parts are replaced to use make logic. - adjust apache20/apache22 ports for the new bsd.apache.mk. The bsd.apache.mk file should be touched again to support options NG in apache2x but those changes are only a view lines. I want to keep make.conf support the same way it works now even if apache22 is rewritten with options NG support. This means against new options NG logic the make.conf has priority over options set by "make config" (old behavior). To give make.conf and command line pa-rams a higher priority is needed for static and other special builds. I've done endless tests with the rewritten bsd.apache.mk and have not found any backward incompatible issues (except if we remove the UPPERCASE convert part) There is additional room for more cleanup, some comments are in the patch (MFC TODO). For anyone interested in review before I commit the patches http://people.freebsd.org/~ohauer/diffs/apache/bsd.apache.mk_rewrite_2012-08-12.txt -- olli