summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghen <ghen>2010-05-03 19:19:00 +0000
committerghen <ghen>2010-05-03 19:19:00 +0000
commit8b21bf9592f7a6782e2a4a905b5025b8eb15c967 (patch)
treeb60160e8be6073335fb46afbab917e0b4e858a77
parent064a7b2bfd75c934a6c415f211753e0bab506f95 (diff)
downloadpkgsrc-8b21bf9592f7a6782e2a4a905b5025b8eb15c967.tar.gz
load_rc_config prior to setting a default for dovecot_fdlimit in the
rc.d script, so it can be overridden from rc.conf. From Edgar Fuß. Bump PKGREVISION.
-rw-r--r--mail/dovecot/Makefile4
-rwxr-xr-xmail/dovecot/files/dovecot.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 6759d0d7975..36b5219b7db 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.145 2010/04/30 10:43:26 ghen Exp $
+# $NetBSD: Makefile,v 1.146 2010/05/03 19:19:00 ghen Exp $
DOVECOT_VERSION= 1.2
DOVECOT_SUBVERSION= .11
-PKGREVISION= 1
+PKGREVISION= 2
SIEVE_VERSION= 0.1.16
MANAGESIEVE_VERSION= 0.11.11
DISTNAME= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
diff --git a/mail/dovecot/files/dovecot.sh b/mail/dovecot/files/dovecot.sh
index 8c80b85a931..d7b046807c3 100755
--- a/mail/dovecot/files/dovecot.sh
+++ b/mail/dovecot/files/dovecot.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: dovecot.sh,v 1.4 2008/07/10 00:54:30 jnemeth Exp $
+# $NetBSD: dovecot.sh,v 1.5 2010/05/03 19:19:01 ghen Exp $
#
# PROVIDE: dovecot
@@ -14,6 +14,7 @@ command="@PREFIX@/sbin/${name}"
required_files="@PKG_SYSCONFDIR@/$name.conf"
extra_commands="reload"
+load_rc_config $name
dovecot_fdlimit=${dovecot_fdlimit-"768"}
# A default limit of 64 (at least on NetBSD) may be too low for many people
@@ -28,5 +29,4 @@ if [ ${dovecot_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
fi
fi
-load_rc_config $name
run_rc_command "$1"