Upgrade to 0.51

7 files changed, 54 insertions, 35 deletions

diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index 45421f304c00..c9da7f8ce201 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=       milter-sender
-PORTVERSION=    0.50
-PORTREVISION=   3
+PORTVERSION=    0.51
 CATEGORIES=     mail
 MASTER_SITES=   http://www.snert.com/Software/download/
-DISTFILES=      libsnert-1.31.tgz milter-sender-${PORTVERSION}.tgz
+DISTFILES=      libsnert-1.32.tgz milter-sender-${PORTVERSION}.tgz
 
 MAINTAINER=     ache@FreeBSD.org
 COMMENT=        Real-time sender address verification, based on Milter API
diff --git a/mail/milter-sender/distinfo b/mail/milter-sender/distinfo
index 1d0f6029325b..fe3d2908f0b0 100644
--- a/mail/milter-sender/distinfo
+++ b/mail/milter-sender/distinfo
@@ -1,4 +1,4 @@
-MD5 (libsnert-1.31.tgz) = 8446930e803200f30518b950a5c69f8a
-SIZE (libsnert-1.31.tgz) = 181926
-MD5 (milter-sender-0.50.tgz) = 8d4d0cb37935aa867a92bbafec476910
-SIZE (milter-sender-0.50.tgz) = 207473
+MD5 (libsnert-1.32.tgz) = 974e7cee99707e7d7475b6656a9f9b39
+SIZE (libsnert-1.32.tgz) = 182083
+MD5 (milter-sender-0.51.tgz) = 17960ce483953bf1403b943537a8e42e
+SIZE (milter-sender-0.51.tgz) = 209022
diff --git a/mail/milter-sender/files/patch-ab b/mail/milter-sender/files/patch-ab
index b4c2a5f4ca10..ebee88a344a5 100644
--- a/mail/milter-sender/files/patch-ab
+++ b/mail/milter-sender/files/patch-ab
@@ -1,19 +1,23 @@
---- install.sh.in.orig	Mon Feb  9 15:28:36 2004
-+++ install.sh.in	Fri Feb 13 00:05:50 2004
-@@ -17,19 +17,20 @@
+--- install.sh.in.orig	Mon Mar  1 12:59:54 2004
++++ install.sh.in	Sat Mar  6 12:21:24 2004
+@@ -17,21 +17,23 @@
  chown ${USER} ${STATEDIR}
  chgrp ${GROUP} ${STATEDIR}
  
 -cp -f ${MILTER} ${SBINDIR}
-+install -s ${MILTER} ${SBINDIR}
+-cp -f ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
++install -C -s ${MILTER} ${SBINDIR}
++install -C ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
++[ ! -f ${MAILDIR}/${MILTER}.mc ] && cp ${MAILDIR}/${MILTER}.mc.sample ${MAILDIR}/${MILTER}.mc
  
 -./milter-sender help=1 >${MILTER_CF}.sample
--chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
--chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
 +./milter-sender help=1 | sed 's|^MilterSocket=.*|MilterSocket=unix:/var/spool/milter-sender/socket|' >${MILTER_CF}.sample
 +[ ! -f ${MILTER_CF} ] && cp ${MILTER_CF}.sample ${MILTER_CF}
-+chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}*
-+chgrp ${GROUP} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}*
+ 
+-chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
+-chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
++chmod g+r ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
++chgrp ${GROUP} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
  
  case `uname -s` in
  *BSD*)
diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac
index 010b9f61b360..ee4a923ede72 100644
--- a/mail/milter-sender/files/patch-ac
+++ b/mail/milter-sender/files/patch-ac
@@ -1,6 +1,6 @@
---- milter-sender.sh.in.orig	Fri Jan 23 14:38:00 2004
-+++ milter-sender.sh.in	Fri Jan 30 15:25:06 2004
-@@ -68,34 +68,24 @@
+--- milter-sender.sh.in.orig	Tue Feb 24 20:18:59 2004
++++ milter-sender.sh.in	Sat Mar  6 12:33:09 2004
+@@ -69,34 +69,24 @@
  start()
  {
  	NAME=`basename "$PROGRAM"`
@@ -14,12 +14,13 @@
  	fi
  
  	# Make sure the old socket has been removed, especially for FreeBSD.
- 	rm -f ${REQUIRED_DIR}/socket
+ 	rm -f ${STATE_DIR}/socket
  	
 -	# Start the program in the background from a sub-shell
 -	# so that process will appear in the ps output immediately.
 -	sh -c "$PROGRAM $OPTIONS &"
--
++	$PROGRAM $OPTIONS &
+ 
 -	pid=`getpid "$PROGRAM"`
 -	if [ X"$pid" = X ]; then
 -		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
@@ -27,8 +28,6 @@
 -	fi
 -
 -	printf '\r\033[71C['${FG_GREEN}'  OK  '${FG_NORMAL}']\n'
-+	$PROGRAM $OPTIONS &
-+  
 +	echo -n " milter-sender"
  }
  
