[pkgsrc/trunk]: pkgsrc/mail/tmda Avoid passing "-i" to qmail-inject: it's an ...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86c475b4928b
branches:  trunk
changeset: 523711:86c475b4928b
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jan 11 19:22:43 2007 +0000

description:
Avoid passing "-i" to qmail-inject: it's an invalid option and the
intended behavior is already the default. Fixes a longstanding
problem using TMDA with qmail. While here, mollify pkglint slightly.

Bump PKGREVISION.

diffstat:

 mail/tmda/Makefile         |   6 +++---
 mail/tmda/distinfo         |   3 ++-
 mail/tmda/patches/patch-ab |  19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r ba8074c1bd61 -r 86c475b4928b mail/tmda/Makefile
--- a/mail/tmda/Makefile        Thu Jan 11 19:19:01 2007 +0000
+++ b/mail/tmda/Makefile        Thu Jan 11 19:22:43 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2006/12/26 06:44:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/11 19:22:43 schmonz Exp $
 #
 
 DISTNAME=      tmda-1.1.9
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail python
 MASTER_SITES=  http://tmda.net/releases/
 MASTER_SITES+= ftp://tmda.net/pub/tmda/releases/
@@ -12,7 +12,7 @@
 HOMEPAGE=      http://tmda.net/
 COMMENT=       Python-based SPAM reduction system
 
-PY_PATCHPLIST=         # defined
+PY_PATCHPLIST=         yes
 PYTHON_PATCH_SCRIPTS=  ${TMDA_PROGRAMS}
 
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
diff -r ba8074c1bd61 -r 86c475b4928b mail/tmda/distinfo
--- a/mail/tmda/distinfo        Thu Jan 11 19:19:01 2007 +0000
+++ b/mail/tmda/distinfo        Thu Jan 11 19:22:43 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2006/12/20 03:22:39 schmonz Exp $
+$NetBSD: distinfo,v 1.18 2007/01/11 19:22:43 schmonz Exp $
 
 SHA1 (tmda-1.1.9.tgz) = 5c5a0d5e6679dcccfc7e781f859a01054e37d9fe
 RMD160 (tmda-1.1.9.tgz) = 63cd03cfec6bd644311c2b258f3f4f8fdb3b25f5
 Size (tmda-1.1.9.tgz) = 331721 bytes
 SHA1 (patch-aa) = 579bd9685d0736dccf332e69246a5a5463746791
+SHA1 (patch-ab) = 82715854cfdedb0ec92c5d77580d09ccda553073
diff -r ba8074c1bd61 -r 86c475b4928b mail/tmda/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/tmda/patches/patch-ab        Thu Jan 11 19:22:43 2007 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2007/01/11 19:22:43 schmonz Exp $
+
+--- TMDA/Util.py.orig  2006-10-29 22:07:56.000000000 -0500
++++ TMDA/Util.py
+@@ -596,7 +596,13 @@ def sendmail(msgstr, envrecip, envsender
+            Defaults.MAIL_TRANSFER_AGENT in ('postfix', 'qmail') and \
+            Defaults.MAIL_TRANSPORT == 'sendmail':
+         envsender = ''
+-    if Defaults.MAIL_TRANSPORT == 'sendmail':
++    if Defaults.MAIL_TRANSPORT == 'sendmail' and \
++           Defaults.MAIL_TRANSFER_AGENT == 'qmail':
++        # skip "-i" for qmail-inject (invalid option, and it's the default)
++        cmd = (Defaults.SENDMAIL_PROGRAM,
++               '-f', envsender, '--', envrecip)
++        pipecmd(cmd, msgstr)
++    elif Defaults.MAIL_TRANSPORT == 'sendmail':
+         # You can avoid the shell by passing a tuple of arguments as
+         # the command instead of a string.  This will cause the
+         # popen2.Popen3() code to execvp() "/usr/bin/sendmail" with