From owner-svn-ports-head@FreeBSD.ORG  Wed Jan  2 02:12:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DDA71A6B;
 Wed,  2 Jan 2013 02:12:17 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A8AFB8FC0C;
 Wed,  2 Jan 2013 02:12:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r022CHKv089642;
 Wed, 2 Jan 2013 02:12:17 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r022CHah089639;
 Wed, 2 Jan 2013 02:12:17 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201301020212.r022CHah089639@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 2 Jan 2013 02:12:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309798 - in head/www/apache22: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jan 2013 02:12:17 -0000

Author: ache
Date: Wed Jan  2 02:12:16 2013
New Revision: 309798
URL: http://svnweb.freebsd.org/changeset/ports/309798

Log:
  Use
  LockFile "/var/run/accept.lock"
  instead of previous
  LockFile "/var/log/accept.lock"
  
  If system is crashed and rebooted, Apache refuses to start in case
  /var/log/accept.lock.<pid> is found. That <pid> is almost always the same
  due to minimum pid variance right after boot.
  So use /var/run instead, which is cleaned on each boot.

Added:
  head/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in   (contents, props changed)
Modified:
  head/www/apache22/Makefile

Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile	Wed Jan  2 01:35:10 2013	(r309797)
+++ head/www/apache22/Makefile	Wed Jan  2 02:12:16 2013	(r309798)
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache22
 PORTVERSION=	2.2.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}

Added: head/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/apache22/files/patch-docs__conf__extra__httpd-mpm.conf.in	Wed Jan  2 02:12:16 2013	(r309798)
@@ -0,0 +1,11 @@
+--- docs/conf/extra/httpd-mpm.conf.in.bak	2007-12-29 06:08:28.000000000 +0300
++++ docs/conf/extra/httpd-mpm.conf.in	2013-01-02 05:58:13.000000000 +0400
+@@ -17,7 +17,7 @@
+ #
+ <IfModule !mpm_winnt_module>
+ <IfModule !mpm_netware_module>
+-LockFile "@rel_logfiledir@/accept.lock"
++LockFile "@rel_runtimedir@/accept.lock"
+ </IfModule>
+ </IfModule>
+