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.

2 files changed, 3 insertions, 3 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index a4b86d2c8dc7..c6e53334f673 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	0.4.9.cvs.${RELEASE_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 #		http://mplayerhq.hu/MPlayer/cvs/
diff --git a/multimedia/ffmpeg-devel/files/ffserver.sh b/multimedia/ffmpeg-devel/files/ffserver.sh
index 0ec0f5b65cf6..d0b554ee10fb 100644
--- a/multimedia/ffmpeg-devel/files/ffserver.sh
+++ b/multimedia/ffmpeg-devel/files/ffserver.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.1 2004-12-05 18:12:41 lioux Exp $
+# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.2 2006-01-07 06:29:52 dougb Exp $
 #
 
 # PROVIDE: ffserver
@@ -12,7 +12,7 @@
 #
 #ffserver_enable="YES"
 #
-ffserver_enable="NO"
+ffserver_enable="${ffserver_enable-NO}"
 
 . %%RC_SUBR%%