ports/98766: [PATCH] mail/spamass-milter: update to 0.3.1, take maintainership

[Thomas Abthorpe]

>Number:         98766
>Category:       ports
>Synopsis:       [PATCH] mail/spamass-milter: update to 0.3.1, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 09 20:30:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Abthorpe
>Release:        FreeBSD 6.1-RELEASE-p1 i386
>Organization:
GoodKing.Ca
>Environment:
System: FreeBSD stjames.stthomasanglican.org 6.1-RELEASE-p1 FreeBSD 6.1-RELEASE-p1 #17: Wed May 31 22:06:23 EDT 2006
>Description:
- Update to 0.3.1
- Take maintainership

Added file(s):
- files/spamass-milter.in

Removed file(s):
- files/patch-spamass-milter.cpp
- files/spamass-milter.sh

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- spamass-milter-0.3.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/Makefile /usr/home/ports/mail/spamass-milter/Makefile
--- /usr/ports/mail/spamass-milter/Makefile	Wed May 10 18:37:02 2006
+++ /usr/home/ports/mail/spamass-milter/Makefile	Fri Jun  9 16:21:21 2006
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	spamass-milter
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	spamass-milt
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	thomas at goodking.ca
 COMMENT=	Sendmail Milter (mail filter) plugin for SpamAssassin
 
 BUILD_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
@@ -51,7 +50,7 @@
 .if exists(/usr/lib/libmilter.a)
 MILTERBASE=	/usr
 .else
-BROKEN=	"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes"
+BROKEN=	Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
 .endif
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
@@ -68,7 +67,7 @@
 CPPFLAGS+=	-I${MILTERINC}
 LDFLAGS+=	-L${MILTERLIB}
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	spamass-milter
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
@@ -79,7 +78,7 @@
 
 post-patch:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/spamass-milter.sh > ${WRKDIR}/spamass-milter.sh
