Index: mail/notmuch/Makefile =================================================================== --- mail/notmuch/Makefile +++ mail/notmuch/Makefile @@ -2,17 +2,21 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.25.3 +PORTVERSION= 0.26 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ MAINTAINER= mp39590@gmail.com -COMMENT= Thread-based email index, search, and tagging application +COMMENT= Thread-based email index, search and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING-GPL-3 -BUILD_DEPENDS= c++filt:devel/binutils +BROKEN_powerpc64= Does not build + +BUILD_DEPENDS= bash-completion>=1.90:shells/bash-completion \ + c++filt:devel/binutils \ + sphinx-build:textproc/py-sphinx LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libxapian.so:databases/xapian-core \ libtalloc.so:devel/talloc @@ -27,60 +31,52 @@ gwc:sysutils/coreutils \ ${LOCALBASE}/bin/gdb:devel/gdb -BROKEN_powerpc64= Does not build - -HAS_CONFIGURE= yes USES= gmake pkgconfig python:build,test USE_GNOME= glib20 -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man USE_LDCONFIG= yes +CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ + --prefix=${PREFIX} \ + --with-bash-completion \ + --with-retry-lock \ + --with-zsh-completion +HAS_CONFIGURE= yes MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} - -TEST_ENV+= NOTMUCH_SKIP_TESTS="basic count new insert tagging atomicity \ - message-property regexp-query" \ - V=1 \ +TEST_ENV+= BSD_GDB=${LOCALBASE}/bin/gdb \ + NOTMUCH_SKIP_TESTS="atomicity basic count insert message-property new regexp-query" \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ - BSD_GDB=${LOCALBASE}/bin/gdb - + V=1 TEST_TARGET= test -OPTIONS_DEFINE= BASH DESKTOP DOXYGEN EMACS MANPAGES MUTT RUBY ZSH -DESKTOP_DESC= Install desktop file -EMACS_DESC= Install EMACS lisp files (requires emacs) -MUTT_DESC= Install notmuch-mutt script +OPTIONS_DEFINE= EMACS MAN3 MUTT OPTIONS_SUB= yes -BASH_BUILD_DEPENDS= bash-completion>=1.90:shells/bash-completion -BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} -BASH_CONFIGURE_WITH= bash-completion -DESKTOP_CONFIGURE_WITH= desktop -DESKTOP_USES= desktop-file-utils -DOXYGEN_CONFIGURE_WITH= api-docs -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -EMACS_CONFIGURE_WITH= emacs +EMACS_DESC= Install Emacs major-mode for interacting with notmuch +MAN3_DESC= Install API manual pages (section 3) +MUTT_DESC= Install notmuch-mutt script + EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ --emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} +EMACS_CONFIGURE_WITH= desktop emacs EMACS_USE= EMACS=yes -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +EMACS_USES= desktop-file-utils +MAN3_BUILD_DEPENDS= doxygen:devel/doxygen +MAN3_CONFIGURE_WITH= api-docs MUTT_RUN_DEPENDS= p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \ p5-Mail-Tools>0:mail/p5-Mail-Tools \ p5-Mail-Box>0:mail/p5-Mail-Box \ p5-String-ShellQuote>0:textproc/p5-String-ShellQuote MUTT_USES= perl5 -RUBY_USE= RUBY=yes -ZSH_CONFIGURE_WITH= zsh-completion do-build-MUTT-on: ${MAKE_CMD} -C ${WRKSRC}/contrib/notmuch-mutt all - ${GZIP_CMD} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1 do-install-MUTT-on: + ${INSTALL_MAN} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1.gz ${STAGEDIR}${MANPREFIX}/man/man1 post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.0.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.0.0 .include Index: mail/notmuch/distinfo =================================================================== --- mail/notmuch/distinfo +++ mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513159673 -SHA256 (notmuch-0.25.3.tar.gz) = 4bd58e035c34a36ba3c7027e19f763905b99812eeabab283146ef12b3310ddbb -SIZE (notmuch-0.25.3.tar.gz) = 883151 +TIMESTAMP = 1515614677 +SHA256 (notmuch-0.26.tar.gz) = d3e894ed2ad9d721a442663f07a6f2a241dc98be7cc4af681f16edf88e0d76df +SIZE (notmuch-0.26.tar.gz) = 906327 Index: mail/notmuch/pkg-plist =================================================================== --- mail/notmuch/pkg-plist +++ mail/notmuch/pkg-plist @@ -1,34 +1,11 @@ -bin/notmuch -%%EMACS%%bin/notmuch-emacs-mua -%%MUTT%%bin/notmuch-mutt -include/notmuch.h -lib/libnotmuch.so -lib/libnotmuch.so.5 -lib/libnotmuch.so.5.0.0 -%%MANPAGES%%man/man1/notmuch-address.1.gz -%%MANPAGES%%man/man1/notmuch-compact.1.gz -%%MANPAGES%%man/man1/notmuch-config.1.gz -%%MANPAGES%%man/man1/notmuch-count.1.gz -%%MANPAGES%%man/man1/notmuch-dump.1.gz -%%MANPAGES%%man/man1/notmuch-emacs-mua.1.gz -%%MANPAGES%%man/man1/notmuch-insert.1.gz -%%MANPAGES%%man/man1/notmuch-new.1.gz -%%MANPAGES%%man/man1/notmuch-reply.1.gz -%%MANPAGES%%man/man1/notmuch-restore.1.gz -%%MANPAGES%%man/man1/notmuch-search.1.gz -%%MANPAGES%%man/man1/notmuch-setup.1.gz -%%MANPAGES%%man/man1/notmuch-show.1.gz -%%MANPAGES%%man/man1/notmuch-tag.1.gz -%%MANPAGES%%man/man1/notmuch.1.gz -%%MUTT%%man/man1/notmuch-mutt.1.gz -%%DOXYGEN%%man/man3/notmuch.3.gz -%%MANPAGES%%man/man5/notmuch-hooks.5.gz -%%MANPAGES%%man/man7/notmuch-search-terms.7.gz -%%BASH%%share/bash-completion/completions/notmuch %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.el @@ -64,9 +41,34 @@ %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.elc -%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc -%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el -%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc -%%DESKTOP%%share/applications/notmuch-emacs-mua.desktop -%%ZSH%%share/zsh/functions/Completion/Unix/_notmuch +%%EMACS%%bin/notmuch-emacs-mua +%%EMACS%%man/man1/notmuch-emacs-mua.1.gz +%%EMACS%%share/applications/notmuch-emacs-mua.desktop +%%MAN3%%man/man3/notmuch.3.gz +%%MUTT%%bin/notmuch-mutt +%%MUTT%%man/man1/notmuch-mutt.1.gz +bin/notmuch +include/notmuch.h +lib/libnotmuch.so +lib/libnotmuch.so.5 +lib/libnotmuch.so.5.0.0 +man/man1/notmuch-address.1.gz +man/man1/notmuch-compact.1.gz +man/man1/notmuch-config.1.gz +man/man1/notmuch-count.1.gz +man/man1/notmuch-dump.1.gz +man/man1/notmuch-insert.1.gz +man/man1/notmuch-new.1.gz +man/man1/notmuch-reindex.1.gz +man/man1/notmuch-reply.1.gz +man/man1/notmuch-restore.1.gz +man/man1/notmuch-search.1.gz +man/man1/notmuch-setup.1.gz +man/man1/notmuch-show.1.gz +man/man1/notmuch-tag.1.gz +man/man1/notmuch.1.gz +man/man5/notmuch-hooks.5.gz +man/man7/notmuch-properties.7.gz +man/man7/notmuch-search-terms.7.gz +share/bash-completion/completions/notmuch +share/zsh/functions/Completion/Unix/_notmuch Index: mail/py-notmuch/Makefile =================================================================== --- mail/py-notmuch/Makefile +++ mail/py-notmuch/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.25 +PORTVERSION= 0.26 CATEGORIES= mail python MASTER_SITES= http://notmuchmail.org/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: mail/py-notmuch/distinfo =================================================================== --- mail/py-notmuch/distinfo +++ mail/py-notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504984307 -SHA256 (notmuch-0.25.tar.gz) = 65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b -SIZE (notmuch-0.25.tar.gz) = 882093 +TIMESTAMP = 1515614909 +SHA256 (notmuch-0.26.tar.gz) = d3e894ed2ad9d721a442663f07a6f2a241dc98be7cc4af681f16edf88e0d76df +SIZE (notmuch-0.26.tar.gz) = 906327