Attachment #199020 for bug #232310

Lines 40-48 do-configure: Link Here

(-)mail/notmuch-emacs/Makefile (+2 lines)
40	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local	40	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
41	@${PRINTF} \	41	@${PRINTF} \
42	'%s\n' \	42	'%s\n' \
		43	BASH_ABSOLUTE=/bin/sh \
43	desktop_dir=${PREFIX}/share/applications \	44	desktop_dir=${PREFIX}/share/applications \
44	emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \	45	emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
45	emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \	46	emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
		47	HAVE_BASH=1 \
46	HAVE_EMACS=1 \	48	HAVE_EMACS=1 \
47	infodir=${PREFIX}/${INFO_PATH} \	49	infodir=${PREFIX}/${INFO_PATH} \
48	mandir=${MANPREFIX}/man \	50	mandir=${MANPREFIX}/man \

Removed Link Here

(-)mail/notmuch-emacs/files/patch-doc_Makefile.local (-11 lines)
1	--- doc/Makefile.local.orig 2018-06-16 21:06:47 UTC
2	+++ doc/Makefile.local
3	@@ -44,7 +44,7 @@ sphinx-texinfo:
4	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
5
6	sphinx-info: sphinx-texinfo
7	- make -C $(DOCBUILDDIR)/texinfo info
8	+ $(MAKE) -C $(DOCBUILDDIR)/texinfo info
9
10	# Use the man page converter that is available. We should never depend
11	# on MAN_ROFF_FILES if a converter is not available.




--- 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





USES=		gmake perl5

MAKE_ARGS+=	mandir=${MANPREFIX}/man prefix=${PREFIX}
MASTERDIR=	${.CURDIR}/../notmuch
NO_ARCH=	yes
WRKSRC_SUBDIR=	contrib/notmuch-mutt

OPTIONS_DEFAULT=	MANPAGES
OPTIONS_SUB=	yes

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