+		${FILESDIR}/spamass-milter.in > ${WRKDIR}/spamass-milter
 	@${SED} -e's,%%PREFIX%%,${PREFIX},g' \
 		${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt
 .if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
@@ -89,7 +88,6 @@
 		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/spamass-milter.sh ${PREFIX}/etc/rc.d/spamass-milter.sh
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/activation.txt ${DOCSDIR}/activation.txt
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/distinfo /usr/home/ports/mail/spamass-milter/distinfo
--- /usr/ports/mail/spamass-milter/distinfo	Fri Nov 25 10:30:58 2005
+++ /usr/home/ports/mail/spamass-milter/distinfo	Fri Jun  9 14:28:57 2006
@@ -1,3 +1,3 @@
-MD5 (spamass-milter-0.3.0.tar.gz) = ced600331a0df7609fdbdf0e6d0eb943
-SHA256 (spamass-milter-0.3.0.tar.gz) = bf4c7c0802df6f21a8482b714f9b881156ab1ae4d049c3abe6ab0776d7c9a34d
-SIZE (spamass-milter-0.3.0.tar.gz) = 140126
+MD5 (spamass-milter-0.3.1.tar.gz) = ca6bf6a9c88db74a6bfea41f499c0ba6
+SHA256 (spamass-milter-0.3.1.tar.gz) = 4222b21d098f292b4899a84caf56458c876c6774fd14132fbd4c31f6190b27e5
+SIZE (spamass-milter-0.3.1.tar.gz) = 141144
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/files/patch-spamass-milter.cpp /usr/home/ports/mail/spamass-milter/files/patch-spamass-milter.cpp
--- /usr/ports/mail/spamass-milter/files/patch-spamass-milter.cpp	Thu Mar 23 21:30:36 2006
+++ /usr/home/ports/mail/spamass-milter/files/patch-spamass-milter.cpp	Wed Dec 31 19:00:00 1969
@@ -1,24 +0,0 @@
-Index: spamass-milter.cpp
-diff -u spamass-milter.cpp.orig spamass-milter.cpp
---- spamass-milter.cpp.orig	Sat Feb  5 16:03:22 2005
-+++ spamass-milter.cpp	Fri Mar 24 11:10:53 2006
-@@ -678,9 +678,16 @@
-   if (header[field_end-1] == '\r')
-   	field_end--;
- 
--  //  Maybe remove the whitespace picked up when a header wraps - this
--  //  might actually be a requirement
--  return header.substr( field_start, field_end - field_start );
-+  string data = header.substr( field_start, field_end - field_start );
-+ 
-+  /* Replace all CRLF pairs with LF */
-+  idx = 0;
-+  while ( (idx = data.find("\r\n", idx)) != string::npos )
-+  {
-+       data.replace(idx,2,"\n");
-+  }
-+
-+  return data;
- }
- 
- 
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/files/spamass-milter.in /usr/home/ports/mail/spamass-milter/files/spamass-milter.in
--- /usr/ports/mail/spamass-milter/files/spamass-milter.in	Wed Dec 31 19:00:00 1969
+++ /usr/home/ports/mail/spamass-milter/files/spamass-milter.in	Fri Jun  9 14:49:44 2006
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/mail/spamass-milter/files/spamass-milter.sh,v 1.4 2006/05/18 06:59:06 ume Exp $
+#
+
+# PROVIDE: spamass-milter
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable spamass-milter:
+#
+#spamass_milter_enable="YES"
+#
+# See spamass-milter(8) for flags.
+#
+
+. %%RC_SUBR%%
+
+name=spamass_milter
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/spamass-milter
+required_dirs=%%PREFIX%%/share/spamassassin
+
+start_postcmd=start_postcmd
+stop_postcmd=stop_postcmd
+
+start_postcmd()
+{
+  if test -f /var/run/sendmail.pid
+  then
+	sleep 1
+	kill -HUP `head -1 /var/run/sendmail.pid`
+  fi
+}
+
+stop_postcmd()
+{
+  rm -f ${spamass_milter_socket}
+  if test -f /var/run/sendmail.pid
+  then
+	sleep 1
+	kill -HUP `head -1 /var/run/sendmail.pid`
+  fi
+}
+
+# set defaults
+
+spamass_milter_enable=${spamass_milter_enable:-"NO"}
+spamass_milter_socket=${spamass_milter_socket:-"/var/run/spamass-milter.sock"}
+spamass_milter_flags=${spamass_milter_flags:-"-f -p ${spamass_milter_socket}"}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/files/spamass-milter.sh /usr/home/ports/mail/spamass-milter/files/spamass-milter.sh
--- /usr/ports/mail/spamass-milter/files/spamass-milter.sh	Thu May 18 02:59:06 2006
+++ /usr/home/ports/mail/spamass-milter/files/spamass-milter.sh	Wed Dec 31 19:00:00 1969
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/spamass-milter/files/spamass-milter.sh,v 1.4 2006/05/18 06:59:06 ume Exp $
-#
-
-# PROVIDE: spamass-milter
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable spamass-milter:
-#
-#spamass_milter_enable="YES"
-#
-# See spamass-milter(8) for flags.
-#
-
-. %%RC_SUBR%%
-
-name=spamass_milter
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/spamass-milter
-required_dirs=%%PREFIX%%/share/spamassassin
-
-start_postcmd=start_postcmd
-stop_postcmd=stop_postcmd
-
-start_postcmd()
-{
-  if test -f /var/run/sendmail.pid
-  then
-	sleep 1
-	kill -HUP `head -1 /var/run/sendmail.pid`
-  fi
-}
-
-stop_postcmd()
-{
-  rm -f ${spamass_milter_socket}
-  if test -f /var/run/sendmail.pid
-  then
-	sleep 1
-	kill -HUP `head -1 /var/run/sendmail.pid`
-  fi
-}
-
-# set defaults
-
-spamass_milter_enable=${spamass_milter_enable:-"NO"}
-spamass_milter_socket=${spamass_milter_socket:-"/var/run/spamass-milter.sock"}
-spamass_milter_flags=${spamass_milter_flags:-"-f -p ${spamass_milter_socket}"}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/pkg-plist /usr/home/ports/mail/spamass-milter/pkg-plist
--- /usr/ports/mail/spamass-milter/pkg-plist	Sun Mar 13 06:20:42 2005
+++ /usr/home/ports/mail/spamass-milter/pkg-plist	Fri Jun  9 16:06:31 2006
@@ -1,3 +1,2 @@
 sbin/spamass-milter
-etc/rc.d/spamass-milter.sh
-%%PORTDOCS%%%%DOCSDIR%%/activation.txt
+%%DOCSDIR%%/activation.txt
--- spamass-milter-0.3.1.patch ends here ---

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