Attachment 199020 Details for Bug 232310 – notmuch-0.28.patch

[patch] notmuch-0.28.patch

notmuch-0.28.patch (text/plain), 7.58 KB, created by Sebastian Schwarz on 2018-11-06 18:45:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Schwarz

Created: 2018-11-06 18:45:20 UTC

Size: 7.58 KB

patch

obsolete

>diff --git mail/notmuch-emacs/Makefile mail/notmuch-emacs/Makefile
>index b3980b332151..fe3f1aebfce4 100644
>--- mail/notmuch-emacs/Makefile
>+++ mail/notmuch-emacs/Makefile
>@@ -40,9 +40,11 @@ do-configure:
> 	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
> 	@${PRINTF} \
> 		'%s\n' \
>+		BASH_ABSOLUTE=/bin/sh \
> 		desktop_dir=${PREFIX}/share/applications \
> 		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
> 		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
>+		HAVE_BASH=1 \
> 		HAVE_EMACS=1 \
> 		infodir=${PREFIX}/${INFO_PATH} \
> 		mandir=${MANPREFIX}/man \
>diff --git mail/notmuch-emacs/files/patch-doc_Makefile.local mail/notmuch-emacs/files/patch-doc_Makefile.local
>deleted file mode 100644
>index 08b8ad5de116..000000000000
>--- mail/notmuch-emacs/files/patch-doc_Makefile.local
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- doc/Makefile.local.orig	2018-06-16 21:06:47 UTC
>-+++ doc/Makefile.local
>-@@ -44,7 +44,7 @@ sphinx-texinfo:
>- 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
>- 
>- sphinx-info: sphinx-texinfo
>--	make -C $(DOCBUILDDIR)/texinfo info
>-+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
>- 
>- # Use the man page converter that is available. We should never depend
>- # on MAN_ROFF_FILES if a converter is not available.
>diff --git mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua
>deleted file mode 100644
>index 56878a4b1648..000000000000
>--- mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- emacs/notmuch-emacs-mua.orig	2017-07-18 20:34:56 UTC
>-+++ emacs/notmuch-emacs-mua
>-@@ -1,4 +1,4 @@
>--#!/usr/bin/env bash
>-+#!/bin/sh
>- #
>- # notmuch-emacs-mua - start composing a mail on the command line
>- #
>-@@ -26,8 +26,8 @@ set -eu
>- # calling convention: escape -v var "$arg" (like in bash printf).
>- escape ()
>- {
>--    local __escape_arg__=${3//\\/\\\\}
>--    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
>-+    __escape_arg__="$(printf '%s' "$3" | sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g')"
>-+    eval "$2=\$__escape_arg__"
>- }
>- 
>- EMACS=${EMACS:-emacs}
>-@@ -150,14 +150,14 @@ if [ -n "${MAILTO}" ]; then
>- 	exit 1
>-     fi
>-     ELISP="(browse-url-mail \"${MAILTO}\")"
>--elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
>-+elif [ -z "${ELISP}" ] && [ -n "${HELLO}" ]; then
>-     ELISP="(notmuch)"
>- else
>-     ELISP="(notmuch-mua-new-mail) ${ELISP}"
>- fi
>- 
>- # Kill the terminal/frame if we're creating one.
>--if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then
>-+if [ -z "$USE_EMACSCLIENT" ] || [ -n "$CREATE_FRAME" ] || [ -n "$NO_WINDOW" ]; then
>-     ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
>- fi
>diff --git mail/notmuch-mutt/Makefile mail/notmuch-mutt/Makefile
>index 40b75608c2ed..d6ef27aacbfd 100644
>--- mail/notmuch-mutt/Makefile
>+++ mail/notmuch-mutt/Makefile
>@@ -14,6 +14,7 @@ RUN_DEPENDS=	mutt:mail/mutt \
> 
> USES=		gmake perl5
> 
>+MAKE_ARGS+=	mandir=${MANPREFIX}/man prefix=${PREFIX}
> MASTERDIR=	${.CURDIR}/../notmuch
> NO_ARCH=	yes
> WRKSRC_SUBDIR=	contrib/notmuch-mutt
>@@ -22,14 +23,15 @@ OPTIONS_DEFINE=	EXAMPLES MANPAGES
> OPTIONS_DEFAULT=	MANPAGES
> OPTIONS_SUB=	yes
> 
>-do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/notmuch-mutt ${STAGEDIR}${PREFIX}/bin
>+post-install-EXAMPLES-on:
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@${MV} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
>+	@${RMDIR} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
> 
>-do-install-EXAMPLES-on:
>-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
>+post-install-EXAMPLES-off:
>+	@${RM} -r ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
> 
>-do-install-MANPAGES-on:
>-	${INSTALL_MAN} ${WRKSRC}/notmuch-mutt.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+post-install-MANPAGES-off:
>+	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-mutt.1
> 
> .include "${MASTERDIR}/Makefile"
>diff --git mail/notmuch/Makefile mail/notmuch/Makefile
>index 5b3aec5d74b9..b7ef35ed5b7f 100644
>--- mail/notmuch/Makefile
>+++ mail/notmuch/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	notmuch
>-PORTVERSION=	0.27
>+PORTVERSION=	0.28
> CATEGORIES?=	mail
> MASTER_SITES=	https://notmuchmail.org/releases/
> 
>@@ -27,7 +27,7 @@ TEST_DEPENDS=	bash:shells/bash \
> 		gwc:sysutils/coreutils \
> 		${LOCALBASE}/bin/gdb:devel/gdb
> 
>-USES=		compiler:c++11-lang gmake pkgconfig python:build,test
>+USES=		compiler:c++11-lang gmake gnome pkgconfig python:build,test
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> 
>@@ -60,12 +60,16 @@ DOXYGEN_CONFIGURE_WITH=	api-docs
> MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
> MANPAGES_CONFIGURE_WITH=	docs
> 
>-# install completions even in absence of shells/bash-completions
>+# Install bash completions without incurring a dependcy on
>+# shells/bash-completion.  Also avoid automatic installation of
>+# info pages on FreeBSD 10.
> post-configure:
> 	${REINPLACE_CMD} \
>+		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
>+		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
> 		-e '/^HAVE_INSTALL_INFO[[:blank:]]*=/s/=.*/=0/' \
> 		-e '/^HAVE_MAKEINFO[[:blank:]]*=/s/=.*/=0/' \
>-		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/= 1/' \
>+		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
> 		${WRKSRC}/Makefile.config
> 
> post-install:
>diff --git mail/notmuch/distinfo mail/notmuch/distinfo
>index d54ff57f5744..033a9e5a8485 100644
>--- mail/notmuch/distinfo
>+++ mail/notmuch/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1529138705
>-SHA256 (notmuch-0.27.tar.gz) = 40d3192f8f130f227b511fc80be86310c7f60ccb6d043b563f201fa505de0876
>-SIZE (notmuch-0.27.tar.gz) = 912583
>+TIMESTAMP = 1539421796
>+SHA256 (notmuch-0.28.tar.gz) = acca75cec91651ccd2a7e31f7004e2ae14eff4ae38e375b8a88414c464cd0a37
>+SIZE (notmuch-0.28.tar.gz) = 921069
>diff --git mail/notmuch/files/patch-configure mail/notmuch/files/patch-configure
>new file mode 100644
>index 000000000000..65e506936eee
>--- /dev/null
>+++ mail/notmuch/files/patch-configure
>@@ -0,0 +1,18 @@
>+--- configure.orig	2018-10-16 07:56:32 UTC
>++++ configure
>+@@ -566,6 +566,7 @@ if command -v ${BASH} > /dev/null; then
>+     printf "Yes (%s).\n" "$bash_absolute"
>+ else
>+     have_bash=0
>++    bash_absolute=
>+     printf "No. (%s not found)\n" "${BASH}"
>+ fi
>+ 
>+@@ -576,6 +577,7 @@ if command -v ${PERL} > /dev/null; then
>+     printf "Yes (%s).\n" "$perl_absolute"
>+ else
>+     have_perl=0
>++    perl_absolute=
>+     printf "No. (%s not found)\n" "${PERL}"
>+ fi
>+ 
>diff --git mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile
>new file mode 100644
>index 000000000000..013ddd5cdb48
>--- /dev/null
>+++ mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile
>@@ -0,0 +1,15 @@
>+--- contrib/notmuch-mutt/Makefile.orig	2018-10-13 17:57:20 UTC
>++++ contrib/notmuch-mutt/Makefile
>+@@ -18,8 +18,10 @@ install: all
>+ 	mkdir -p $(DESTDIR)$(prefix)/bin
>+ 	sed "1s|^#!.*|#! $(PERL_ABSOLUTE)|" < $(NAME) > $(DESTDIR)$(prefix)/bin/$(NAME)
>+ 	chmod 755 $(DESTDIR)$(prefix)/bin/$(NAME)
>+-	install -D -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1
>+-	install -D -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc
>++	mkdir -p $(DESTDIR)$(mandir)/man1
>++	install -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1
>++	mkdir -p $(DESTDIR)$(sysconfdir)/Muttrc.d
>++	install -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc
>+ 
>+ clean:
>+ 	rm -f notmuch-mutt.1 README.html
>diff --git mail/notmuch/pkg-plist mail/notmuch/pkg-plist
>index 78b13c376b86..0d03dc51ff7b 100644
>--- mail/notmuch/pkg-plist
>+++ mail/notmuch/pkg-plist
>@@ -23,4 +23,5 @@ lib/libnotmuch.so
> lib/libnotmuch.so.5
> lib/libnotmuch.so.5.2.0
> share/bash-completion/completions/notmuch
>+share/zsh/functions/Completion/Unix/_email-notmuch
> share/zsh/functions/Completion/Unix/_notmuch

Actions: View | Diff

Attachments on bug 232310: 198198 | 199020