From owner-cvs-all@FreeBSD.ORG Thu Oct 21 18:02:07 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CD27106566B; Thu, 21 Oct 2010 18:02:07 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from cell.p6m7g8.net (static-71-178-236-107.washdc.fios.verizon.net [71.178.236.107]) by mx1.freebsd.org (Postfix) with ESMTP id E4EAC8FC1B; Thu, 21 Oct 2010 18:02:06 +0000 (UTC) Received: from philip.hq.rws (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) (authenticated bits=0) by cell.p6m7g8.net (8.14.4/8.14.3) with ESMTP id o9LI20ek049546 (version=TLSv1/SSLv3 cipher=DHE-DSS-CAMELLIA256-SHA bits=256 verify=NO); Thu, 21 Oct 2010 18:02:01 GMT (envelope-from pgollucci@p6m7g8.com) Message-ID: <4CC08018.1060604@p6m7g8.com> Date: Thu, 21 Oct 2010 18:02:00 +0000 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.12) Gecko/20100908 Thunderbird/3.0.7 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <201010211800.o9LI0Fhg006716@repoman.freebsd.org> In-Reply-To: <201010211800.o9LI0Fhg006716@repoman.freebsd.org> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on cell.p6m7g8.net Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/www/apache22 Makefile ports/www/apache22/files apache22.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 18:02:07 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 crap, my bad. my .vimrc was out of whack. On 10/21/10 18:00, Philip M. Gollucci wrote: > pgollucci 2010-10-21 18:00:15 UTC > > FreeBSD ports repository > > Modified files: > www/apache22 Makefile > www/apache22/files apache22.in > Log: > - The previous update to the rc.d script didn't quite maintain the old behavior > correctly. This fixes the pid file name > > PR: ports/151623 > Submitted by: Vivek Khera > With Hat: apache@ > Point hat to: myself (pgollucci) > > Revision Changes Path > 1.283 +1 -0 ports/www/apache22/Makefile > 1.10 +2 -1 ports/www/apache22/files/apache22.in > > http://cvsweb.FreeBSD.org/ports/www/apache22/Makefile.diff?r1=1.282&r2=1.283&f=h > | --- ports/www/apache22/Makefile 2010/10/20 21:04:58 1.282 > | +++ ports/www/apache22/Makefile 2010/10/21 18:00:15 1.283 > | @@ -2,13 +2,14 @@ > | # Date created: Dec 11 2004 > | # Whom: Clement Laforet > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.282 2010/10/20 21:04:58 pgollucci Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/Makefile,v 1.283 2010/10/21 18:00:15 pgollucci Exp $ > | # > | # For more information, please read Makefile.doc > | # > | > | PORTNAME= apache > | PORTVERSION= 2.2.17 > | +PORTREVISION= 1 > | CATEGORIES= www > | MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} > | DISTNAME= httpd-${PORTVERSION} > http://cvsweb.FreeBSD.org/ports/www/apache22/files/apache22.in.diff?r1=1.9&r2=1.10&f=h > | --- ports/www/apache22/files/apache22.in 2010/10/14 20:20:06 1.9 > | +++ ports/www/apache22/files/apache22.in 2010/10/21 18:00:15 1.10 > | @@ -1,6 +1,6 @@ > | #!/bin/sh > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/files/apache22.in,v 1.9 2010/10/14 20:20:06 pgollucci Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache22/files/apache22.in,v 1.10 2010/10/21 18:00:15 pgollucci Exp $ > | # > | > | # PROVIDE: apache22 > | @@ -64,6 +64,7 @@ load_rc_config $name > | if [ -n "$2" ]; then > | profile="$2" > | if [ "x${apache22_profiles}" != "x" ]; then > | + pidfile="${_pidprefix}.${profile}.pid" > | eval apache22_configfile="\${apache22_${profile}_configfile:-}" > | if [ "x${apache22_configfile}" = "x" ]; then > | echo "You must define a configuration file (apache22_${profile}_configfile)" - -- - ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iD8DBQFMwIAYdbiP+9ubjBwRAgrLAKCL//Tg8NVGFJtu6skzcSGn/nYOKwCdHQ+Q NOQh/O7TAB0mAFIWK74kPh0= =1hgz -----END PGP SIGNATURE-----