Attachment #194331 for bug #229075




# $FreeBSD$

PORTREVISION=   1
CATEGORIES=	mail elisp
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}


USES=		emacs gmake

INSTALL_TARGET=	install-emacs
MAKE_ARGS+=	subdirs+=emacs
MASTERDIR=	${.CURDIR}/../notmuch
NO_ARCH=	yes
PATCHDIR=	${.CURDIR}/files

OPTIONS_DEFINE=	DESKTOP DOCS MANPAGES
OPTIONS_DEFAULT=	MANPAGES


DESKTOP_DESC=	Install .desktop file for notmuch-emacs-mua

DESKTOP_CONFIGURE_ON=	WITH_DESKTOP=1
DESKTOP_USES=	desktop-file-utils
DOCS_ALL_TARGET=	build-info
DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
DOCS_CONFIGURE_ON=	HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1
DOCS_INFO=	notmuch-emacs
DOCS_INSTALL_TARGET=	install-info
DOCS_USES=	makeinfo
MANPAGES_ALL_TARGET=	build-man
MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
MANPAGES_CONFIGURE_ON=	HAVE_SPHINX=1
MANPAGES_INSTALL_TARGET=	install-man
MANPAGES_MAKE_ARGS=	subdirs+=doc

# fake ./configure to avoid unneeded dependencies
do-configure:

		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
		HAVE_EMACS=1 \
		infodir=${PREFIX}/${INFO_PATH} \
		mandir=${MANPREFIX}/man \
		NOTMUCH_SRCDIR=${WRKSRC} \
		prefix=${PREFIX} \
		srcdir=. \
		subdirs='doc emacs' \
		WITH_EMACS=1 \
		${CONFIGURE_ARGS} \
		> ${WRKSRC}/Makefile.config

# work around race condition in Sphinx (cf. PR-227460)
pre-build:
	@${MKDIR} ${WRKSRC}/doc/_build/doctrees

