Attachment 154097 Details for Bug 198464 – patch

[patch] patch

notmuch.patch (text/plain), 5.06 KB, created by mp39590 on 2015-03-09 19:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2015-03-09 19:22:02 UTC

Size: 5.06 KB

patch

obsolete

>diff -urN notmuch.orig/Makefile notmuch/Makefile
>--- notmuch.orig/Makefile	2015-02-20 23:35:25.819224000 +0300
>+++ notmuch/Makefile	2015-03-09 21:35:31.705845000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/mail/notmuch/Makefile 371330 2014-10-21 17:10:06Z mva $
> 
> PORTNAME=	notmuch
>-PORTVERSION=	0.18.1
>+PORTVERSION=	0.19
> CATEGORIES=	mail
> MASTER_SITES=	http://notmuchmail.org/releases/
> 
>@@ -16,6 +16,26 @@
> 		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 <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MEMACS}
>+USE_EMACS=	yes
>+.endif
>+
> HAS_CONFIGURE=	yes
> USES=		pkgconfig python:build gmake
> CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
>@@ -23,4 +43,10 @@
> 
> MAKE_ENV+=		PYTHONCMD=${PYTHON_CMD}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 900044
>+IGNORE=	requires zlib at least 1.2.5
>+.endif
>+
>+.include <bsd.port.post.mk>
>diff -urN notmuch.orig/distinfo notmuch/distinfo
>--- notmuch.orig/distinfo	2015-02-20 23:35:25.819634000 +0300
>+++ notmuch/distinfo	2015-02-20 23:35:50.288415000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (notmuch-0.18.1.tar.gz) = f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd
>-SIZE (notmuch-0.18.1.tar.gz) = 634691
>+SHA256 (notmuch-0.19.tar.gz) = 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb
>+SIZE (notmuch-0.19.tar.gz) = 659038
>diff -urN notmuch.orig/pkg-plist notmuch/pkg-plist
>--- notmuch.orig/pkg-plist	2015-02-20 23:35:25.820101000 +0300
>+++ notmuch/pkg-plist	2015-03-09 21:34:18.694573000 +0300
>@@ -1,8 +1,9 @@
> bin/notmuch
> include/notmuch.h
>-lib/libnotmuch.so.3.1.0
> lib/libnotmuch.so
>-lib/libnotmuch.so.3
>+lib/libnotmuch.so.4
>+lib/libnotmuch.so.4.1.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
>@@ -18,22 +19,42 @@
> man/man1/notmuch.1.gz
> man/man5/notmuch-hooks.5.gz
> man/man7/notmuch-search-terms.7.gz
>-share/emacs/site-lisp/coolj.el
>-share/emacs/site-lisp/notmuch-address.el
>-share/emacs/site-lisp/notmuch-crypto.el
>-share/emacs/site-lisp/notmuch-hello.el
>-share/emacs/site-lisp/notmuch-lib.el
>-share/emacs/site-lisp/notmuch-logo.png
>-share/emacs/site-lisp/notmuch-maildir-fcc.el
>-share/emacs/site-lisp/notmuch-message.el
>-share/emacs/site-lisp/notmuch-mua.el
>-share/emacs/site-lisp/notmuch-parser.el
>-share/emacs/site-lisp/notmuch-print.el
>-share/emacs/site-lisp/notmuch-query.el
>-share/emacs/site-lisp/notmuch-show.el
>-share/emacs/site-lisp/notmuch-tag.el
>-share/emacs/site-lisp/notmuch-tree.el
>-share/emacs/site-lisp/notmuch-version.el
>-share/emacs/site-lisp/notmuch-wash.el
>-share/emacs/site-lisp/notmuch.el
>-share/zsh/functions/Completion/Unix/_notmuch
>+%%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

Actions: View | Diff

Attachments on bug 198464: 154097