summaryrefslogtreecommitdiff
path: root/mail/courier-mta
diff options
context:
space:
mode:
authorjlam <jlam>2007-09-10 17:00:38 +0000
committerjlam <jlam>2007-09-10 17:00:38 +0000
commitecc77042ae234a9ead61c9ba5975b0cb7d7808cf (patch)
tree444ef547d798ffb36fd6c084d4df8e71a080e026 /mail/courier-mta
parent5591a367856d50c27aa2386d6ae1a77beda0d3d4 (diff)
downloadpkgsrc-ecc77042ae234a9ead61c9ba5975b0cb7d7808cf.tar.gz
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 (limited to 'mail/courier-mta')
-rw-r--r--mail/courier-mta/Makefile4
-rw-r--r--mail/courier-mta/files/webmlm.sh10
2 files changed, 9 insertions, 5 deletions
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 5aeda438acd..67ea0154c30 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -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 --git a/mail/courier-mta/files/webmlm.sh b/mail/courier-mta/files/webmlm.sh
index fb9d664ffbd..4f390406c83 100644
--- a/mail/courier-mta/files/webmlm.sh
+++ b/mail/courier-mta/files/webmlm.sh
@@ -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 @@ mkdir_perms()
@CHMOD@ $mode $dir
}
-webmlmd_prestart()
+webmlm_prestart()
{
@MKDIR@ @COURIER_STATEDIR@
mkdir_perms @COURIER_STATEDIR@/webmlm \
@@ -42,6 +42,9 @@ webmlm_doit()
{
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 @@ webmlm_doit()
;;
esac
- ${ctl_command} @PREFIX@/bin/webmlmd $action
+ ${ctl_command} @PREFIX@/bin/webmlmd $action \
+ @PKG_SYSCONFDIR@/webmlmrc
}
load_rc_config $name