Update to milter-sender 0.57 and libsnert-1.34.

7 files changed, 59 insertions, 44 deletions

diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index e0b4246..dc82e43 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	milter-sender
-PORTVERSION=	0.55
+PORTVERSION=	0.57
 CATEGORIES=	mail
 MASTER_SITES=	http://www.snert.com/Software/download/
-DISTFILES=	libsnert-1.33.tgz milter-sender-${PORTVERSION}.tgz
+DISTFILES=	libsnert-1.34.tgz milter-sender-${PORTVERSION}.tgz
 
 MAINTAINER=	ports@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 52f7545..1f7587e 100644
--- a/mail/milter-sender/distinfo
+++ b/mail/milter-sender/distinfo
@@ -1,4 +1,4 @@
-MD5 (libsnert-1.33.tgz) = 8142fb74496daac68080a19a41436706
-SIZE (libsnert-1.33.tgz) = 208388
-MD5 (milter-sender-0.55.tgz) = df89b4bcdfbd02d60a2ff8c13d130f47
-SIZE (milter-sender-0.55.tgz) = 213324
+MD5 (libsnert-1.34.tgz) = fdd8482da6124ba8a79220ea54089cee
+SIZE (libsnert-1.34.tgz) = 227163
+MD5 (milter-sender-0.57.tgz) = 2c4e266ed1f916dee8df95870c209be0
+SIZE (milter-sender-0.57.tgz) = 235529
diff --git a/mail/milter-sender/files/patch-aa b/mail/milter-sender/files/patch-aa
index 9b1e997..edd3693 100644
--- a/mail/milter-sender/files/patch-aa
+++ b/mail/milter-sender/files/patch-aa
@@ -1,11 +1,11 @@
---- configure.orig	Wed Nov  5 23:30:58 2003
-+++ configure	Sat Nov 15 05:23:57 2003
-@@ -1466,7 +1466,7 @@
- 	STARTUP_SCRIPT='/usr/local/etc/rc.d'
+--- configure.orig	Fri Jun 11 20:37:06 2004
++++ configure	Wed Jun 16 13:43:31 2004
+@@ -1617,7 +1617,7 @@
+ 	COMPILE='$(CC) $(CFLAGS) $(CC_O)$*$O -c $<'
  
  	# Assume GCC.
--	CFLAGS="$CFLAGS -pthread -Wall"
-+	CFLAGS="$CFLAGS -Wall"
+-	CFLAGS="$CFLAGS -pthread -Wall -fvolatile"
++	CFLAGS="$CFLAGS -Wall -fvolatile"
  elif test "$OS" = 'SunOS'; then
  	# This used to be -I{}, but I've seen two different SunOS 5.8
  	# systems in two different parts of the world with man pages
diff --git a/mail/milter-sender/files/patch-ab b/mail/milter-sender/files/patch-ab
index abaa9c2..8085bbc 100644
--- a/mail/milter-sender/files/patch-ab
+++ b/mail/milter-sender/files/patch-ab
@@ -1,6 +1,6 @@
---- install.sh.in.orig	Thu Apr  1 00:44:46 2004
-+++ install.sh.in	Fri Jun  4 06:38:29 2004
-@@ -13,38 +13,22 @@
+--- install.sh.in.orig	Sun May 30 11:26:05 2004
++++ install.sh.in	Wed Jun 16 13:50:22 2004
+@@ -18,62 +18,22 @@
  MAILDIR="@with_sendmail@"
  MILTER_CF="@milter_cf@"
  
@@ -20,7 +20,34 @@
  
 -	case `uname -s` in
 -	Linux*)
--		chkconfig --add ${MILTER}
+-		which chkconfig
+-		if test $? -eq 0; then	
+-			chkconfig --add ${MILTER}
+-		else
+-			# Probably a stupid Debian system.
+-			cd ${STARTUP_DIR}
++${BSD_INSTALL_PROGRAM} ${MILTER} ${SBINDIR}
+ 
+-			# Create relative links
+-			cd ../rc0.d
+-			ln -s ../init.d/${MILTER} K20${MILTER}
+-			cd ../rc1.d
+-			ln -s ../init.d/${MILTER} K20${MILTER}
+-			cd ../rc6.d
+-			ln -s ../init.d/${MILTER} K20${MILTER}
++${BSD_INSTALL_DATA} ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
++[ ! -f ${MAILDIR}/${MILTER}.mc ] && cp ${MAILDIR}/${MILTER}.mc.sample ${MAILDIR}/${MILTER}.mc
+ 
+-			# Assume S20sendmail or higher.
+-			cd ../rc2.d
+-			ln -s ../init.d/${MILTER} S18${MILTER}
+-			cd ../rc3.d
+-			ln -s ../init.d/${MILTER} S18${MILTER}
+-			cd ../rc4.d
+-			ln -s ../init.d/${MILTER} S18${MILTER}
+-			cd ../rc5.d
+-			ln -s ../init.d/${MILTER} S18${MILTER}
+-		fi
 -		;;
 -	SunOS*)
 -		# Does SunOS have a chkconfig like tool?	
