Index: head/mail/notmuch/Makefile =================================================================== --- head/mail/notmuch/Makefile (revision 391886) +++ head/mail/notmuch/Makefile (revision 391887) @@ -1,52 +1,56 @@ # Created by: DarwinSurvivor # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.19 +PORTVERSION= 0.20.2 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ -MAINTAINER= ross@rosstimson.com +MAINTAINER= mp39590@gmail.com COMMENT= Thread-based email index, search, and tagging application LICENSE= GPLv3 BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \ libxapian.so:${PORTSDIR}/databases/xapian-core \ libtalloc.so:${PORTSDIR}/devel/talloc OPTIONS_DEFINE= BASH EMACS ZSH BASH_DESC= Install bash completion (requires shells/bash-completion) EMACS_DESC= Install EMACS lisp files (requires emacs) ZSH_DESC= Install zsh completion OPTIONS_SUB= yes BASH_BUILD_DEPENDS= bash-completion>=1.90:${PORTSDIR}/shells/bash-completion BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} BASH_CONFIGURE_OFF= --without-bash-completion EMACS_CONFIGURE_OFF= --without-emacs EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ --emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} ZSH_CONFIGURE_OFF= --without-zsh-completion .include .if ${PORT_OPTIONS:MEMACS} USE_EMACS= yes .endif HAS_CONFIGURE= yes -USES= pkgconfig python:build gmake +USES= gmake pkgconfig python:build CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.2.0 .include .if ${OSVERSION} < 900044 IGNORE= requires zlib at least 1.2.5 .endif .include Index: head/mail/notmuch/distinfo =================================================================== --- head/mail/notmuch/distinfo (revision 391886) +++ head/mail/notmuch/distinfo (revision 391887) @@ -1,2 +1,2 @@ -SHA256 (notmuch-0.19.tar.gz) = 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb -SIZE (notmuch-0.19.tar.gz) = 659038 +SHA256 (notmuch-0.20.2.tar.gz) = f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec +SIZE (notmuch-0.20.2.tar.gz) = 652945 Index: head/mail/notmuch/files/patch-lib_Makefile.local =================================================================== --- head/mail/notmuch/files/patch-lib_Makefile.local (revision 391886) +++ head/mail/notmuch/files/patch-lib_Makefile.local (nonexistent) @@ -1,16 +0,0 @@ ---- lib/Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000 -+++ lib/Makefile.local -@@ -92,11 +92,11 @@ install: install-$(dir) - - install-$(dir): $(dir)/$(LIBNAME) - mkdir -p "$(DESTDIR)$(libdir)/" -- install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/" -+ ${BSD_INSTALL_LIB} "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/" - ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(SONAME)" - ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(LINKER_NAME)" - mkdir -p "$(DESTDIR)$(includedir)" -- install -m0644 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/" -+ ${BSD_INSTALL_DATA} "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/" - $(LIBRARY_INSTALL_POST_COMMAND) - - SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) Property changes on: head/mail/notmuch/files/patch-lib_Makefile.local ___________________________________________________________________ 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: head/mail/notmuch/files/patch-Makefile.local =================================================================== --- head/mail/notmuch/files/patch-Makefile.local (revision 391886) +++ head/mail/notmuch/files/patch-Makefile.local (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000 -+++ Makefile.local -@@ -302,7 +302,7 @@ notmuch-shared: $(notmuch_client_modules - .PHONY: install - install: all install-man - mkdir -p "$(DESTDIR)$(prefix)/bin/" -- install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch" -+ ${BSD_INSTALL_PROGRAM} notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch" - ifeq ($(MAKECMDGOALS), install) - @echo "" - @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" Property changes on: head/mail/notmuch/files/patch-Makefile.local ___________________________________________________________________ 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: head/mail/notmuch/files/patch-doc_Makefile.local =================================================================== --- head/mail/notmuch/files/patch-doc_Makefile.local (revision 391886) +++ head/mail/notmuch/files/patch-doc_Makefile.local (revision 391887) @@ -1,13 +1,11 @@ ---- doc/Makefile.local.orig 2014-06-25 10:30:10.000000000 +0000 +--- doc/Makefile.local.orig 2015-07-09 20:39:00 UTC +++ doc/Makefile.local -@@ -7,8 +7,8 @@ SPHINXOPTS := -q +@@ -7,7 +7,7 @@ SPHINXOPTS := -q SPHINXBUILD = sphinx-build DOCBUILDDIR := $(dir)/_build --prerst2man := python $(srcdir)/$(dir)/prerst2man.py -mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py -+prerst2man := ${PYTHONCMD} $(srcdir)/$(dir)/prerst2man.py -+mkdocdeps := ${PYTHONCMD} $(srcdir)/$(dir)/mkdocdeps.py ++mkdocdeps := $(PYTHON) $(srcdir)/$(dir)/mkdocdeps.py # Internal variables. ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir) Index: head/mail/notmuch/pkg-plist =================================================================== --- head/mail/notmuch/pkg-plist (revision 391886) +++ head/mail/notmuch/pkg-plist (revision 391887) @@ -1,60 +1,61 @@ bin/notmuch include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.4 -lib/libnotmuch.so.4.1.0 +lib/libnotmuch.so.4.2.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-emacs-mua.1.gz man/man1/notmuch-insert.1.gz man/man1/notmuch-new.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-search-terms.7.gz %%BASH%%etc/bash_completion.d/notmuch %%EMACS%%share/emacs/site-lisp/coolj.el %%EMACS%%share/emacs/site-lisp/coolj.elc %%EMACS%%share/emacs/site-lisp/notmuch-address.el %%EMACS%%share/emacs/site-lisp/notmuch-address.elc %%EMACS%%share/emacs/site-lisp/notmuch-crypto.el %%EMACS%%share/emacs/site-lisp/notmuch-crypto.elc %%EMACS%%share/emacs/site-lisp/notmuch-hello.el %%EMACS%%share/emacs/site-lisp/notmuch-hello.elc %%EMACS%%share/emacs/site-lisp/notmuch-jump.el %%EMACS%%share/emacs/site-lisp/notmuch-jump.elc %%EMACS%%share/emacs/site-lisp/notmuch-lib.el %%EMACS%%share/emacs/site-lisp/notmuch-lib.elc %%EMACS%%share/emacs/site-lisp/notmuch-logo.png %%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.el %%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.elc %%EMACS%%share/emacs/site-lisp/notmuch-message.el %%EMACS%%share/emacs/site-lisp/notmuch-message.elc %%EMACS%%share/emacs/site-lisp/notmuch-mua.el %%EMACS%%share/emacs/site-lisp/notmuch-mua.elc %%EMACS%%share/emacs/site-lisp/notmuch-parser.el %%EMACS%%share/emacs/site-lisp/notmuch-parser.elc %%EMACS%%share/emacs/site-lisp/notmuch-print.el %%EMACS%%share/emacs/site-lisp/notmuch-print.elc %%EMACS%%share/emacs/site-lisp/notmuch-query.el %%EMACS%%share/emacs/site-lisp/notmuch-query.elc %%EMACS%%share/emacs/site-lisp/notmuch-show.el %%EMACS%%share/emacs/site-lisp/notmuch-show.elc %%EMACS%%share/emacs/site-lisp/notmuch-tag.el %%EMACS%%share/emacs/site-lisp/notmuch-tag.elc %%EMACS%%share/emacs/site-lisp/notmuch-tree.el %%EMACS%%share/emacs/site-lisp/notmuch-tree.elc %%EMACS%%share/emacs/site-lisp/notmuch-version.el %%EMACS%%share/emacs/site-lisp/notmuch-version.elc %%EMACS%%share/emacs/site-lisp/notmuch-wash.el %%EMACS%%share/emacs/site-lisp/notmuch-wash.elc %%EMACS%%share/emacs/site-lisp/notmuch.el %%EMACS%%share/emacs/site-lisp/notmuch.elc %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch