From owner-svn-ports-all@FreeBSD.ORG Tue Sep 4 21:28:48 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 91B42106566B for ; Tue, 4 Sep 2012 21:28:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6E87E8FC17 for ; Tue, 4 Sep 2012 21:28:48 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q84LSm5l006697 for ; Tue, 4 Sep 2012 21:28:48 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q84LSmG8006685 for svn-ports-all@freebsd.org; Tue, 4 Sep 2012 21:28:48 GMT (envelope-from bdrewery) Received: (qmail 70030 invoked from network); 4 Sep 2012 16:28:45 -0500 Received: from unknown (HELO ?192.168.0.74?) (freebsd@shatow.net@74.94.87.209) by sweb.xzibition.com with ESMTPA; 4 Sep 2012 16:28:45 -0500 Message-ID: <5046728F.3010403@FreeBSD.org> Date: Tue, 04 Sep 2012 16:28:47 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Olli Hauer References: <201209021431.q82EVxjW017243@svn.freebsd.org> In-Reply-To: <201209021431.q82EVxjW017243@svn.freebsd.org> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r303550 - in head: Mk devel/apr1 devel/apr1/files www/apache22 www/apache22-event-mpm www/apache22-itk-mpm www/apache22-peruser-mpm www/apache22-worker-mpm www/apache22/files 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: Tue, 04 Sep 2012 21:28:48 -0000 On 9/2/2012 9:31 AM, Olli Hauer wrote: > Author: ohauer > Date: Sun Sep 2 14:31:58 2012 > New Revision: 303550 > URL: http://svn.freebsd.org/changeset/ports/303550 > > Log: > devel/apr1 [1] > - update APR to 1.4.6 > - update APR-util to 1.4.1 > - remove PKGNAMESUFFIX'es > > www/apache-(event|itk|peruser|worker)-mpm > - adopt new Makefile header, adjust > PKGNAMESUFFIX in apache22 masterport > PKGNAME match now LATEST_LINK > > www/apache22 [2]-[6] > - rewrite for options NG > - PORTNAME s|apache|apache22| > - remove APR APR-util specific otions, > will be checked now with help of apr/u-1-config > > Mk/bsd.apache.mk > - rewrite for options NG > - remove no longer needet make targets > (show-categories, make-options-list) > > [1] > PR: 165143 > > [2]-[6] > PR: 130479 > PR: 153406 > PR: 158565 > PR: 168769 > PR: 167965 > > with hat apache@ > > Added: > head/www/apache22/files/extra-patch-server__config.c (contents, props changed) > head/www/apache22/files/extra-patch-suexec_userdir (contents, props changed) > head/www/apache22/files/mpm-itk-limits (contents, props changed) > Deleted: > head/devel/apr1/files/patch-apr_ldap_rebind.c > Modified: > head/Mk/bsd.apache.mk (contents, props changed) > head/devel/apr1/Makefile (contents, props changed) > head/devel/apr1/distinfo (contents, props changed) > head/devel/apr1/files/patch-apr_hints.m4 (contents, props changed) > head/devel/apr1/pkg-plist (contents, props changed) > head/www/apache22-event-mpm/Makefile > head/www/apache22-itk-mpm/Makefile > head/www/apache22-peruser-mpm/Makefile > head/www/apache22-worker-mpm/Makefile > head/www/apache22/Makefile > head/www/apache22/Makefile.doc (contents, props changed) > head/www/apache22/Makefile.modules > head/www/apache22/Makefile.options > head/www/apache22/pkg-plist (contents, props changed) > > Modified: head/Mk/bsd.apache.mk > ============================================================================== > --- head/Mk/bsd.apache.mk Sun Sep 2 14:16:18 2012 (r303549) > +++ head/Mk/bsd.apache.mk Sun Sep 2 14:31:58 2012 (r303550) [...] > @@ -409,6 +404,10 @@ IGNORE= ${_ERROR_MSG} specify only one o > IGNORE= ${_ERROR_MSG} use USE_APACHE instead of USE_APACHE_BUILD and USE_APACHE_RUN together > .endif > > +.if defined(NO_BUILD) && defined(USE_APACHE) > +IGNORE= If NO_BUILD is used, then USE_APACHE_RUN is sufficient. Please fix your Makefile > +.endif > +-- This impacts all of these: net-p2p/rtgui games/hlstatsx www/thundercache www/rt40 www/dojo www/yahoo-ui www/dotproject www/webcalendar-devel www/thundersnarf www/foswiki www/rt38 net-mgmt/ocsinventory-ng ftp/proma net/prosearch As well as net-mgmt/netdisco, but I'm already handling that. Perhaps apache@ should change all of those to USE_APACHE_RUN? Regards, Bryan Drewery bdrewery@freenode/EFNet