@@ -39,16 +38,16 @@
  
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
-@@ -112,7 +102,7 @@
- 			kill -KILL $pid
+@@ -113,7 +103,7 @@
  			
+ 			pid=`getpid "$PROGRAM"`
  			if [ X"$pid" != X ]; then					
 -				printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
 +				echo " milter-sender:FAILED"
  				return
  			fi
  			
-@@ -131,7 +121,7 @@
+@@ -132,7 +122,7 @@
  		fi
  	fi
  
@@ -57,7 +56,7 @@
  }
  
  case "$1" in
-@@ -148,9 +138,9 @@
+@@ -163,9 +153,9 @@
  status)
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
diff --git a/mail/milter-sender/files/patch-ae b/mail/milter-sender/files/patch-ae
new file mode 100644
index 000000000000..b5400844afb2
--- /dev/null
+++ b/mail/milter-sender/files/patch-ae
@@ -0,0 +1,20 @@
+--- milter-sender.mc.bak	Tue Mar  2 14:36:28 2004
++++ milter-sender.mc	Sat Mar  6 12:47:24 2004
+@@ -4,7 +4,7 @@
+ dnl Example configuration to be added to sendmail.mc.
+ dnl
+ 
+-define(`_FFR_MILTER', `1')dnl
++dnl define(`_FFR_MILTER', `1')dnl
+ dnl define(`_FFR_MILTER_421', `1`)dnl
+ 
+ dnl -------------------------------------------------------------------
+@@ -58,7 +58,7 @@
+ 
+ INPUT_MAIL_FILTER(
+ 	`milter-sender',
+-	`S=unix:/var/lib/milter-sender/socket, T=C:1m;S:30s;R:6m;E:1m'
++	`S=unix:/var/spool/milter-sender/socket, T=C:1m;S:30s;R:6m;E:1m'
+ )dnl
+ 
+ dnl define(
diff --git a/mail/milter-sender/pkg-message b/mail/milter-sender/pkg-message
index 28d863a1e9de..b0e2da0419fe 100644
--- a/mail/milter-sender/pkg-message
+++ b/mail/milter-sender/pkg-message
@@ -3,14 +3,7 @@
 In order to run this port, please add the following lines to
 /etc/mail/YOUR-CONF.mc:
 
-INPUT_MAIL_FILTER(
-	`milter-sender',
-	`S=unix:/var/spool/milter-sender/socket, F=T, T=C:1m;S:30s;R:6m;E:1m'
-)dnl
-define(
-	`confMILTER_MACROS_CONNECT', confMILTER_MACROS_CONNECT`,
-	{client_addr}, {client_name}, {client_port}, {client_resolve}'
-)dnl
+include(`milter-sender.mc')dnl
 
 Don't forget to remake sendmail configuration file after modifying
 YOUR-CONF.mc
diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist
index e23f3b4de9c7..e8d910bc33ea 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -21,7 +21,11 @@ sbin/milter-sender
 %%PORTDOCS%%%%DOCSDIR%%/milter-sender.mc
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 @unexec echo "If permanently deleting this package, don't forget to delete the filter"
-@unexec echo "description of milter-sender from /etc/mail/YOUR-CONF.mc and to rebuild"
+@unexec echo "inclusion of milter-sender from /etc/mail/YOUR-CONF.mc and to rebuild"
 @unexec echo "sendmail.cf file!"
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@cwd /
+@unexec if [ -f %D/etc/mail/milter-sender.mc ] && cmp -s %D/etc/mail/milter-sender.mc %D/etc/mail/milter-sender.mc.sample; then rm -f %D/etc/mail/milter-sender.mc; fi
+etc/mail/milter-sender.mc.sample
+@exec if [ ! -f %D/etc/mail/milter-sender.mc ] ; then cp %D/%F %B/milter-sender.mc; fi