Attachment 173443 Details for Bug 211266 – patch

[patch] patch

notmuch.diff (text/plain), 5.34 KB, created by mp39590 on 2016-08-09 08:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2016-08-09 08:58:45 UTC

Size: 5.34 KB

patch

obsolete

>diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
>index 2e5e602..358c3e5 100644
>--- a/mail/notmuch/Makefile
>+++ b/mail/notmuch/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	notmuch
>-PORTVERSION=	0.22
>+PORTVERSION=	0.22.1
> CATEGORIES=	mail
> MASTER_SITES=	http://notmuchmail.org/releases/
> 
>@@ -11,31 +11,33 @@ COMMENT=	Thread-based email index, search, and tagging application
> 
> LICENSE=	GPLv3
> 
>-BROKEN_powerpc64=	Does not build
>-
>-BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
>-		c++filt:devel/binutils
>+BUILD_DEPENDS=	c++filt:devel/binutils
> LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
> 		libxapian.so:databases/xapian-core \
> 		libtalloc.so:devel/talloc
> 
>-OPTIONS_DEFINE=	BASH EMACS ZSH
>-BASH_DESC=	Install bash completion (requires shells/bash-completion)
>+BROKEN_powerpc64=	Does not build
>+
>+OPTIONS_DEFINE=	BASH DOXYGEN EMACS MANPAGES RUBY ZSH
> EMACS_DESC=	Install EMACS lisp files (requires emacs)
>-ZSH_DESC=	Install zsh completion
> OPTIONS_SUB=	yes
> 
> BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
> BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
>-BASH_CONFIGURE_OFF=	--without-bash-completion
>-EMACS_CONFIGURE_OFF=	--without-emacs
>+BASH_CONFIGURE_WITH=	bash-completion
>+DOXYGEN_CONFIGURE_WITH=	api-docs
>+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
>+EMACS_CONFIGURE_WITH=	emacs
> EMACS_CONFIGURE_ON=	--emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
> 			--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
>-EMACS_USE=		EMACS=yes
>-ZSH_CONFIGURE_OFF=	--without-zsh-completion
>+EMACS_USE=	EMACS=yes
>+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
>+RUBY_USE=	RUBY=yes
>+ZSH_CONFIGURE_WITH=	zsh-completion
> 
> HAS_CONFIGURE=	yes
> USES=		gmake pkgconfig python:build
>+USE_GNOME+=	glib20
> CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
> USE_LDCONFIG=	yes
> 
>diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
>index 28d53c1..21bcf80 100644
>--- a/mail/notmuch/distinfo
>+++ b/mail/notmuch/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1463745210
>-SHA256 (notmuch-0.22.tar.gz) = d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a
>-SIZE (notmuch-0.22.tar.gz) = 682458
>+TIMESTAMP = 1469017581
>+SHA256 (notmuch-0.22.1.tar.gz) = e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b
>+SIZE (notmuch-0.22.1.tar.gz) = 683286
>diff --git a/mail/notmuch/files/patch-configure b/mail/notmuch/files/patch-configure
>new file mode 100644
>index 0000000..5b382b9
>--- /dev/null
>+++ b/mail/notmuch/files/patch-configure
>@@ -0,0 +1,44 @@
>+--- configure.orig	2016-07-19 09:43:20 UTC
>++++ configure
>+@@ -66,6 +66,7 @@ PYTHON=${PYTHON:-}
>+ PREFIX=/usr/local
>+ LIBDIR=
>+ WITH_DOCS=1
>++WITH_API_DOCS=1
>+ WITH_EMACS=1
>+ WITH_BASH=1
>+ WITH_RUBY=1
>+@@ -134,7 +135,8 @@ Some features can be disabled (--with-fe
>+ --without-feature) :
>+ 
>+ 	--without-bash-completion	Do not install bash completions files
>+-	--without-docs			Do not install documentation and man pages
>++	--without-docs			Do not install man pages
>++	--without-api-docs		Do not install API documentation
>+ 	--without-emacs			Do not install lisp file
>+ 	--without-ruby			Do not install ruby bindings
>+ 	--without-zsh-completion	Do not install zsh completions files
>+@@ -185,6 +187,14 @@ for option; do
>+ 	fi
>+     elif [ "${option}" = '--without-docs' ] ; then
>+ 	WITH_DOCS=0
>++    elif [ "${option%%=*}" = '--with-api-docs' ]; then
>++	if [ "${option#*=}" = 'no' ]; then
>++	    WITH_API_DOCS=0
>++	else
>++	    WITH_API_DOCS=1
>++	fi
>++    elif [ "${option}" = '--without-api-docs' ] ; then
>++	WITH_API_DOCS=0
>+     elif [ "${option%%=*}" = '--with-emacs' ]; then
>+ 	if [ "${option#*=}" = 'no' ]; then
>+ 	    WITH_EMACS=0
>+@@ -507,7 +517,7 @@ else
>+ fi
>+ 
>+ have_doxygen=0
>+-if [ $WITH_DOCS = "1" ] ; then
>++if [ $WITH_API_DOCS = "1" ] ; then
>+     printf "Checking if doxygen is available... "
>+     if command -v doxygen > /dev/null; then
>+ 	printf "Yes.\n"
>diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
>index b9580cc..52d9104 100644
>--- a/mail/notmuch/pkg-plist
>+++ b/mail/notmuch/pkg-plist
>@@ -3,23 +3,24 @@ include/notmuch.h
> lib/libnotmuch.so
> lib/libnotmuch.so.4
> lib/libnotmuch.so.4.3.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
>+%%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
>+%%DOXYGEN%%man/man3/notmuch.3.gz
>+%%MANPAGES%%man/man5/notmuch-hooks.5.gz
>+%%MANPAGES%%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

Actions: View | Diff

Attachments on bug 211266: 172777 | 173067 | 173443