From owner-cvs-all@FreeBSD.ORG  Mon Jul 26 15:24:22 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 173E616A4CE; Mon, 26 Jul 2004 15:24:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1067543D46; Mon, 26 Jul 2004 15:24:22 +0000 (GMT)
	(envelope-from roam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6QFO5sp088216;
	Mon, 26 Jul 2004 15:24:05 GMT
	(envelope-from roam@repoman.freebsd.org)
Received: (from roam@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6QFO54K088215;
	Mon, 26 Jul 2004 15:24:05 GMT
	(envelope-from roam)
Message-Id: <200407261524.i6QFO54K088215@repoman.freebsd.org>
From: Peter Pentchev <roam@FreeBSD.org>
Date: Mon, 26 Jul 2004 15:24:05 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/www/apache13 Makefile ports/www/apache13/files
 apache.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jul 2004 15:24:22 -0000

roam        2004-07-26 15:24:05 UTC

  FreeBSD ports repository

  Modified files:
    www/apache13         Makefile 
    www/apache13/files   apache.sh 
  Log:
  In the rc.d/localpkg New World Order, the apache.sh startup script may
  be executed when the apache_enable and other config variables have
  already been set, e.g. via /etc/rc.conf.  In that case, load_rc_config
  will not do anything at all, and the "defaults" set in the script will
  override the user's settings.  Fix this by honoring any previously-set
  config variables.
  
  Carte blanche by:       ache (maintainer)
  
  Revision  Changes    Path
  1.153     +1 -1      ports/www/apache13/Makefile
  1.7       +4 -4      ports/www/apache13/files/apache.sh