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.

48 files changed, 54 insertions, 47 deletions

diff --git a/games/kaid/Makefile b/games/kaid/Makefile
index 6408e2e6c84b..b158991636aa 100644
--- a/games/kaid/Makefile
+++ b/games/kaid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kaid
 PORTVERSION=		7.0.0.4b
+PORTREVISION=		1
 CATEGORIES=		games net
 MASTER_SITES=		http://www.teamxlink.co.uk/binary/
 MASTER_SITE_SUBDIR=
diff --git a/games/kaid/files/kaid.sh b/games/kaid/files/kaid.sh
index d08dfabb017d..8b214dec67bf 100644
--- a/games/kaid/files/kaid.sh
+++ b/games/kaid/files/kaid.sh
@@ -12,7 +12,7 @@
 #
 # kaid_enable="YES"
 #
-kaid_enable="NO"
+kaid_enable="${kaid_enable-NO}"
 
 . /etc/rc.subr
 
diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index ee2e8f979ba6..149ca1e1b8a3 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ircservices
 PORTVERSION=	5.0.${PATCHLEVEL}
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.esper.net/ircservices/ \
 	http://www.ircservices.esper.net/download/ \
diff --git a/irc/ircservices/files/ircservices.sh.in b/irc/ircservices/files/ircservices.sh.in
index 184923f71f35..00f6f7dda6f9 100644
--- a/irc/ircservices/files/ircservices.sh.in
+++ b/irc/ircservices/files/ircservices.sh.in
@@ -9,7 +9,7 @@
 # ircservices_enable="YES"
 #
 
-ircservices_enable="NO"
+ircservices_enable="${ircservices_enable-NO}"
 
 . %%RC_SUBR%%
 
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index a32cab0aef45..541ebeb011a8 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	upclient
 PORTVERSION=	5.0.b8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://uptimes.hostingwired.com/files/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/misc/upclient/files/upclient.sh b/misc/upclient/files/upclient.sh
index 33bb21bb0745..6891c0c3667c 100644
--- a/misc/upclient/files/upclient.sh
+++ b/misc/upclient/files/upclient.sh
@@ -30,7 +30,7 @@ upclient_precmd ()
 	:
 }
 
-upclient_enable=NO
+upclient_enable="${upclient_enable-NO}"
 upclient_flags=
 
 . %%RC_SUBR%%
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%%
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2db71b511c60..1d7158935370 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 e95cbd7bb475..8ce57d4c8106 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%%
 
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 942ada5b55cd..ecbba9b15c76 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ejabberd
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.jabber.ru/files/ejabberd/ \
 		http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/
diff --git a/net-im/ejabberd/files/ejabberd.sh.in b/net-im/ejabberd/files/ejabberd.sh.in
index d7e27e13b918..7404e258d6be 100644
--- a/net-im/ejabberd/files/ejabberd.sh.in
+++ b/net-im/ejabberd/files/ejabberd.sh.in
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-ejabberd_enable="NO"
+ejabberd_enable="${ejabberd_enable-NO}"
 
 . %%RC_SUBR%%
 
diff --git a/net-mgmt/bsnmpd/Makefile b/net-mgmt/bsnmpd/Makefile
index 64b5a0aad2a0..5ef3f24e4f5c 100644
--- a/net-mgmt/bsnmpd/Makefile
+++ b/net-mgmt/bsnmpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsnmpd
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://people.freebsd.org/~harti/bsnmp/
 DISTNAME=	bsnmp-${PORTVERSION}a
diff --git a/net-mgmt/bsnmpd/files/bsnmpd.sh.in b/net-mgmt/bsnmpd/files/bsnmpd.sh.in
index 8e2346542a08..99019c59fb3f 100644
--- a/net-mgmt/bsnmpd/files/bsnmpd.sh.in
+++ b/net-mgmt/bsnmpd/files/bsnmpd.sh.in
@@ -5,7 +5,7 @@
 # REQUIRE: NETWORKING syslogd
 # KEYWORD: nojail
 
-bsnmpd_enable="NO"
+bsnmpd_enable="${bsnmpd_enable-NO}"
 
 . %%RC_SUBR%%
 
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 5429f12b8566..5e6e79899f3d 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/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-p2p/gift/files/giftd.sh b/net-p2p/gift/files/giftd.sh
index 1bbed2ce2970..5ea729548548 100644
--- a/net-p2p/gift/files/giftd.sh
+++ b/net-p2p/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/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%%
 
