diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2006-01-07 06:29:57 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2006-01-07 06:29:57 +0000 |
| commit | ffde46cbf97ed90584d8c10bdc6bae8094784387 (patch) | |
| tree | b78a36a23c5db32b200d7f48cb719e48b524fa47 /net | |
| parent | [UPDATE]: textproc/cwtext: Update to version 0.95 (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=152963
Diffstat (limited to 'net')
| -rw-r--r-- | net/gift/Makefile | 2 | ||||
| -rw-r--r-- | net/gift/files/giftd.sh | 2 | ||||
| -rw-r--r-- | net/lanbrowsing/Makefile | 1 | ||||
| -rw-r--r-- | net/lanbrowsing/files/lisa.sh | 2 | ||||
| -rw-r--r-- | net/mDNSResponder/Makefile | 2 | ||||
| -rw-r--r-- | net/mDNSResponder/files/mdnsd.sh.in | 2 | ||||
| -rw-r--r-- | net/minisapserver/Makefile | 1 | ||||
| -rw-r--r-- | net/minisapserver/files/sapserver.sh | 4 | ||||
| -rw-r--r-- | net/mpd/Makefile | 2 | ||||
| -rw-r--r-- | net/mpd/files/mpd.sh | 2 |
10 files changed, 11 insertions, 9 deletions
diff --git a/net/gift/Makefile b/net/gift/Makefile index 5429f12b8566..5e6e79899f3d 100644 --- a/net/gift/Makefile +++ b/net/gift/Makefile @@ -7,7 +7,7 @@ PORTNAME= giFT PORTVERSION= 0.11.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME:L} diff --git a/net/gift/files/giftd.sh b/net/gift/files/giftd.sh index 1bbed2ce2970..5ea729548548 100644 --- a/net/gift/files/giftd.sh +++ b/net/gift/files/giftd.sh @@ -14,7 +14,7 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE -giftd_enable="NO" +giftd_enable="${giftd_enable-NO}" giftd_flags="-d -q" giftd_user="" giftd_local_dir="" diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile index afec21d4fbc3..ec7015b93219 100644 --- a/net/lanbrowsing/Makefile +++ b/net/lanbrowsing/Makefile @@ -7,6 +7,7 @@ PORTNAME= lanbrowsing PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/net/lanbrowsing/files/lisa.sh b/net/lanbrowsing/files/lisa.sh index 4f609cc04bdb..fa091997ecd3 100644 --- a/net/lanbrowsing/files/lisa.sh +++ b/net/lanbrowsing/files/lisa.sh @@ -7,7 +7,7 @@ # REQUIRE: LOGIN # KEYWORD: FreeBSD -lisa_enable="NO" +lisa_enable="${lisa_enable-NO}" lisa_conffile="%%PREFIX%%/etc/lisarc" . %%RC_SUBR%% diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index caec42a4e927..b5dd458d8e47 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -8,7 +8,7 @@ PORTNAME= mDNSResponder PORTVERSION= 107.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net dns MASTER_SITES= http://darwinsource.opendarwin.org/tarballs/apsl/ DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/net/mDNSResponder/files/mdnsd.sh.in b/net/mDNSResponder/files/mdnsd.sh.in index d879c2d2a552..b3fc2fa0ea7d 100644 --- a/net/mDNSResponder/files/mdnsd.sh.in +++ b/net/mDNSResponder/files/mdnsd.sh.in @@ -5,7 +5,7 @@ # REQUIRE: DAEMON # KEYWORD: FreeBSD shutdown -mdnsd_enable="NO" +mdnsd_enable="${mdnsd_enable-NO}" . %%RC_SUBR%% diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile index 68c757bf9139..3d71f3628193 100644 --- a/net/minisapserver/Makefile +++ b/net/minisapserver/Makefile @@ -7,6 +7,7 @@ PORTNAME= minisapserver PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= net multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/miniSAPserver/${PORTVERSION}/ diff --git a/net/minisapserver/files/sapserver.sh b/net/minisapserver/files/sapserver.sh index 9cedc4586ab2..dbd8fcd5dce5 100644 --- a/net/minisapserver/files/sapserver.sh +++ b/net/minisapserver/files/sapserver.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net/minisapserver/files/Attic/sapserver.sh,v 1.1 2004-05-25 09:17:51 krion Exp $ +# $FreeBSD: /tmp/pcvs/ports/net/minisapserver/files/Attic/sapserver.sh,v 1.2 2006-01-07 06:29:53 dougb Exp $ # # PROVIDE: sapserver @@ -12,7 +12,7 @@ # #sapserver_enable="YES" # -sapserver_enable="NO" +sapserver_enable="${sapserver_enable-NO}" . %%RC_SUBR%% diff --git a/net/mpd/Makefile b/net/mpd/Makefile index 5879ae094455..07ebe65082e8 100644 --- a/net/mpd/Makefile +++ b/net/mpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpd PORTVERSION= 3.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= archie diff --git a/net/mpd/files/mpd.sh b/net/mpd/files/mpd.sh index b31ee06d2e29..0367a23c4747 100644 --- a/net/mpd/files/mpd.sh +++ b/net/mpd/files/mpd.sh @@ -12,7 +12,7 @@ # mpd_flags="-b" -mpd_enable="NO" +mpd_enable="${mpd_enable-NO}" . %%RC_SUBR%% |