hi,

here is a diff that update mail/msmtp to 1.4.27

important fix:
http://msmtp.git.sourceforge.net/git/gitweb.cgi?p=msmtp/msmtp;a=commit;h=8aaf441afcd543de4598a916285706819e6c451a
(thanks to jeremy@ and Markus Lude that let me know the issue, and tested the 
upstream patch).

also i did some tweaks:
- install offline messaging helper scripts
- no need FAKE_FLAGS here
- remove now useless patch

looking for OKs.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/msmtp/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile    27 Nov 2011 14:13:37 -0000      1.28
+++ Makefile    10 Jan 2012 18:52:35 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =              SMTP plugin for MUAs
 
-DISTNAME =             msmtp-1.4.25
+DISTNAME =             msmtp-1.4.27
 CATEGORIES =           mail
 
 HOMEPAGE =             http://msmtp.sourceforge.net/
@@ -30,8 +30,6 @@ CONFIGURE_ARGS =      --with-libgsasl=no \
                        --with-libidn=yes \
                        --with-ssl=openssl \
                        --without-gnome-keyring
-FAKE_FLAGS =           mandir="${PREFIX}/man" \
-                       infodir="${PREFIX}/info"
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/msmtp
@@ -41,9 +39,13 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/Mutt+msmtp.txt ${PREFIX}/share/doc/msmtp
        ${INSTALL_DATA} ${WRKSRC}/scripts/msmtpqueue/{README,ChangeLog} \
                        ${PREFIX}/share/msmtp/msmtpqueue
+       ${INSTALL_DATA} ${WRKSRC}/scripts/msmtpq/README.msmtpq \
+                       ${PREFIX}/share/msmtp
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/set_sendmail/set_sendmail.sh \
                ${PREFIX}/share/examples/msmtp
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpqueue/*.sh \
+               ${PREFIX}/share/examples/msmtp
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/{msmtpq,msmtp-queue} \
                ${PREFIX}/share/examples/msmtp
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/msmtp/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo    22 Nov 2011 18:24:50 -0000      1.19
+++ distinfo    10 Jan 2012 18:52:35 -0000
@@ -1,5 +1,5 @@
-MD5 (msmtp-1.4.25.tar.bz2) = LZYDp7XB69g+oomsKqOmNA==
-RMD160 (msmtp-1.4.25.tar.bz2) = THS56TlCQBXEpHQmgnOiZOnzwb0=
-SHA1 (msmtp-1.4.25.tar.bz2) = 7jvk4lDL1v7y+xSvTq38DOWO9CQ=
-SHA256 (msmtp-1.4.25.tar.bz2) = ZXlq32Dh67Q0H4QVvTz6Zkcia9ul+6pa97w2mAirTmM=
-SIZE (msmtp-1.4.25.tar.bz2) = 302039
+MD5 (msmtp-1.4.27.tar.bz2) = LW0Q2cWe0rJjVVTtNfuSJg==
+RMD160 (msmtp-1.4.27.tar.bz2) = 9kjpzugC9UhyKUuEfyde2fiiNrA=
+SHA1 (msmtp-1.4.27.tar.bz2) = 4zV0UTO0cp/oTEn4NrTS+pKB4EA=
+SHA256 (msmtp-1.4.27.tar.bz2) = 9xLK2LJJYn8cavRL5CeVanJAdOc7lCjDLOCrGwqdEXA=
+SIZE (msmtp-1.4.27.tar.bz2) = 301918
Index: patches/patch-scripts_msmtpq_msmtp-queue
===================================================================
RCS file: patches/patch-scripts_msmtpq_msmtp-queue
diff -N patches/patch-scripts_msmtpq_msmtp-queue
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-scripts_msmtpq_msmtp-queue    10 Jan 2012 18:52:35 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- scripts/msmtpq/msmtp-queue.orig    Tue Jan 10 16:47:20 2012
++++ scripts/msmtpq/msmtp-queue Tue Jan 10 16:49:07 2012
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ ##--------------------------------------------------------------
+ ##
Index: patches/patch-scripts_msmtpq_msmtpQ
===================================================================
RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpq_msmtpQ,v
retrieving revision 1.1
diff -u -p -r1.1 patch-scripts_msmtpq_msmtpQ
--- patches/patch-scripts_msmtpq_msmtpQ 19 Oct 2008 20:35:01 -0000      1.1
+++ patches/patch-scripts_msmtpq_msmtpQ 10 Jan 2012 18:52:35 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-scripts_msmtpq_msmtpQ,v 1.1 2008/10/19 20:35:01 jasper Exp $
---- scripts/msmtpq/msmtpQ.orig Mon Jul 28 00:20:47 2008
-+++ scripts/msmtpq/msmtpQ      Tue Oct 14 14:18:06 2008
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- 
- #--------------------------------------------------------------
- #
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/msmtp/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   22 Nov 2011 18:24:50 -0000      1.7
+++ pkg/PLIST   10 Jan 2012 18:52:35 -0000
@@ -7,13 +7,16 @@ share/doc/msmtp/Mutt+msmtp.txt
 share/examples/msmtp/
 share/examples/msmtp/msmtp-enqueue.sh
 share/examples/msmtp/msmtp-listqueue.sh
+share/examples/msmtp/msmtp-queue
 share/examples/msmtp/msmtp-runqueue.sh
+share/examples/msmtp/msmtpq
 share/examples/msmtp/msmtprc-system.example
 @sample ${SYSCONFDIR}/msmtprc
 share/examples/msmtp/msmtprc-user.example
 share/examples/msmtp/set_sendmail.sh
 share/locale/de/LC_MESSAGES/msmtp.mo
 share/msmtp/
+share/msmtp/README.msmtpq
 share/msmtp/msmtpqueue/
 share/msmtp/msmtpqueue/ChangeLog
 share/msmtp/msmtpqueue/README

Reply via email to