do-install-DOCS-on:
	${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/notmuch-emacs.info ${STAGEDIR}${PREFIX}/${INFO_PATH}

post-install:
	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el

# keep poudriere testport happy
post-install-DOCS-on:
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete

post-install-MANPAGES-on:
	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete


Added 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




# $FreeBSD$

PORTNAME=	notmuch
PORTVERSION=	0.27
CATEGORIES?=	mail
MASTER_SITES=	https://notmuchmail.org/releases/


LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3

BROKEN_powerpc64=	Does not build due to databases/xapian-core

.ifndef MASTERDIR
LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
		libxapian.so:databases/xapian-core \

USE_LDCONFIG=	yes

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
		--mandir=${MANPREFIX}/man \
		--prefix=${PREFIX} \
		--with-bash-completion \
		--with-retry-lock \


post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*

# keep poudriere testport happy
post-install-MANPAGES-on:

Lines 1-3 Link Here

(-)mail/notmuch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1525128779	1	TIMESTAMP = 1529138705
2	SHA256 (notmuch-0.26.2.tar.gz) = 109c1865db7a035d08707421d13e9b6b82ee8e9f1534db70c28c51bc39370e3b	2	SHA256 (notmuch-0.27.tar.gz) = 40d3192f8f130f227b511fc80be86310c7f60ccb6d043b563f201fa505de0876
3	SIZE (notmuch-0.26.2.tar.gz) = 907187	3	SIZE (notmuch-0.27.tar.gz) = 912583

Lines 21-26 bin/notmuch Link Here

(-)mail/notmuch/pkg-plist (-1 / +1 lines)
21	include/notmuch.h	21	include/notmuch.h
22	lib/libnotmuch.so	22	lib/libnotmuch.so
23	lib/libnotmuch.so.5	23	lib/libnotmuch.so.5
24	lib/libnotmuch.so.5.1.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/_notmuch	26	share/zsh/functions/Completion/Unix/_notmuch





LIB_DEPENDS=	libnotmuch.so:mail/notmuch

USES=		python uniquefiles:dirs
USE_PYTHON=	autoplist distutils

MASTERDIR=	${.CURDIR}/../notmuch
NO_ARCH=	yes
PORTDOCS=	*
WRKSRC_SUBDIR=	bindings/python

OPTIONS_DEFINE=	DOCS

	@${MAKE_CMD} -C ${WRKSRC}/docs html

do-install-DOCS-on:
	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo

.include "${MASTERDIR}/Makefile"

Return to bug 229075

Lines 1-6 Link Here

(-)mail/notmuch-emacs/Makefile (-11 / +16 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTREVISION= 1
4	CATEGORIES= mail elisp	3	CATEGORIES= mail elisp
5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	4	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
6		5
Lines 11-19 RUN_DEPENDS= notmuch:mail/notmuch Link Here
11	USES= emacs gmake	10	USES= emacs gmake
12		11
13	INSTALL_TARGET= install-emacs	12	INSTALL_TARGET= install-emacs
14	MAKE_ARGS+= subdirs+=emacs
15	MASTERDIR= ${.CURDIR}/../notmuch	13	MASTERDIR= ${.CURDIR}/../notmuch
16	NO_ARCH= yes	14	NO_ARCH= yes
		15	PATCHDIR= ${.CURDIR}/files
17		16
18	OPTIONS_DEFINE= DESKTOP DOCS MANPAGES	17	OPTIONS_DEFINE= DESKTOP DOCS MANPAGES
19	OPTIONS_DEFAULT= MANPAGES	18	OPTIONS_DEFAULT= MANPAGES
Lines 21-35 OPTIONS_SUB= yes Link Here
21		20
22	DESKTOP_DESC= Install .desktop file for notmuch-emacs-mua	21	DESKTOP_DESC= Install .desktop file for notmuch-emacs-mua
23		22
24	DESKTOP_MAKE_ARGS= WITH_DESKTOP=1	23	DESKTOP_CONFIGURE_ON= WITH_DESKTOP=1
25	DESKTOP_USES= desktop-file-utils	24	DESKTOP_USES= desktop-file-utils
		25	DOCS_ALL_TARGET= build-info
26	DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx	26	DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
		27	DOCS_CONFIGURE_ON= HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1
27	DOCS_INFO= notmuch-emacs	28	DOCS_INFO= notmuch-emacs
		29	DOCS_INSTALL_TARGET= install-info
28	DOCS_USES= makeinfo	30	DOCS_USES= makeinfo
29	MANPAGES_ALL_TARGET= build-man	31	MANPAGES_ALL_TARGET= build-man
30	MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx	32	MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
		33	MANPAGES_CONFIGURE_ON= HAVE_SPHINX=1
31	MANPAGES_INSTALL_TARGET= install-man	34	MANPAGES_INSTALL_TARGET= install-man
32	MANPAGES_MAKE_ARGS= subdirs+=doc
33		35
34	# fake ./configure to avoid unneeded dependencies	36	# fake ./configure to avoid unneeded dependencies
35	do-configure:	37	do-configure:
Lines 41-64 do-configure: Link Here
41	emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \	43	emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
42	emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \	44	emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
43	HAVE_EMACS=1 \	45	HAVE_EMACS=1 \
44	HAVE_SPHINX=1 \	46	infodir=${PREFIX}/${INFO_PATH} \
45	mandir=${MANPREFIX}/man \	47	mandir=${MANPREFIX}/man \
		48	NOTMUCH_SRCDIR=${WRKSRC} \
46	prefix=${PREFIX} \	49	prefix=${PREFIX} \
47	srcdir=. \	50	srcdir=. \
		51	subdirs='doc emacs' \
48	WITH_EMACS=1 \	52	WITH_EMACS=1 \
		53	${CONFIGURE_ARGS} \
49	> ${WRKSRC}/Makefile.config	54	> ${WRKSRC}/Makefile.config
50		55
51	do-build-DOCS-on:	56	# work around race condition in Sphinx (cf. PR-227460)
52	@${MAKE_CMD} -C ${WRKSRC} subdirs=doc sphinx-texinfo	57	pre-build:
53	@${MAKE_CMD} -C ${WRKSRC}/doc/_build/texinfo MAKEINFO='${MAKEINFO} --no-split' info	58	@${MKDIR} ${WRKSRC}/doc/_build/doctrees
54
55	do-install-DOCS-on:
56	${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/notmuch-emacs.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
57		59
58	post-install:	60	post-install:
59	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el	61	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
60		62
61	# keep poudriere testport happy	63	# keep poudriere testport happy
		64	post-install-DOCS-on:
		65	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete
		66
62	post-install-MANPAGES-on:	67	post-install-MANPAGES-on:
63	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete	68	@${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete
64		69

Added 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 2-8 Link Here

(-)mail/notmuch/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= notmuch	4	PORTNAME= notmuch
5	PORTVERSION= 0.26.2	5	PORTVERSION= 0.27
6	CATEGORIES?= mail	6	CATEGORIES?= mail
7	MASTER_SITES= https://notmuchmail.org/releases/	7	MASTER_SITES= https://notmuchmail.org/releases/
8		8
Lines 12-19 COMMENT?= Thread-based email index, search and tagging application Link Here
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3	13	LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
14		14
15	BROKEN_powerpc64= Does not build due to databases/xapian-core
16
17	.ifndef MASTERDIR	15	.ifndef MASTERDIR
18	LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \	16	LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \
19	libxapian.so:databases/xapian-core \	17	libxapian.so:databases/xapian-core \
Lines 34-40 USE_GNOME= glib20 Link Here
34	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
35		33
36	HAS_CONFIGURE= yes	34	HAS_CONFIGURE= yes
37	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \	35	CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \
		36	--mandir=${MANPREFIX}/man \
38	--prefix=${PREFIX} \	37	--prefix=${PREFIX} \
39	--with-bash-completion \	38	--with-bash-completion \
40	--with-retry-lock \	39	--with-retry-lock \
Lines 66-72 post-configure: Link Here
66		65
67	post-install:	66	post-install:
68	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch	67	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
69	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.1.0	68	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?.?.?*
70		69
71	# keep poudriere testport happy	70	# keep poudriere testport happy
72	post-install-MANPAGES-on:	71	post-install-MANPAGES-on:

Lines 7-18 COMMENT= Python interface for the Notmuch email search and tagging library Link Here

(-)mail/py-notmuch/Makefile (-4 / +4 lines)
7		7
8	LIB_DEPENDS= libnotmuch.so:mail/notmuch	8	LIB_DEPENDS= libnotmuch.so:mail/notmuch
9		9
10	USES= python	10	USES= python uniquefiles:dirs
11	USE_PYTHON= autoplist distutils	11	USE_PYTHON= autoplist distutils
12		12
13	MASTERDIR= ${.CURDIR}/../notmuch	13	MASTERDIR= ${.CURDIR}/../notmuch
14	NO_ARCH= yes	14	NO_ARCH= yes
15	PORTDOCS= python/	15	PORTDOCS= *
16	WRKSRC_SUBDIR= bindings/python	16	WRKSRC_SUBDIR= bindings/python
17		17
18	OPTIONS_DEFINE= DOCS	18	OPTIONS_DEFINE= DOCS
Lines 23-29 do-build-DOCS-on: Link Here
23	@${MAKE_CMD} -C ${WRKSRC}/docs html	23	@${MAKE_CMD} -C ${WRKSRC}/docs html
24		24
25	do-install-DOCS-on:	25	do-install-DOCS-on:
26	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/python	26	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
27	@${RM} ${STAGEDIR}${DOCSDIR}/python/.buildinfo	27	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
28		28
29	.include "${MASTERDIR}/Makefile"	29	.include "${MASTERDIR}/Makefile"