@@ -29,17 +56,14 @@
 -		;;
 -	esac
 -fi
-+${BSD_INSTALL_PROGRAM} ${MILTER} ${SBINDIR}
++./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}
  
 -cp -f ${MILTER} ${SBINDIR}
 -chmod 550 ${SBINDIR}/${MILTER}
-+${BSD_INSTALL_DATA} ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.sample
-+[ ! -f ${MAILDIR}/${MILTER}.mc ] && cp ${MAILDIR}/${MILTER}.mc.sample ${MAILDIR}/${MILTER}.mc
- 
+-
 -cp -f ${MILTER}.mc ${MAILDIR}/${MILTER}.mc.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}
- 
+-
 -./milter-sender help=1 >${MILTER_CF}.sample
 -
 -chmod g+r ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* ${MILTER_CF}.sample*
diff --git a/mail/milter-sender/files/patch-ad b/mail/milter-sender/files/patch-ad
index ec837f3..611e79b 100644
--- a/mail/milter-sender/files/patch-ad
+++ b/mail/milter-sender/files/patch-ad
@@ -1,11 +1,10 @@
---- ../lib/configure.orig	Sun Mar 28 11:13:05 2004
-+++ ../lib/configure	Thu Jun  3 17:25:12 2004
-@@ -1581,7 +1581,7 @@
- 		COMPILE='$(CC) $(CFLAGS) $(CC_O)$*$O -c $<'
- 	elif test "$OS" = 'FreeBSD'; then
- 		# Assume GCC.
--		CFLAGS="${CFLAGS} -pthread -Wall"
-+		CFLAGS="${CFLAGS} -Wall"
+--- ../lib/configure.orig	Wed Jun 16 13:56:11 2004
++++ ../lib/configure	Wed Jun 16 13:56:19 2004
+@@ -1621,7 +1621,6 @@
  
- 		XARGSI='xargs -J{}'
+ 	if test "$OS" = 'FreeBSD'; then
+ 		# Assume GCC.
+-		CFLAGS="${CFLAGS} -D_THREAD_SAFE -pthread"
+ 		COMPILE='$(CC) $(CFLAGS) $(CC_O)$*$O -c $<'
  		ARCHIVE='ar rc $(LIB) {}'
+ 		XARGSI='xargs -J{}'
diff --git a/mail/milter-sender/files/patch-ae b/mail/milter-sender/files/patch-ae
index b540084..9e8cb82 100644
--- a/mail/milter-sender/files/patch-ae
+++ b/mail/milter-sender/files/patch-ae
@@ -1,20 +1,11 @@
---- milter-sender.mc.bak	Tue Mar  2 14:36:28 2004
-+++ milter-sender.mc	Sat Mar  6 12:47:24 2004
+--- milter-sender.mc.in.orig	Wed Jun 16 13:58:58 2004
++++ milter-sender.mc.in	Wed Jun 16 13:59: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(
+ dnl Enable this for debug output from Sendmail.
diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist
index 6d04586..606b779 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -11,6 +11,7 @@ sbin/milter-sender
 %%PORTDOCS%%%%DOCSDIR%%/Img/bg.gif
 %%PORTDOCS%%%%DOCSDIR%%/Img/dilbert2003071742312.gif
 %%PORTDOCS%%%%DOCSDIR%%/Img/dilbert2003228690821.gif
+%%PORTDOCS%%%%DOCSDIR%%/Img/dilbert20040429.gif
 %%PORTDOCS%%%%DOCSDIR%%/Img/mrpixel.gif
 %%PORTDOCS%%%%DOCSDIR%%/Img/overview.png
 %%PORTDOCS%%%%DOCSDIR%%/Img/sendmail-bat-left-142x38.png