Update to 1.4.26

* Introduce scripts option to install optional scripts.

Changelog:
Version 1.4.26:
- A new version of the msmtpq script fixes serious bugs. To update to the new
  version of the script, you need to remove the old msmtpQ symlink, change
  msmtpQ to msmtpq in your MUA config, and use msmtp-queue for queue management.

4 files changed, 51 insertions, 11 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index b0908b240d8..626c0510253 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2011/11/01 06:11:55 sbd Exp $
+# $NetBSD: Makefile,v 1.34 2011/12/02 12:33:53 ryoon Exp $
 
-DISTNAME=	msmtp-1.4.25
-PKGREVISION=	1
+DISTNAME=	msmtp-1.4.26
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,6 +23,7 @@ CONF_FILES=	${EGDIR}/msmtprc-user.example \
 		${PKG_SYSCONFDIR}/msmtprc
 
 INFO_FILES=	yes
+PLIST_VARS+=	scripts
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Interix"
@@ -32,7 +32,8 @@ CPPFLAGS+=	-D__WINSOCK
 
 .include "options.mk"
 
-post-install:
+.PHONY: install-msmtp-scripts
+post-install: install-msmtp-scripts
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${DESTDIR}${EGDIR}
 
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index f693260e102..7ff65a54af7 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,6 +1,21 @@
-@comment $NetBSD: PLIST,v 1.9 2011/05/13 08:00:04 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/12/02 12:33:53 ryoon Exp $
 bin/msmtp
 info/msmtp.info
 man/man1/msmtp.1
 share/examples/msmtp/msmtprc-user.example
 share/locale/de/LC_MESSAGES/msmtp.mo
+${PLIST.scripts}share/msmtp/find_alias/find_alias_for_msmtp.sh
+${PLIST.scripts}share/msmtp/msmtp-gnome-tool/README
+${PLIST.scripts}share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py
+${PLIST.scripts}share/msmtp/msmtpq/README.msmtpq
+${PLIST.scripts}share/msmtp/msmtpq/msmtp-queue
+${PLIST.scripts}share/msmtp/msmtpq/msmtpq
+${PLIST.scripts}share/msmtp/msmtpqueue/ChangeLog
+${PLIST.scripts}share/msmtp/msmtpqueue/README
+${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-enqueue.sh
+${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-listqueue.sh
+${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-runqueue.sh
+${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.conf
+${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.sh
+${PLIST.scripts}share/msmtp/vim/README
+${PLIST.scripts}share/msmtp/vim/msmtp.vim
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 08240fb793c..557a6b3fc27 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2011/10/18 10:27:50 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2011/12/02 12:33:53 ryoon Exp $
 
-SHA1 (msmtp-1.4.25.tar.bz2) = ee3be4e250cbd6fef2fb14af4eadfc0ce58ef424
-RMD160 (msmtp-1.4.25.tar.bz2) = 4c74b9e939424015c4a474268273a264e9f3c1bd
-Size (msmtp-1.4.25.tar.bz2) = 302039 bytes
+SHA1 (msmtp-1.4.26.tar.bz2) = 0ce5352447b01dc21970b7a00cf13b8a3e7172c9
+RMD160 (msmtp-1.4.26.tar.bz2) = 9e552483193129589510f589f3d11ed4ed0c0abb
+Size (msmtp-1.4.26.tar.bz2) = 301686 bytes
 SHA1 (patch-src_Makefile.in) = 0af62b9cee833f3b23e2d504462a380bb97953cc
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index b90f8305913..00e06f3e13e 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.11 2010/07/06 07:33:43 obache Exp $
+# $NetBSD: options.mk,v 1.12 2011/12/02 12:33:53 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 
-PKG_SUPPORTED_OPTIONS=	gnome-keyring gsasl idn inet6
+PKG_SUPPORTED_OPTIONS=	gnome-keyring gsasl idn inet6 scripts
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
@@ -57,3 +57,27 @@ USE_TOOLS+=		pkg-config
 .else
 CONFIGURE_ARGS+=	--without-gnome-keyring
 .endif
+
+###
+### Install additional scripts
+###
+.if !empty(PKG_OPTIONS:Mscripts)
+CHECK_INTERPRETER_SKIP+=	share/msmtp/find_alias/find_alias_for_msmtp.sh \
+				share/msmtp/msmtpq/msmtp-queue \
+				share/msmtp/msmtpq/msmtpq \
+				share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py \
+				share/msmtp/msmtpqueue/msmtp-enqueue.sh \
+				share/msmtp/msmtpqueue/msmtp-listqueue.sh \
+				share/msmtp/msmtpqueue/msmtp-runqueue.sh \
+				share/msmtp/set_sendmail/set_sendmail.sh
+PLIST.scripts=		yes
+USE_TOOLS+=		pax
+INSTALLATION_DIRS+=	share/msmtp
+install-msmtp-scripts:
+	cd ${WRKSRC}/scripts && \
+		pax -rw find_alias msmtp-gnome-tool msmtpq msmtpqueue \
+			set_sendmail vim \
+			${DESTDIR}${PREFIX}/share/msmtp
+.else
+install-msmtp-scripts:
+.endif