Index: head/mail/neomutt/Makefile =================================================================== --- head/mail/neomutt/Makefile (revision 423183) +++ head/mail/neomutt/Makefile (revision 423184) @@ -1,89 +1,89 @@ # $FreeBSD$ PORTNAME= neomutt -PORTVERSION= 20160916 +PORTVERSION= 20161002 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org COMMENT= Bringing together all the Mutt Code LICENSE= GPLv1 -LICENSE_FILE= ${WRKSRC}/GPL +LICENSE_FILE= ${WRKSRC}/LICENSE.md USE_GITHUB= yes USES= autoreconf localbase ncurses shebangfix ssl GNU_CONFIGURE= yes LIB_DEPENDS= libnotmuch.so:mail/notmuch BUILD_DEPENDS= gdate:sysutils/coreutils RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ urlview:textproc/urlview OPTIONS_SUB= yes SHEBANG_FILES= smime_keys.pl OPTIONS_DEFINE= NLS DOCS SASL ICONV IDN FLOCK GPGME OPTIONS_DEFAULT=SASL TOKYOCABINET OPTIONS_RADIO= HCACHE OPTIONS_RADIO_HCACHE= TOKYOCABINET LMDB FLOCK_DESC= Use flock() to lock files GPGME_DESC= Use gpgme to handle pgp TOKYOCABINET_DESC= Use TokyoCabinet as header-cache backend LMDB_DESC= Use LMDB as header-cache backend CONFIGURE_ARGS= --disable-dependency-tracking \ --with-docdir="${DOCSDIR}" \ --with-ssl="${OPENSSLBASE}" \ --enable-imap \ --enable-smtp \ --enable-pop \ --enable-nntp \ --enable-compressed \ --enable-hcache \ --enable-sidebar \ --enable-notmuch \ --without-qdbm \ --disable-fcntl \ --enable-external-dotlock TOKYOCABINET_CONFIGURE_WITH= tokyocabinet TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_IMPLIES= ICONV IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_IMPLIES= ICONV IDN_CONFIGURE_WITH= idn ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARGS} ICONV_CONFIGURE_OFF= --disable-iconv FLOCK_CONFIGURE_ENABLE= flock SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme GPGME_CONFIGURE_ENABLE= gpgme DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx post-patch: @${REINPLACE_CMD} -e "s/\`date/\`gdate/" ${WRKSRC}/Makefile.am ${WRKSRC}/doc/Makefile.am @${REINPLACE_CMD} '/LIBS=$$/d' ${WRKSRC}/configure.ac post-install: ${RM} -f ${STAGEDIR}${PREFIX}/etc/mime* .include Index: head/mail/neomutt/distinfo =================================================================== --- head/mail/neomutt/distinfo (revision 423183) +++ head/mail/neomutt/distinfo (revision 423184) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474138716 -SHA256 (neomutt-neomutt-neomutt-20160916_GH0.tar.gz) = dc32b23f1fde0bc9e1d2ba38479ee36a8a23840f140cbc1627a184b886d57782 -SIZE (neomutt-neomutt-neomutt-20160916_GH0.tar.gz) = 2652099 +TIMESTAMP = 1475484800 +SHA256 (neomutt-neomutt-neomutt-20161002_GH0.tar.gz) = 5f5c045b15234d988d96c7b712e29199ae84500f7c2a21bffe75c85ceb31a38f +SIZE (neomutt-neomutt-neomutt-20161002_GH0.tar.gz) = 2656295 Index: head/mail/neomutt/files/patch-doc_Makefile.am =================================================================== --- head/mail/neomutt/files/patch-doc_Makefile.am (nonexistent) +++ head/mail/neomutt/files/patch-doc_Makefile.am (revision 423184) @@ -0,0 +1,11 @@ +--- doc/Makefile.am.orig 2016-10-02 15:13:51 UTC ++++ doc/Makefile.am +@@ -60,7 +60,7 @@ BUILT_DISTFILES = stamp-doc-xml stamp-do + srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ + devel-notes.txt patch-notes.txt smime-notes.txt + +-topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog ChangeLog.neomutt \ ++topsrcdir_DOCFILES = COPYRIGHT LICENSE.md INSTALL ChangeLog ChangeLog.neomutt \ + README NEWS TODO README.SECURITY README.SSL README.neomutt README.notmuch + + all: makedoc-all Property changes on: head/mail/neomutt/files/patch-doc_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/neomutt/files/patch-staging-Makefile.am =================================================================== --- head/mail/neomutt/files/patch-staging-Makefile.am (revision 423183) +++ head/mail/neomutt/files/patch-staging-Makefile.am (revision 423184) @@ -1,18 +1,27 @@ ---- Makefile.am.orig 2015-09-10 09:19:15.000000000 +0200 -+++ Makefile.am 2015-09-10 09:21:00.000000000 +0200 -@@ -150,15 +150,6 @@ +--- Makefile.am.orig 2016-10-02 15:13:51 UTC ++++ Makefile.am +@@ -62,7 +62,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c + sidebar.c smime.c smtp.c utf8.c wcwidth.c \ + bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h + +-EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ ++EXTRA_DIST = COPYRIGHT LICENSE.md OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ + account.h \ + attach.h buffy.h charset.h compress.h copy.h crypthash.h dotlock.h functions.h gen_defs \ + globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ +@@ -176,15 +176,6 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir) $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c install-exec-hook: - if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \ - rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ - ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ - fi - if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \ - chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \ - chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \ - { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \ - fi install-data-local: $(MKDIR_P) $(DESTDIR)$(sysconfdir) Index: head/mail/neomutt/pkg-plist =================================================================== --- head/mail/neomutt/pkg-plist (revision 423183) +++ head/mail/neomutt/pkg-plist (revision 423184) @@ -1,144 +1,144 @@ bin/mutt bin/mutt_dotlock bin/pgpewrap bin/pgpring bin/smime_keys @sample etc/Muttrc.dist etc/Muttrc man/man1/mutt.1.gz man/man1/mutt_dotlock.1.gz man/man1/pgpewrap.1.gz man/man1/pgpring.1.gz man/man1/smime_keys.1.gz man/man5/mbox.5.gz man/man5/mmdf.5.gz man/man5/muttrc.5.gz %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.neomutt -%%PORTDOCS%%%%DOCSDIR%%/GPL +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY %%PORTDOCS%%%%DOCSDIR%%/README.SSL %%PORTDOCS%%%%DOCSDIR%%/README.neomutt %%PORTDOCS%%%%DOCSDIR%%/README.notmuch %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt %%PORTDOCS%%%%DOCSDIR%%/configuration.html %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html %%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/muttrc %%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh %%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html %%PORTDOCS%%%%DOCSDIR%%/miscellany.html %%PORTDOCS%%%%DOCSDIR%%/muttrc.attach-headers-color %%PORTDOCS%%%%DOCSDIR%%/muttrc.compress %%PORTDOCS%%%%DOCSDIR%%/muttrc.cond-date %%PORTDOCS%%%%DOCSDIR%%/muttrc.encrypt-to-self %%PORTDOCS%%%%DOCSDIR%%/muttrc.forgotten-attachment %%PORTDOCS%%%%DOCSDIR%%/muttrc.ifdef %%PORTDOCS%%%%DOCSDIR%%/muttrc.index-color %%PORTDOCS%%%%DOCSDIR%%/muttrc.initials %%PORTDOCS%%%%DOCSDIR%%/muttrc.keywords %%PORTDOCS%%%%DOCSDIR%%/muttrc.limit-current-thread %%PORTDOCS%%%%DOCSDIR%%/muttrc.nested-if %%PORTDOCS%%%%DOCSDIR%%/muttrc.new-mail %%PORTDOCS%%%%DOCSDIR%%/muttrc.nntp %%PORTDOCS%%%%DOCSDIR%%/muttrc.notmuch %%PORTDOCS%%%%DOCSDIR%%/muttrc.progress %%PORTDOCS%%%%DOCSDIR%%/muttrc.quasi-delete %%PORTDOCS%%%%DOCSDIR%%/muttrc.reply-with-xorig %%PORTDOCS%%%%DOCSDIR%%/muttrc.sidebar %%PORTDOCS%%%%DOCSDIR%%/muttrc.skip-quoted %%PORTDOCS%%%%DOCSDIR%%/muttrc.status-color %%PORTDOCS%%%%DOCSDIR%%/muttrc.timeout %%PORTDOCS%%%%DOCSDIR%%/neomutt-syntax.vim %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt %%PORTDOCS%%%%DOCSDIR%%/reference.html %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc %%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc %%PORTDOCS%%%%DOCSDIR%%/samples/ca-bundle.crt %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc %%PORTDOCS%%%%DOCSDIR%%/samples/mutt_xtitle %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-sidebar %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr %%PORTDOCS%%%%DOCSDIR%%/samples/sample.vimrc-sidebar %%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-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