post-install-EXAMPLES-off:
	@${RM} -r ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
	${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc

post-install-MANPAGES-off:
	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-mutt.1

.include "${MASTERDIR}/Makefile"

Lines 2-8 Link Here

(-)mail/notmuch/Makefile (-4 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= notmuch	4	PORTNAME= notmuch
5	PORTVERSION= 0.27	5	PORTVERSION= 0.28
6	CATEGORIES?= mail	6	CATEGORIES?= mail
7	MASTER_SITES= https://notmuchmail.org/releases/	7	MASTER_SITES= https://notmuchmail.org/releases/
8		8
Lines 27-33 TEST_DEPENDS= bash:shells/bash \ Link Here
27	gwc:sysutils/coreutils \	27	gwc:sysutils/coreutils \
28	${LOCALBASE}/bin/gdb:devel/gdb	28	${LOCALBASE}/bin/gdb:devel/gdb
29		29
30	USES= compiler:c++11-lang gmake pkgconfig python:build,test	30	USES= compiler:c++11-lang gmake gnome pkgconfig python:build,test
31	USE_GNOME= glib20	31	USE_GNOME= glib20
32	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
33		33
Lines 60-71 DOXYGEN_CONFIGURE_WITH= api-docs Link Here
60	MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx	60	MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
61	MANPAGES_CONFIGURE_WITH= docs	61	MANPAGES_CONFIGURE_WITH= docs
62		62
63	# install completions even in absence of shells/bash-completions	63	# Install bash completions without incurring a dependcy on
		64	# shells/bash-completion. Also avoid automatic installation of
		65	# info pages on FreeBSD 10.
64	post-configure:	66	post-configure:
65	${REINPLACE_CMD} \	67	${REINPLACE_CMD} \
		68	-e '/^BASH_ABSOLUTE[[:blank:]]=/s\|=.\|=${LOCALBASE}/bin/bash\|' \
		69	-e '/^HAVE_BASH[[:blank:]]=/s/=./=1/' \
66	-e '/^HAVE_INSTALL_INFO[[:blank:]]=/s/=./=0/' \	70	-e '/^HAVE_INSTALL_INFO[[:blank:]]=/s/=./=0/' \
67	-e '/^HAVE_MAKEINFO[[:blank:]]=/s/=./=0/' \	71	-e '/^HAVE_MAKEINFO[[:blank:]]=/s/=./=0/' \
68	-e '/^WITH_BASH[[:blank:]]=/s/=./= 1/' \	72	-e '/^WITH_BASH[[:blank:]]=/s/=./=1/' \
69	${WRKSRC}/Makefile.config	73	${WRKSRC}/Makefile.config
70		74
71	post-install:	75	post-install:

Lines 1-3 Link Here

(-)mail/notmuch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529138705	1	TIMESTAMP = 1539421796
2	SHA256 (notmuch-0.27.tar.gz) = 40d3192f8f130f227b511fc80be86310c7f60ccb6d043b563f201fa505de0876	2	SHA256 (notmuch-0.28.tar.gz) = acca75cec91651ccd2a7e31f7004e2ae14eff4ae38e375b8a88414c464cd0a37
3	SIZE (notmuch-0.27.tar.gz) = 912583	3	SIZE (notmuch-0.28.tar.gz) = 921069




--- 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
 




--- 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

Lines 23-26 lib/libnotmuch.so Link Here

(-)mail/notmuch/pkg-plist (+1 lines)
23	lib/libnotmuch.so.5	23	lib/libnotmuch.so.5
24	lib/libnotmuch.so.5.2.0	24	lib/libnotmuch.so.5.2.0
25	share/bash-completion/completions/notmuch	25	share/bash-completion/completions/notmuch
		26	share/zsh/functions/Completion/Unix/_email-notmuch
26	share/zsh/functions/Completion/Unix/_notmuch	27	share/zsh/functions/Completion/Unix/_notmuch

Return to bug 232310

Removed Link Here

(-)mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua (-35 lines)
1	--- emacs/notmuch-emacs-mua.orig 2017-07-18 20:34:56 UTC
2	+++ emacs/notmuch-emacs-mua
3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/env bash
5	+#!/bin/sh
6	#
7	# notmuch-emacs-mua - start composing a mail on the command line
8	#
9	@@ -26,8 +26,8 @@ set -eu
10	# calling convention: escape -v var "$arg" (like in bash printf).
11	escape ()
12	{
13	- local __escape_arg__=${3//\\/\\\\}
14	- printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
15	+ __escape_arg__="$(printf '%s' "$3" \| sed -e 's\|\\\|\\\\\|g' -e 's\|\"\|\\\"\|g')"
16	+ eval "$2=\$__escape_arg__"
17	}
18
19	EMACS=${EMACS:-emacs}
20	@@ -150,14 +150,14 @@ if [ -n "${MAILTO}" ]; then
21	exit 1
22	fi
23	ELISP="(browse-url-mail \"${MAILTO}\")"
24	-elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then
25	+elif [ -z "${ELISP}" ] && [ -n "${HELLO}" ]; then
26	ELISP="(notmuch)"
27	else
28	ELISP="(notmuch-mua-new-mail) ${ELISP}"
29	fi
30
31	# Kill the terminal/frame if we're creating one.
32	-if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then
33	+if [ -z "$USE_EMACSCLIENT" ] \|\| [ -n "$CREATE_FRAME" ] \|\| [ -n "$NO_WINDOW" ]; then
34	ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
35	fi

Lines 14-19 RUN_DEPENDS= mutt:mail/mutt \ Link Here

(-)mail/notmuch-mutt/Makefile (-7 / +9 lines)
14		14
15	USES= gmake perl5	15	USES= gmake perl5
16		16
		17	MAKE_ARGS+= mandir=${MANPREFIX}/man prefix=${PREFIX}
17	MASTERDIR= ${.CURDIR}/../notmuch	18	MASTERDIR= ${.CURDIR}/../notmuch
18	NO_ARCH= yes	19	NO_ARCH= yes
19	WRKSRC_SUBDIR= contrib/notmuch-mutt	20	WRKSRC_SUBDIR= contrib/notmuch-mutt
Lines 22-35 OPTIONS_DEFINE= EXAMPLES MANPAGES Link Here
22	OPTIONS_DEFAULT= MANPAGES	23	OPTIONS_DEFAULT= MANPAGES
23	OPTIONS_SUB= yes	24	OPTIONS_SUB= yes
24		25
25	do-install:	26	post-install-EXAMPLES-on:
26	${INSTALL_SCRIPT} ${WRKSRC}/notmuch-mutt ${STAGEDIR}${PREFIX}/bin	27	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		28	@${MV} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
		29	@${RMDIR} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
27		30
28	do-install-EXAMPLES-on:	31	post-install-EXAMPLES-off:
29	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	32	@${RM} -r ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d
30	${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
31		33
32	do-install-MANPAGES-on:	34	post-install-MANPAGES-off:
33	${INSTALL_MAN} ${WRKSRC}/notmuch-mutt.1 ${STAGEDIR}${MANPREFIX}/man/man1	35	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-mutt.1
34		36
35	.include "${MASTERDIR}/Makefile"	37	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)mail/notmuch/files/patch-configure (+18 lines)
1	--- configure.orig 2018-10-16 07:56:32 UTC
2	+++ configure
3	@@ -566,6 +566,7 @@ if command -v ${BASH} > /dev/null; then
4	printf "Yes (%s).\n" "$bash_absolute"
5	else
6	have_bash=0
7	+ bash_absolute=
8	printf "No. (%s not found)\n" "${BASH}"
9	fi
10
11	@@ -576,6 +577,7 @@ if command -v ${PERL} > /dev/null; then
12	printf "Yes (%s).\n" "$perl_absolute"
13	else
14	have_perl=0
15	+ perl_absolute=
16	printf "No. (%s not found)\n" "${PERL}"
17	fi
18

Added Link Here

(-)mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile (+15 lines)
1	--- contrib/notmuch-mutt/Makefile.orig 2018-10-13 17:57:20 UTC
2	+++ contrib/notmuch-mutt/Makefile
3	@@ -18,8 +18,10 @@ install: all
4	mkdir -p $(DESTDIR)$(prefix)/bin
5	sed "1s\|^#!.*\|#! $(PERL_ABSOLUTE)\|" < $(NAME) > $(DESTDIR)$(prefix)/bin/$(NAME)
6	chmod 755 $(DESTDIR)$(prefix)/bin/$(NAME)
7	- install -D -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1
8	- install -D -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc
9	+ mkdir -p $(DESTDIR)$(mandir)/man1
10	+ install -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1
11	+ mkdir -p $(DESTDIR)$(sysconfdir)/Muttrc.d
12	+ install -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc
13
14	clean:
15	rm -f notmuch-mutt.1 README.html