diff --git a/security/amavisd/Makefile b/security/amavisd/Makefile
index a8024a43b319..6d21000453a7 100644
--- a/security/amavisd/Makefile
+++ b/security/amavisd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amavisd
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/security/amavisd/files/amavisd-milter.sh b/security/amavisd/files/amavisd-milter.sh
index 71f987fee2cf..2713faf0fd97 100644
--- a/security/amavisd/files/amavisd-milter.sh
+++ b/security/amavisd/files/amavisd-milter.sh
@@ -14,7 +14,7 @@ prefix=%%PREFIX%%
 #	/etc/rc.conf.local
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-amavisd_milter_enable=no
+amavisd_milter_enable="${amavisd_milter_enable-NO}"
 amavisd_milter_flags="-D"
 amavisd_milter_user=%%AMAVISUSER%%
 #amavisd_milter_socket="inet:9999@127.0.0.1"
diff --git a/security/amavisd/files/amavisd.sh b/security/amavisd/files/amavisd.sh
index 2528df760105..e45a10e6f63c 100644
--- a/security/amavisd/files/amavisd.sh
+++ b/security/amavisd/files/amavisd.sh
@@ -14,7 +14,7 @@ prefix=%%PREFIX%%
 #       /etc/rc.conf.local
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-amavisd_enable=no
+amavisd_enable="${amavisd_enable-NO}"
 amavisd_flags=""
 amavisd_user=%%AMAVISUSER%%
 
diff --git a/sysutils/est/Makefile b/sysutils/est/Makefile
index 077dfb645e55..e95b920d7185 100644
--- a/sysutils/est/Makefile
+++ b/sysutils/est/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	est
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.daemonology.net/freebsd-est/
 
diff --git a/sysutils/est/files/est.sh b/sysutils/est/files/est.sh
index c822db796ca4..612170465dd8 100644
--- a/sysutils/est/files/est.sh
+++ b/sysutils/est/files/est.sh
@@ -15,7 +15,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-est_enable="NO"
+est_enable="${est_enable-NO}"
 est_verbose="NO"
 
 . %%RC_SUBR%%
diff --git a/sysutils/estctrl/Makefile b/sysutils/estctrl/Makefile
index a396a319f529..0d6b6ae01c77 100644
--- a/sysutils/estctrl/Makefile
+++ b/sysutils/estctrl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	estctrl
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.daemonology.net/freebsd-est/
 
diff --git a/sysutils/estctrl/files/estctrl.sh b/sysutils/estctrl/files/estctrl.sh
index 17fe0375ec39..fb4c13d4e105 100644
--- a/sysutils/estctrl/files/estctrl.sh
+++ b/sysutils/estctrl/files/estctrl.sh
@@ -14,7 +14,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-estctrl_enable="NO"
+estctrl_enable="${estctrl_enable-NO}"
 estctrl_speed_ac="adaptive"
 estctrl_speed_battery="adaptive"
 estctrl_speed_default="adaptive"
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 64437207de27..a6698894a492 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	monitor-core
 PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils net parallel
 .if !defined(PORTDEV)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/sysutils/ganglia-monitor-core/files/ganglia.sh.in b/sysutils/ganglia-monitor-core/files/ganglia.sh.in
index 2876a8f22846..bb13de996c9d 100644
--- a/sysutils/ganglia-monitor-core/files/ganglia.sh.in
+++ b/sysutils/ganglia-monitor-core/files/ganglia.sh.in
@@ -9,12 +9,12 @@
 # dependencies, but we can't do that at the moment and gmetad doesn't
 # work without a running gmond.
 
-gmond_enable="NO"
+gmond_enable="${gmond_enable-NO}"
 gmond_conf="%%PREFIX%%/etc/gmond.conf"
 
-gmetad_enable="NO"
+gmetad_enable="${gmetad_enable-NO}"
 gmetad_conf="%%PREFIX%%/etc/gmetad.conf"
