1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

Update to 20161126

Add a patch to fix build with gpgme 1.8 (taken from mutt ports)
Now that multiple backends can be used in parallel default on
build lmdb and tokyocabinet (the 2 fastest backend available)
Note the lmdb backend should not be used over NFS.
This commit is contained in:
Baptiste Daroussin 2016-11-27 22:58:23 +00:00
parent 13d5032ce7
commit 58d3efe1c1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=427276
4 changed files with 76 additions and 40 deletions

View File

@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= neomutt
PORTVERSION= 20161104
PORTVERSION= 20161126
DISTVERSIONPREFIX= ${PORTNAME}-
PORTREVISION= 3
CATEGORIES= mail
MAINTAINER= bapt@FreeBSD.org
@ -24,9 +23,9 @@ OPTIONS_SUB= yes
SHEBANG_FILES= smime_keys.pl
OPTIONS_DEFINE= NLS DOCS SASL ICONV IDN FLOCK GPGME NOTMUCH
OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME
OPTIONS_RADIO= HCACHE
OPTIONS_RADIO_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB
OPTIONS_MULTI= HCACHE
OPTIONS_MULTI_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
FLOCK_DESC= Use flock() to lock files
GPGME_DESC= Use gpgme to handle pgp

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1478342528
SHA256 (neomutt-neomutt-neomutt-20161104_GH0.tar.gz) = 198379db86b7d54238523f2664f3975fe7d71db2ac18ce55085c3ed40eec7356
SIZE (neomutt-neomutt-neomutt-20161104_GH0.tar.gz) = 2663369
TIMESTAMP = 1480285729
SHA256 (neomutt-neomutt-neomutt-20161126_GH0.tar.gz) = c08ca66519b9b63acffcf37f5447905279e440bf44efbe0e9d5af4ee772456f1
SIZE (neomutt-neomutt-neomutt-20161126_GH0.tar.gz) = 2738930

View File

@ -0,0 +1,36 @@
Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0. This patch
should be removed once mutt hg commit 84ad86e8b8ab is in an official
release.
--- crypt-gpgme.c.orig 2016-11-27 02:22:51 UTC
+++ crypt-gpgme.c
@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
return verify_sender (h, GPGME_PROTOCOL_CMS);
}
-void gpgme_set_sender (const char *sender)
+void mutt_gpgme_set_sender (const char *sender)
{
mutt_error ("[setting sender] mailbox: %s\n", sender);
FREE (&current_sender);
--- crypt-gpgme.h.orig 2016-11-27 02:22:51 UTC
+++ crypt-gpgme.h
@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg,
int smime_gpgme_verify_sender (HEADER *h);
-void gpgme_set_sender (const char *sender);
+void mutt_gpgme_set_sender (const char *sender);
#endif
--- crypt-mod-pgp-gpgme.c.orig 2016-11-27 02:22:51 UTC
+++ crypt-mod-pgp-gpgme.c
@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
static void crypt_mod_pgp_set_sender (const char *sender)
{
- gpgme_set_sender (sender);
+ mutt_gpgme_set_sender (sender);
}
struct crypt_module_specs crypt_mod_pgp_gpgme =

View File

@ -12,11 +12,41 @@ man/man1/smime_keys.1.gz
man/man5/mbox.5.gz
man/man5/mmdf.5.gz
man/man5/muttrc.5.gz
%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.neomutt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
%%PORTDOCS%%%%DOCSDIR%%/README
@ -111,34 +141,5 @@ man/man5/muttrc.5.gz
%%PORTDOCS%%%%DOCSDIR%%/security.html
%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
%%PORTDOCS%%%%DOCSDIR%%/tuning.html
%%PORTDOCS%%%%DOCSDIR%%/vim-keybindings/README.md
%%PORTDOCS%%%%DOCSDIR%%/vim-keybindings/vim-keybindings.rc
%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
%%PORTDOCS%%%%DOCSDIR%%/vim-keys/README.md
%%PORTDOCS%%%%DOCSDIR%%/vim-keys/vim-keys.rc