diff options
Diffstat (limited to 'mail/spamass-milter')
| -rw-r--r-- | mail/spamass-milter/Makefile | 12 | ||||
| -rw-r--r-- | mail/spamass-milter/distinfo | 6 | ||||
| -rw-r--r-- | mail/spamass-milter/files/patch-spamass-milter.cpp | 24 | ||||
| -rw-r--r-- | mail/spamass-milter/files/spamass-milter.in (renamed from mail/spamass-milter/files/spamass-milter.sh) | 0 | ||||
| -rw-r--r-- | mail/spamass-milter/pkg-plist | 1 |
5 files changed, 8 insertions, 35 deletions
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index af39bd0502b3..9f837fbc3662 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -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@FreeBSD.org +MAINTAINER= thomas@goodking.ca COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin BUILD_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin @@ -51,7 +50,7 @@ WITH_SENDMAIL_BASE=yes .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 @@ MILTERLIB= ${MILTERBASE}/lib 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 @@ MAN1= spamass-milter.1 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 @@ post-patch: ${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 --git a/mail/spamass-milter/distinfo b/mail/spamass-milter/distinfo index 8b65c4064761..255b64c2dab7 100644 --- a/mail/spamass-milter/distinfo +++ b/mail/spamass-milter/distinfo @@ -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 --git a/mail/spamass-milter/files/patch-spamass-milter.cpp b/mail/spamass-milter/files/patch-spamass-milter.cpp deleted file mode 100644 index 2bef5a151b9c..000000000000 --- a/mail/spamass-milter/files/patch-spamass-milter.cpp +++ /dev/null @@ -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 --git a/mail/spamass-milter/files/spamass-milter.sh b/mail/spamass-milter/files/spamass-milter.in index 80b5f871d735..80b5f871d735 100644 --- a/mail/spamass-milter/files/spamass-milter.sh +++ b/mail/spamass-milter/files/spamass-milter.in diff --git a/mail/spamass-milter/pkg-plist b/mail/spamass-milter/pkg-plist index 94533411e057..ba4a32280803 100644 --- a/mail/spamass-milter/pkg-plist +++ b/mail/spamass-milter/pkg-plist @@ -1,3 +1,2 @@ sbin/spamass-milter -etc/rc.d/spamass-milter.sh %%PORTDOCS%%%%DOCSDIR%%/activation.txt |