-gmetasnap_enable="NO"
+gmetasnap_enable="${gmetasnap_enable-NO}"
 gmetasnap_rrddir="/var/db/ganglia/rrds"
 gmetasnap_snapdir="/var/db/ganglia/snaps"
 gmetasnap_snapname="snap"
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile
index be6a62172c96..0788b7818ca2 100644
--- a/sysutils/smartmontools-devel/Makefile
+++ b/sysutils/smartmontools-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smartmontools
 PORTVERSION=	5.33
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/smartmontools-devel/files/smartd.sh b/sysutils/smartmontools-devel/files/smartd.sh
index a280b53cf1db..7610b0d6b059 100644
--- a/sysutils/smartmontools-devel/files/smartd.sh
+++ b/sysutils/smartmontools-devel/files/smartd.sh
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-smartd_enable="NO"
+smartd_enable="${smartd_enable-NO}"
 smartd_pidfile="/var/run/smartd.pid"
 
 . %%RC_SUBR%%
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index be6a62172c96..0788b7818ca2 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smartmontools
 PORTVERSION=	5.33
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/smartmontools/files/smartd.sh b/sysutils/smartmontools/files/smartd.sh
index a280b53cf1db..7610b0d6b059 100644
--- a/sysutils/smartmontools/files/smartd.sh
+++ b/sysutils/smartmontools/files/smartd.sh
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-smartd_enable="NO"
+smartd_enable="${smartd_enable-NO}"
 smartd_pidfile="/var/run/smartd.pid"
 
 . %%RC_SUBR%%
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index ddce5d1bfee2..9049d649069a 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	usermin
 PORTVERSION=	1.180
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.sh.in
index 4aadd72b5513..af9e7fe2f72f 100644
--- a/sysutils/usermin/files/usermin.sh.in
+++ b/sysutils/usermin/files/usermin.sh.in
@@ -11,7 +11,7 @@
 # usermin_enable="YES"
 #
 
-usermin_enable="NO"
+usermin_enable="${usermin_enable-NO}"
 
 . %%RC_SUBR%%
 
diff --git a/sysutils/usermin/files/usermin.sh.sample b/sysutils/usermin/files/usermin.sh.sample
index 4aadd72b5513..af9e7fe2f72f 100644
--- a/sysutils/usermin/files/usermin.sh.sample
+++ b/sysutils/usermin/files/usermin.sh.sample
@@ -11,7 +11,7 @@
 # usermin_enable="YES"
 #
 
-usermin_enable="NO"
+usermin_enable="${usermin_enable-NO}"
 
 . %%RC_SUBR%%
 
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index bedd3edfcd4f..13017df9deb1 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aolserver
 PORTVERSION=	4.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aolserver
diff --git a/www/aolserver/files/aolserver.sh.in b/www/aolserver/files/aolserver.sh.in
index b0c30f5331c2..2ba9e5e58d3a 100644
--- a/www/aolserver/files/aolserver.sh.in
+++ b/www/aolserver/files/aolserver.sh.in
@@ -11,7 +11,7 @@
 #
 # Tweakable parameters for users to override in rc.conf
 
-aolserver_enable=NO
+aolserver_enable="${aolserver_enable-NO}"
 aolserver_home=%%PREFIX%%/aolserver
 aolserver_conf=${aolserver_home}/sample-config.tcl 
 aolserver_flags="-u nobody -g nobody"
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile
index ff6441de2db5..dffcd9d353b3 100644
--- a/www/apache13-modperl/Makefile
+++ b/www/apache13-modperl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_perl
 PORTVERSION=	${VERSION_APACHE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD:S/$/:apache/} \
 		${MASTER_SITE_PERL_CPAN:S/$/Apache\/:modperl/}
diff --git a/www/apache13-modperl/files/apache.sh b/www/apache13-modperl/files/apache.sh
index bc1f82cc4373..2491e0514d97 100644
--- a/www/apache13-modperl/files/apache.sh
+++ b/www/apache13-modperl/files/apache.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.1 2004-06-05 14:25:18 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.2 2006-01-07 06:29:56 dougb Exp $
 
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-apache_enable="NO"
+apache_enable="${apache_enable-NO}"
 apache_flags=""
 apache_pidfile="/var/run/httpd.pid"
 
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 0ab8779761ea..92e875851156 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \
diff --git a/www/apache13-modssl/files/rcng.sh b/www/apache13-modssl/files/rcng.sh
index 34220690ef36..237365f1978c 100644
--- a/www/apache13-modssl/files/rcng.sh
+++ b/www/apache13-modssl/files/rcng.sh
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-apache_enable="NO"
+apache_enable="${apache_enable-NO}"
 apache_flags="-DSSL"
 apache_pidfile="/var/run/httpd.pid"