ports/163564: [maintainer] [patch] mail/mimedefang fix rc.d script

[Mikhail T.]

>Number:         163564
>Category:       ports
>Synopsis:       [maintainer] [patch] mail/mimedefang fix rc.d script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 23 15:10:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Mikhail T.
>Release:        
>Organization:
>Environment:
>Description:
- Force to always wait for daemon shutdown in stop_it func. Otherwise mimedefang may not work if stop/start was made too fast.
Suggested by: Daniel O'Connor <doconnor at gsoft dot com dot au>
- Bump PORTREVISION
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- Makefile	13 Aug 2011 07:52:29 -0000	1.74
+++ Makefile	23 Dec 2011 14:58:12 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	mimedefang
 PORTVERSION=	2.72
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/
 
cvs diff: Diffing files
Index: files/patch-examples__init-script.in
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/files/patch-examples__init-script.in,v
retrieving revision 1.1
diff -u -r1.1 patch-examples__init-script.in
--- files/patch-examples__init-script.in	13 Aug 2010 08:41:13 -0000	1.1
+++ files/patch-examples__init-script.in	23 Dec 2011 14:58:12 -0000
@@ -1,5 +1,5 @@
---- examples/init-script.in.orig	2009-05-04 17:34:32.000000000 +0200
-+++ examples/init-script.in	2010-08-13 10:34:05.000000000 +0200
+--- examples/init-script.in.orig	2010-06-30 01:50:32.000000000 +0400
++++ examples/init-script.in	2011-12-14 00:40:09.284988761 +0400
 @@ -39,6 +39,12 @@
  # The socket used by mimedefang to communicate with sendmail
  # SOCKET=$SPOOLDIR/mimedefang.sock
@@ -27,7 +27,7 @@
  
  # If you want to use the "notification" facility, set the appropriate port.
  # See the mimedefang-notify man page for details.
-@@ -189,6 +195,7 @@
+@@ -193,6 +199,7 @@
      procname=$PROGDIR/$prog-multiplexor
      start_cmd="start_it"
      stop_cmd="stop_it"
@@ -35,7 +35,7 @@
      sig_reload="INT"
      reread_cmd="reread_it"
      # provide both "reload", the FreeBSD default, with a direct signal to
-@@ -199,6 +206,8 @@
+@@ -203,6 +210,8 @@
  # Make sure required vars are set
  SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}
  MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}
@@ -44,7 +44,7 @@
  
  start_it() {
      if test -r $PID ; then
-@@ -281,6 +290,29 @@
+@@ -286,6 +295,29 @@
  	kill `cat $MXPID`
  	return 1
      fi
@@ -74,7 +74,16 @@
      return 0
  }
  
-@@ -368,6 +400,12 @@
+@@ -321,7 +353,7 @@
+     rm -f $MX_SOCKET > /dev/null 2>&1
+     rm -f $SOCKET > /dev/null 2>&1
+ 
+-    if [ "$1" = "wait" ] ; then
++    if [ 1 ] ; then
+ 	printf "Waiting for daemons to exit."
+ 	WAITPID=""
+ 	test -f $PID && WAITPID=`cat $PID`
+@@ -373,6 +405,12 @@
  	fi
  }
  


>Release-Note:
>Audit-Trail:
>Unformatted: