[pkgsrc/trunk]: pkgsrc/mail/courier-mta Teach the webmlm rc.d script to check...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b396a3832fc5
branches:  trunk
changeset: 533199:b396a3832fc5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Sep 10 17:00:38 2007 +0000

description:
Teach the webmlm rc.d script to check that the LISTS variable is non-empty
before attempting to start webmlmd.  Fix the way that webmlmd is called
(it expects an extra argument).

Bump the PKGREVSION to 4.

diffstat:

 mail/courier-mta/Makefile        |   4 ++--
 mail/courier-mta/files/webmlm.sh |  10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 1902b561e5f0 -r b396a3832fc5 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Mon Sep 10 16:44:30 2007 +0000
+++ b/mail/courier-mta/Makefile Mon Sep 10 17:00:38 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/09/10 16:06:27 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/10 17:00:38 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 1902b561e5f0 -r b396a3832fc5 mail/courier-mta/files/webmlm.sh
--- a/mail/courier-mta/files/webmlm.sh  Mon Sep 10 16:44:30 2007 +0000
+++ b/mail/courier-mta/files/webmlm.sh  Mon Sep 10 17:00:38 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: webmlm.sh,v 1.1 2007/08/10 17:57:04 jlam Exp $
+# $NetBSD: webmlm.sh,v 1.2 2007/09/10 17:00:38 jlam Exp $
 #
 # Courier mailing list management daemon
 #
@@ -31,7 +31,7 @@
        @CHMOD@ $mode $dir
 }
 
-webmlmd_prestart()
+webmlm_prestart()
 {
        @MKDIR@ @COURIER_STATEDIR@
        mkdir_perms @COURIER_STATEDIR@/webmlm \
@@ -42,6 +42,9 @@
 {
        action=$1
 
+       . @PKG_SYSCONFDIR@/webmlmrc
+       @TEST@ -n "$LISTS" || return 0
+
        case $action in
         restart|start)
                for f in $required_files; do
@@ -60,7 +63,8 @@
                ;;
        esac
 
-       ${ctl_command} @PREFIX@/bin/webmlmd $action
+       ${ctl_command} @PREFIX@/bin/webmlmd $action \
+               @PKG_SYSCONFDIR@/webmlmrc
 }
 
 load_rc_config $name