Index: branches/2018Q3/mail/neomutt/Makefile =================================================================== --- branches/2018Q3/mail/neomutt/Makefile (revision 474962) +++ branches/2018Q3/mail/neomutt/Makefile (revision 474963) @@ -1,104 +1,103 @@ # $FreeBSD$ PORTNAME= neomutt -PORTVERSION= 20180512 +PORTVERSION= 20180716 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org COMMENT= Bringing together all the Mutt Code LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ urlview:textproc/urlview USES= iconv:translit localbase perl5 shebangfix ssl USE_GITHUB= yes USE_PERL5= build HAS_CONFIGURE= yes OPTIONS_SUB= yes SHEBANG_FILES= contrib/smime_keys OPTIONS_DEFINE= NLS DOCS SASL IDN FLOCK GPGME NOTMUCH OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES OPTIONS_MULTI= HCACHE OPTIONS_MULTI_HCACHE= BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET OPTIONS_SINGLE= SCREEN OPTIONS_SINGLE_SCREEN= NCURSES SLANG FLOCK_DESC= Use flock() to lock files GPGME_DESC= Use gpgme to handle pgp NOTMUCH_DESC= Use notmuch for tagging and searching HCACHE_DESC= Header-cache backend KYOTOCABINET_DESC= Kyoto Cabinet support LMDB_DESC= Lightning Memory-Mapped Database support QDBM_DESC= Quick DataBase Manager support TOKYOCABINET_DESC= Tokyo Cabinet support SCREEN_DESC= Screen options CONFIGURE_ARGS= --with-ssl="${OPENSSLBASE}" \ --locales-fix \ --mandir=${PREFIX}/man \ ${ICONV_CONFIGURE_ARGS} # Header cache BDB_CONFIGURE_ON= --bdb BDB_USES= bdb GDBM_CONFIGURE_ON= --gdbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm KYOTOCABINET_CONFIGURE_ON= --kyotocabinet KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet LMDB_CONFIGURE_ON= --lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb QDBM_CONFIGURE_ON= --qdbm QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm TOKYOCABINET_CONFIGURE_ON= --tokyocabinet TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-runtime:build gettext-tools:build IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_ENABLE= idn FLOCK_CONFIGURE_ON= --with-lock=flock SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --sasl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error GPGME_CONFIGURE_ENABLE= gpgme NOTMUCH_LIB_DEPENDS= libnotmuch.so:mail/notmuch NOTMUCH_CONFIGURE_ENABLE= notmuch SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} --with-ui=slang SLANG_CONFIGURE_OFF= --with-ui=ncurses SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang NCURSES_USES= ncurses DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx # Trick neomutt into building manpages and neomuttrc DOCS_VARS_OFF= BINARY_ALIAS=xsltproc=true \ BINARY_ALIAS+=xmlcatalog=true post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/mime* ${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/neomutt \ - ${STAGEDIR}${PREFIX}/libexec/neomutt/pgpring \ ${STAGEDIR}${PREFIX}/libexec/neomutt/pgpewrap .include Index: branches/2018Q3/mail/neomutt/distinfo =================================================================== --- branches/2018Q3/mail/neomutt/distinfo (revision 474962) +++ branches/2018Q3/mail/neomutt/distinfo (revision 474963) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526289307 -SHA256 (neomutt-neomutt-neomutt-20180512_GH0.tar.gz) = fe573b9b6944c2d40d42e6ab62b711e9980da2d2bc36c533e0ba322fd9f3b851 -SIZE (neomutt-neomutt-neomutt-20180512_GH0.tar.gz) = 2758674 +TIMESTAMP = 1531812159 +SHA256 (neomutt-neomutt-neomutt-20180716_GH0.tar.gz) = bd89826980b493ba312228c9c14ffe2403e268571aea6008c6dc7ed3848de200 +SIZE (neomutt-neomutt-neomutt-20180716_GH0.tar.gz) = 2778105 Index: branches/2018Q3/mail/neomutt/files/patch-doc_Makefile.autosetup =================================================================== --- branches/2018Q3/mail/neomutt/files/patch-doc_Makefile.autosetup (revision 474962) +++ branches/2018Q3/mail/neomutt/files/patch-doc_Makefile.autosetup (nonexistent) @@ -1,13 +0,0 @@ ---- doc/Makefile.autosetup.orig 2018-05-12 02:46:56 UTC -+++ doc/Makefile.autosetup -@@ -29,8 +29,8 @@ srcdir_DOCFILES = $(SRCDIR)/doc/PGP-Notes.txt \ - $(SRCDIR)/doc/smime-notes.txt \ - $(SRCDIR)/ChangeLog.md \ - $(SRCDIR)/CODE_OF_CONDUCT.md \ -- $(SRCDIR)/COPYRIGHT \ -- $(SRCDIR)/INSTALL \ -+ $(SRCDIR)/COPYRIGHT.md \ -+ $(SRCDIR)/INSTALL.md \ - $(SRCDIR)/LICENSE.md \ - $(SRCDIR)/README.md - Property changes on: branches/2018Q3/mail/neomutt/files/patch-doc_Makefile.autosetup ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q3/mail/neomutt/pkg-plist =================================================================== --- branches/2018Q3/mail/neomutt/pkg-plist (revision 474962) +++ branches/2018Q3/mail/neomutt/pkg-plist (revision 474963) @@ -1,105 +1,99 @@ bin/neomutt libexec/neomutt/pgpewrap -libexec/neomutt/pgpring libexec/neomutt/smime_keys man/man1/neomutt.1.gz man/man1/pgpewrap_neomutt.1.gz -man/man1/pgpring_neomutt.1.gz man/man1/smime_keys_neomutt.1.gz man/man5/mbox_neomutt.5.gz man/man5/mmdf_neomutt.5.gz man/man5/neomuttrc.5.gz @sample etc/neomuttrc.dist etc/neomuttrc %%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/cs/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/da/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/de/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/el/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/eo/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/es/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/et/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/eu/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/fr/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ga/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/gl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/hu/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/id/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/it/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ja/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ko/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/lt/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/nl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/pl/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ru/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/sk/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/sv/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/tr/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/uk/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/neomutt.mo %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.md %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md -%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html %%PORTDOCS%%%%DOCSDIR%%/colorschemes/neonwolf-256.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/solarized-dark-256.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/vombatidae.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/colorschemes/zenburn.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/configuration.html %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomuttrc %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/intro.html %%PORTDOCS%%%%DOCSDIR%%/keybase/LICENSE %%PORTDOCS%%%%DOCSDIR%%/keybase/README.md %%PORTDOCS%%%%DOCSDIR%%/keybase/attachmentView.png %%PORTDOCS%%%%DOCSDIR%%/keybase/decrypt.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/install.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/keybase.py %%PORTDOCS%%%%DOCSDIR%%/keybase/neomuttrc %%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-128.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-256.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-32.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-64.png %%PORTDOCS%%%%DOCSDIR%%/logo/neomutt.svg %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html %%PORTDOCS%%%%DOCSDIR%%/mime.types %%PORTDOCS%%%%DOCSDIR%%/miscellany.html %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html %%PORTDOCS%%%%DOCSDIR%%/reference.html %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc -%%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc -%%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc -%%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-tlr %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl %%PORTDOCS%%%%DOCSDIR%%/security.html %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt %%PORTDOCS%%%%DOCSDIR%%/tuning.html %%PORTDOCS%%%%DOCSDIR%%/vim-keys/README.md %%PORTDOCS%%%%DOCSDIR%%/vim-keys/vim-keys.rc Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 474962) +++ branches/2018Q3 (revision 474963) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r473715,474779