svn commit: r404858 - in head/mail/mailman: . files

[Matthias Andree]

Author: mandree
Date: Wed Dec 30 14:21:33 2015
New Revision: 404858
URL: https://svnweb.freebsd.org/changeset/ports/404858

Log:
  Fix stop method in rc.d script to wait for process to exit.
  
  To that end, simplify and use rc.subr default methods where possible.

Modified:
  head/mail/mailman/Makefile
  head/mail/mailman/files/mailman.in

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Wed Dec 30 14:07:42 2015	(r404857)
+++ head/mail/mailman/Makefile	Wed Dec 30 14:21:33 2015	(r404858)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.20
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -51,7 +52,7 @@ GROUPS=		${MM_GROUPNAME}
 MAILMANDIR=	${PREFIX}/${MM_DIR}
 PLIST_SUB=	MMDIR=${MM_DIR} IMGDIR=${IMGDIR} MM_USERNAME=${MM_USERNAME} MM_GROUPNAME=${MM_GROUPNAME}
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
-SUB_LIST=	MAILMANDIR=${MAILMANDIR} USER=${MM_USERNAME} GROUP=${MM_GROUPNAME}
+SUB_LIST=	MAILMANDIR=${MAILMANDIR} USER=${MM_USERNAME} GROUP=${MM_GROUPNAME} PYTHON_CMD="${PYTHON_CMD}"
 
 PORTDOCS=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 		README.CONTRIB README.NETSCAPE \

Modified: head/mail/mailman/files/mailman.in
==============================================================================
--- head/mail/mailman/files/mailman.in	Wed Dec 30 14:07:42 2015	(r404857)
+++ head/mail/mailman/files/mailman.in	Wed Dec 30 14:21:33 2015	(r404858)
@@ -19,8 +19,10 @@
 . /etc/rc.subr
 
 name="mailman"
-rcvar=mailman_enable
-
+rcvar="mailman_enable"
+command_interpreter="%%PYTHON_CMD%%"
+command="%%MAILMANDIR%%/bin/mailmanctl"
+command_args="-s -q start"
 pidfile="%%MAILMANDIR%%/data/master-qrunner.pid"
 
 load_rc_config $name
@@ -28,33 +30,14 @@ load_rc_config $name
 : ${mailman_enable="NO"}
 : ${mailman_fix_perms="YES"}
 
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-status_cmd=${name}_status
+start_precmd=${name}_prestart
 extra_commands="reload status"
 
-mailman_start() {
+mailman_prestart() {
 	if checkyesno mailman_fix_perms ; then 
-	    env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f
-	fi
-	%%MAILMANDIR%%/bin/mailmanctl -s -q start
-}
-
-mailman_stop() {
-	[ -f $pidfile ] \
-	  && %%MAILMANDIR%%/bin/mailmanctl -q stop \
-	  || echo ${name} not running? \(check ${pidfile}\)
-}
-
-mailman_status() {
-	local retcode=0
-	if [ -f $pidfile ] && ps -p $(cat $pidfile) > /dev/null; then
-		echo $name is running as pid $(cat $pidfile).
-	else
-		echo $name is not running.
-		retcode=1
+	    check_startmsgs && echo "Fixing ${name} permissions:"
+	    env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f $arg ${rc_debug:+-v}
 	fi
-	return $retcode
 }
 
 run_rc_command "$1"