diff options
| author | dougb <dougb@FreeBSD.org> | 2006-01-07 06:29:57 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2006-01-07 06:29:57 +0000 |
| commit | f22aefad354646e367125e29367738156d9ce45e (patch) | |
| tree | 263b1289f4801350149db40a8f79e53ace385ecc /multimedia | |
| parent | 11b367b069d969e162b021882dd5ad152744a56e (diff) | |
| download | FreeBSD-ports-f22aefad354646e367125e29367738156d9ce45e.zip FreeBSD-ports-f22aefad354646e367125e29367738156d9ce45e.tar.gz | |
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.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/ffserver.sh | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/ffserver.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index a4b86d2..c6e5333 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 0ec0f5b..d0b554e 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%% diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2db71b5..1d71589 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 0.4.9-pre1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ffmpeg diff --git a/multimedia/ffmpeg/files/ffserver.sh b/multimedia/ffmpeg/files/ffserver.sh index e95cbd7..8ce57d4 100644 --- a/multimedia/ffmpeg/files/ffserver.sh +++ b/multimedia/ffmpeg/files/ffserver.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg/files/Attic/ffserver.sh,v 1.1 2004-12-05 18:12:41 lioux Exp $ +# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg/files/Attic/ffserver.sh,v 1.2 2006-01-07 06:29:51 dougb Exp $ # # PROVIDE: ffserver @@ -12,7 +12,7 @@ # #ffserver_enable="YES" # -ffserver_enable="NO" +ffserver_enable="${ffserver_enable-NO}" . %%RC_SUBR%% |
