Fri Dec 2 12:33:53 2011 UTC ()
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.


(ryoon)
diff -r1.33 -r1.34 pkgsrc/mail/msmtp/Makefile
diff -r1.9 -r1.10 pkgsrc/mail/msmtp/PLIST
diff -r1.21 -r1.22 pkgsrc/mail/msmtp/distinfo
diff -r1.11 -r1.12 pkgsrc/mail/msmtp/options.mk
cvs diff -r1.33 -r1.34 pkgsrc/mail/msmtp/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/msmtp/Makefile 2011/11/01 06:11:55 1.33
+++ pkgsrc/mail/msmtp/Makefile 2011/12/02 12:33:53 1.34
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.33 2011/11/01 06:11:55 sbd Exp $ 1# $NetBSD: Makefile,v 1.34 2011/12/02 12:33:53 ryoon Exp $
2 2
3DISTNAME= msmtp-1.4.25 3DISTNAME= msmtp-1.4.26
4PKGREVISION= 1 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msmtp/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msmtp/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= bcv@hub3.net 8MAINTAINER= bcv@hub3.net
10HOMEPAGE= http://msmtp.sourceforge.net/ 9HOMEPAGE= http://msmtp.sourceforge.net/
11COMMENT= SMTP plugin for MUAs 10COMMENT= SMTP plugin for MUAs
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18USE_TOOLS+= pkg-config msgfmt xgettext 17USE_TOOLS+= pkg-config msgfmt xgettext
19 18
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
21 20
22EGDIR= ${PREFIX}/share/examples/msmtp 21EGDIR= ${PREFIX}/share/examples/msmtp
23CONF_FILES= ${EGDIR}/msmtprc-user.example \ 22CONF_FILES= ${EGDIR}/msmtprc-user.example \
24 ${PKG_SYSCONFDIR}/msmtprc 23 ${PKG_SYSCONFDIR}/msmtprc
25 24
26INFO_FILES= yes 25INFO_FILES= yes
 26PLIST_VARS+= scripts
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29.if ${OPSYS} == "Interix" 29.if ${OPSYS} == "Interix"
30CPPFLAGS+= -D__WINSOCK 30CPPFLAGS+= -D__WINSOCK
31.endif 31.endif
32 32
33.include "options.mk" 33.include "options.mk"
34 34
35post-install: 35.PHONY: install-msmtp-scripts
 36post-install: install-msmtp-scripts
