From owner-cvs-ports@FreeBSD.ORG Sat Jan 7 06:29:57 2006 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD7A816A41F; Sat, 7 Jan 2006 06:29:57 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A4A043D46; Sat, 7 Jan 2006 06:29:57 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k076TvmB090905; Sat, 7 Jan 2006 06:29:57 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k076Tvml090904; Sat, 7 Jan 2006 06:29:57 GMT (envelope-from dougb) Message-Id: <200601070629.k076Tvml090904@repoman.freebsd.org> From: Doug Barton Date: Sat, 7 Jan 2006 06:29:57 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/games/kaid Makefile ports/games/kaid/files kaid.sh ports/irc/ircservices Makefile ports/irc/ircservices/files ircservices.sh.in ports/misc/upclient Makefile ports/misc/upclient/files upclient.sh ports/multimedia/ffmpeg ... X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 06:29:57 -0000 dougb 2006-01-07 06:29:57 UTC FreeBSD ports repository Modified files: games/kaid Makefile games/kaid/files kaid.sh irc/ircservices Makefile irc/ircservices/files ircservices.sh.in misc/upclient Makefile misc/upclient/files upclient.sh multimedia/ffmpeg Makefile multimedia/ffmpeg/files ffserver.sh multimedia/ffmpeg-devel Makefile multimedia/ffmpeg-devel/files ffserver.sh net/gift Makefile net/gift/files giftd.sh net/lanbrowsing Makefile net/lanbrowsing/files lisa.sh net/mDNSResponder Makefile net/mDNSResponder/files mdnsd.sh.in net/minisapserver Makefile net/minisapserver/files sapserver.sh net/mpd Makefile net/mpd/files mpd.sh net-im/ejabberd Makefile net-im/ejabberd/files ejabberd.sh.in net-mgmt/bsnmpd Makefile net-mgmt/bsnmpd/files bsnmpd.sh.in security/amavisd Makefile security/amavisd/files amavisd-milter.sh amavisd.sh sysutils/est Makefile sysutils/est/files est.sh sysutils/estctrl Makefile sysutils/estctrl/files estctrl.sh sysutils/ganglia-monitor-core Makefile sysutils/ganglia-monitor-core/files ganglia.sh.in sysutils/smartmontools Makefile sysutils/smartmontools/files smartd.sh sysutils/usermin Makefile sysutils/usermin/files usermin.sh.sample www/aolserver Makefile www/aolserver/files aolserver.sh.in www/apache13-modperl Makefile www/apache13-modperl/files apache.sh www/apache13-modssl Makefile www/apache13-modssl/files rcng.sh Log: Now that new style rc.d scripts are being run as part of the base rcorder, hard coded variable values in these scripts are overriding the values in /etc/rc.conf[.local] (due to the way that variables from the latter are read at boot time). Therefore, change the boot scripts to set default values only if the variable is unset in /etc/rc.conf[.local]. This will allow the service to start at boot time if it's been enabled as the user would expect. This change will be a noop for users who have systems that have not yet been upgraded to the new rc.d code in the base. In many cases there are other variables in the scripts that should get similar treatment, however I did not change anything other than the _enable lines. I'll leave the rest up to the maintainers to do as they see fit. Bump PORTREVISION to make sure that users and packages pick up this change. Revision Changes Path 1.2 +1 -0 ports/games/kaid/Makefile 1.2 +2 -2 ports/games/kaid/files/kaid.sh 1.29 +1 -0 ports/irc/ircservices/Makefile 1.2 +1 -1 ports/irc/ircservices/files/ircservices.sh.in 1.30 +1 -1 ports/misc/upclient/Makefile 1.7 +2 -2 ports/misc/upclient/files/upclient.sh 1.87 +1 -1 ports/multimedia/ffmpeg-devel/Makefile 1.2 +2 -2 ports/multimedia/ffmpeg-devel/files/ffserver.sh 1.53 +1 -1 ports/multimedia/ffmpeg/Makefile 1.2 +2 -2 ports/multimedia/ffmpeg/files/ffserver.sh 1.10 +1 -0 ports/net-im/ejabberd/Makefile 1.2 +2 -2 ports/net-im/ejabberd/files/ejabberd.sh.in 1.7 +1 -1 ports/net-mgmt/bsnmpd/Makefile 1.2 +2 -2 ports/net-mgmt/bsnmpd/files/bsnmpd.sh.in 1.22 +1 -1 ports/net/gift/Makefile 1.2 +2 -2 ports/net/gift/files/giftd.sh 1.8 +1 -0 ports/net/lanbrowsing/Makefile 1.8 +2 -2 ports/net/lanbrowsing/files/lisa.sh 1.13 +1 -1 ports/net/mDNSResponder/Makefile 1.4 +2 -2 ports/net/mDNSResponder/files/mdnsd.sh.in 1.11 +1 -0 ports/net/minisapserver/Makefile 1.2 +2 -2 ports/net/minisapserver/files/sapserver.sh 1.46 +1 -1 ports/net/mpd/Makefile 1.3 +2 -2 ports/net/mpd/files/mpd.sh 1.18 +1 -1 ports/security/amavisd/Makefile 1.4 +2 -2 ports/security/amavisd/files/amavisd-milter.sh 1.5 +2 -2 ports/security/amavisd/files/amavisd.sh 1.10 +1 -0 ports/sysutils/est/Makefile 1.3 +2 -2 ports/sysutils/est/files/est.sh 1.8 +1 -1 ports/sysutils/estctrl/Makefile 1.4 +2 -2 ports/sysutils/estctrl/files/estctrl.sh 1.18 +1 -1 ports/sysutils/ganglia-monitor-core/Makefile 1.3 +4 -4 ports/sysutils/ganglia-monitor-core/files/ganglia.sh.in 1.22 +1 -1 ports/sysutils/smartmontools/Makefile 1.6 +2 -2 ports/sysutils/smartmontools/files/smartd.sh 1.42 +1 -0 ports/sysutils/usermin/Makefile 1.4 +2 -2 ports/sysutils/usermin/files/usermin.sh.sample 1.21 +1 -1 ports/www/aolserver/Makefile 1.3 +1 -1 ports/www/aolserver/files/aolserver.sh.in 1.12 +1 -1 ports/www/apache13-modperl/Makefile 1.2 +2 -2 ports/www/apache13-modperl/files/apache.sh 1.175 +1 -1 ports/www/apache13-modssl/Makefile 1.4 +2 -2 ports/www/apache13-modssl/files/rcng.sh