36 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 37 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
37 ${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${DESTDIR}${EGDIR} 38 ${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${DESTDIR}${EGDIR}
38 39
39.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/mail/msmtp/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/msmtp/PLIST 2011/05/13 08:00:04 1.9
+++ pkgsrc/mail/msmtp/PLIST 2011/12/02 12:33:53 1.10
@@ -1,6 +1,21 @@ @@ -1,6 +1,21 @@
1@comment $NetBSD: PLIST,v 1.9 2011/05/13 08:00:04 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.10 2011/12/02 12:33:53 ryoon Exp $
2bin/msmtp 2bin/msmtp
3info/msmtp.info 3info/msmtp.info
4man/man1/msmtp.1 4man/man1/msmtp.1
5share/examples/msmtp/msmtprc-user.example 5share/examples/msmtp/msmtprc-user.example
6share/locale/de/LC_MESSAGES/msmtp.mo 6share/locale/de/LC_MESSAGES/msmtp.mo
 7${PLIST.scripts}share/msmtp/find_alias/find_alias_for_msmtp.sh
 8${PLIST.scripts}share/msmtp/msmtp-gnome-tool/README
 9${PLIST.scripts}share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py
 10${PLIST.scripts}share/msmtp/msmtpq/README.msmtpq
 11${PLIST.scripts}share/msmtp/msmtpq/msmtp-queue
 12${PLIST.scripts}share/msmtp/msmtpq/msmtpq
 13${PLIST.scripts}share/msmtp/msmtpqueue/ChangeLog
 14${PLIST.scripts}share/msmtp/msmtpqueue/README
 15${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-enqueue.sh
 16${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-listqueue.sh
 17${PLIST.scripts}share/msmtp/msmtpqueue/msmtp-runqueue.sh
 18${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.conf
 19${PLIST.scripts}share/msmtp/set_sendmail/set_sendmail.sh
 20${PLIST.scripts}share/msmtp/vim/README
 21${PLIST.scripts}share/msmtp/vim/msmtp.vim
cvs diff -r1.21 -r1.22 pkgsrc/mail/msmtp/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/msmtp/distinfo 2011/10/18 10:27:50 1.21
+++ pkgsrc/mail/msmtp/distinfo 2011/12/02 12:33:53 1.22
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.21 2011/10/18 10:27:50 ryoon Exp $ 1$NetBSD: distinfo,v 1.22 2011/12/02 12:33:53 ryoon Exp $
2 2
3SHA1 (msmtp-1.4.25.tar.bz2) = ee3be4e250cbd6fef2fb14af4eadfc0ce58ef424 3SHA1 (msmtp-1.4.26.tar.bz2) = 0ce5352447b01dc21970b7a00cf13b8a3e7172c9
4RMD160 (msmtp-1.4.25.tar.bz2) = 4c74b9e939424015c4a474268273a264e9f3c1bd 4RMD160 (msmtp-1.4.26.tar.bz2) = 9e552483193129589510f589f3d11ed4ed0c0abb
5Size (msmtp-1.4.25.tar.bz2) = 302039 bytes 5Size (msmtp-1.4.26.tar.bz2) = 301686 bytes
6SHA1 (patch-src_Makefile.in) = 0af62b9cee833f3b23e2d504462a380bb97953cc 6SHA1 (patch-src_Makefile.in) = 0af62b9cee833f3b23e2d504462a380bb97953cc
cvs diff -r1.11 -r1.12 pkgsrc/mail/msmtp/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/msmtp/options.mk 2010/07/06 07:33:43 1.11
+++ pkgsrc/mail/msmtp/options.mk 2011/12/02 12:33:53 1.12
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.11 2010/07/06 07:33:43 obache Exp $ 1# $NetBSD: options.mk,v 1.12 2011/12/02 12:33:53 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp 3PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp
4 4
5PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls ssl 6PKG_OPTIONS_GROUP.ssl= gnutls ssl
7 7
8PKG_SUPPORTED_OPTIONS= gnome-keyring gsasl idn inet6 8PKG_SUPPORTED_OPTIONS= gnome-keyring gsasl idn inet6 scripts
9PKG_SUGGESTED_OPTIONS= ssl 9PKG_SUGGESTED_OPTIONS= ssl
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13### 13###
14### SSL support 14### SSL support
15### 15###
16.if !empty(PKG_OPTIONS:Mssl) 16.if !empty(PKG_OPTIONS:Mssl)
17. include "../../security/openssl/buildlink3.mk" 17. include "../../security/openssl/buildlink3.mk"
18CONFIGURE_ARGS+= --with-ssl=openssl 18CONFIGURE_ARGS+= --with-ssl=openssl
19CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} 19CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl}
20.elif !empty(PKG_OPTIONS:Mgnutls) 20.elif !empty(PKG_OPTIONS:Mgnutls)
21. include "../../security/gnutls/buildlink3.mk" 21. include "../../security/gnutls/buildlink3.mk"
@@ -47,13 +47,37 @@ CONFIGURE_ARGS+= --with-libidn-prefix=${ @@ -47,13 +47,37 @@ CONFIGURE_ARGS+= --with-libidn-prefix=${
47CONFIGURE_ARGS+= --without-libidn 47CONFIGURE_ARGS+= --without-libidn
48.endif 48.endif
49 49
50### 50###
51### GNOME keyring support 51### GNOME keyring support
52### 52###
53.if !empty(PKG_OPTIONS:Mgnome-keyring) 53.if !empty(PKG_OPTIONS:Mgnome-keyring)
54. include "../../security/gnome-keyring/buildlink3.mk" 54. include "../../security/gnome-keyring/buildlink3.mk"
55CONFIGURE_ARGS+= --with-gnome-keyring 55CONFIGURE_ARGS+= --with-gnome-keyring
56USE_TOOLS+= pkg-config 56USE_TOOLS+= pkg-config
57.else 57.else
58CONFIGURE_ARGS+= --without-gnome-keyring 58CONFIGURE_ARGS+= --without-gnome-keyring
59.endif 59.endif
 60
 61###
 62### Install additional scripts
 63###
 64.if !empty(PKG_OPTIONS:Mscripts)
 65CHECK_INTERPRETER_SKIP+= share/msmtp/find_alias/find_alias_for_msmtp.sh \
 66 share/msmtp/msmtpq/msmtp-queue \
 67 share/msmtp/msmtpq/msmtpq \
 68 share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py \
 69 share/msmtp/msmtpqueue/msmtp-enqueue.sh \
 70 share/msmtp/msmtpqueue/msmtp-listqueue.sh \
 71 share/msmtp/msmtpqueue/msmtp-runqueue.sh \
 72 share/msmtp/set_sendmail/set_sendmail.sh
 73PLIST.scripts= yes
 74USE_TOOLS+= pax
 75INSTALLATION_DIRS+= share/msmtp
 76install-msmtp-scripts:
 77 cd ${WRKSRC}/scripts && \
 78 pax -rw find_alias msmtp-gnome-tool msmtpq msmtpqueue \
 79 set_sendmail vim \
 80 ${DESTDIR}${PREFIX}/share/msmtp
 81.else
 82install-msmtp-scripts:
 83.endif