Sat Jan 28 13:09:28 2023 UTC ()
notmuch, notmuch-emacs: Split notmuch-emacs from notmuch


(ryoon)
diff -r1.85 -r1.86 pkgsrc/mail/notmuch/Makefile
diff -r0 -r1.1 pkgsrc/mail/notmuch/Makefile.common
diff -r1.28 -r1.29 pkgsrc/mail/notmuch/PLIST
diff -r1.11 -r1.12 pkgsrc/mail/notmuch/options.mk
diff -r0 -r1.1 pkgsrc/mail/notmuch-emacs/DESCR
diff -r0 -r1.1 pkgsrc/mail/notmuch-emacs/Makefile
diff -r0 -r1.1 pkgsrc/mail/notmuch-emacs/PLIST

cvs diff -r1.85 -r1.86 pkgsrc/mail/notmuch/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2022/08/26 13:12:38 1.85
+++ pkgsrc/mail/notmuch/Makefile 2023/01/28 13:09:28 1.86
@@ -1,59 +1,7 @@ @@ -1,59 +1,7 @@
1# $NetBSD: Makefile,v 1.85 2022/08/26 13:12:38 ryoon Exp $ 1# $NetBSD: Makefile,v 1.86 2023/01/28 13:09:28 ryoon Exp $
2 2
3DISTNAME= notmuch-0.37 3.include "../../mail/notmuch/Makefile.common"
4CATEGORIES= mail 
5MASTER_SITES= https://notmuchmail.org/releases/ 
6EXTRACT_SUFX= .tar.xz 
7 4
8MAINTAINER= pkgsrc-users@NetBSD.org 5CONFIGURE_ARGS+= --without-emacs
9HOMEPAGE= https://notmuchmail.org/ 
10COMMENT= Mail indexer 
11LICENSE= gnu-gpl-v3 
12 6
13HAS_CONFIGURE= yes 
14USE_LANGUAGES= c c++11 
15USE_TOOLS+= bash gmake makeinfo pkg-config # perl:test 
16MAKE_FLAGS+= PYTHON=${PYTHONBIN} 
17INFO_FILES= yes 
18TEST_TARGET= check 
19 
20PYTHON_FOR_BUILD_ONLY= tool 
21PYTHON_VERSIONS_INCOMPATIBLE= 27 
22 
23REPLACE_BASH+= emacs/notmuch-emacs-mua 
24 
25.include "options.mk" 
26 
27CONFIGURE_ARGS+= --prefix=${PREFIX} 
28CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 
29CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} 
30CONFIGURE_ARGS+= --without-ruby 
31 
32SUBST_CLASSES.SunOS+= gnuld 
33SUBST_STAGE.gnuld= pre-configure 
34SUBST_FILES.gnuld= lib/Makefile.local 
35SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g' 
36 
37SUBST_CLASSES+= sphinx 
38SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX}," 
39SUBST_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local 
40SUBST_STAGE.sphinx= pre-configure 
41SUBST_MESSAGE.sphinx= Fix sphinx command names. 
42 
43SUBST_CLASSES+= gpg 
44SUBST_STAGE.gpg= pre-configure 
45SUBST_MESSAGE.gpg= Select GnuPG command 
46SUBST_FILES.gpg+= configure 
47SUBST_VARS.gpg= GPGME_GPG 
48 
49LDFLAGS.SunOS+= -lsocket -lnsl 
50 
51.include "../../devel/sfsexp/buildlink3.mk" 
52.include "../../lang/python/application.mk" 
53BUILDLINK_API_DEPENDS.gmime3+= gmime3>=3.0.3 
54.include "../../mail/gmime3/buildlink3.mk" 
55.include "../../textproc/xapian/buildlink3.mk" 
56.include "../../devel/talloc/buildlink3.mk" 
57BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2 
58.include "../../devel/zlib/buildlink3.mk" 
59.include "../../mk/bsd.pkg.mk" 7.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/mail/notmuch/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2023/01/28 13:09:28 ryoon Exp $

DISTNAME=	notmuch-0.37
CATEGORIES=	mail
MASTER_SITES=	https://notmuchmail.org/releases/
EXTRACT_SUFX=	.tar.xz

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	https://notmuchmail.org/
COMMENT=	Mail indexer
LICENSE=	gnu-gpl-v3

PATCHDIR=	${.CURDIR}/../../mail/notmuch/patches
DISTINFO_FILE=	${.CURDIR}/../../mail/notmuch/distinfo

HAS_CONFIGURE=	yes
USE_LANGUAGES=	c c++11
USE_TOOLS+=	bash gmake makeinfo pkg-config # perl:test
MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
INFO_FILES=	yes
TEST_TARGET=	check

PYTHON_FOR_BUILD_ONLY=		tool
PYTHON_VERSIONS_INCOMPATIBLE=	27

REPLACE_BASH+=	emacs/notmuch-emacs-mua

.include "options.mk"

CONFIGURE_ARGS+=	--prefix=${PREFIX}
CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
CONFIGURE_ARGS+=	--without-ruby

SUBST_CLASSES.SunOS+=	gnuld
SUBST_STAGE.gnuld=	pre-configure
SUBST_FILES.gnuld=	lib/Makefile.local
SUBST_SED.gnuld=	-e 's/-Wl,--[^ ]*//g'

SUBST_CLASSES+=		sphinx
SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
SUBST_FILES.sphinx+=	bindings/python/docs/Makefile configure doc/Makefile.local
SUBST_STAGE.sphinx=	pre-configure
SUBST_MESSAGE.sphinx=	Fix sphinx command names.

SUBST_CLASSES+=		gpg
SUBST_STAGE.gpg=	pre-configure
SUBST_MESSAGE.gpg=	Select GnuPG command
SUBST_FILES.gpg+=	configure
SUBST_VARS.gpg=		GPGME_GPG

LDFLAGS.SunOS+=	-lsocket -lnsl

.include "../../devel/sfsexp/buildlink3.mk"
.include "../../lang/python/application.mk"
BUILDLINK_API_DEPENDS.gmime3+=	gmime3>=3.0.3
.include "../../mail/gmime3/buildlink3.mk"
.include "../../textproc/xapian/buildlink3.mk"
.include "../../devel/talloc/buildlink3.mk"
BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.5.2
.include "../../devel/zlib/buildlink3.mk"

cvs diff -r1.28 -r1.29 pkgsrc/mail/notmuch/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/PLIST 2023/01/06 10:02:16 1.28
+++ pkgsrc/mail/notmuch/PLIST 2023/01/28 13:09:28 1.29
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1@comment $NetBSD: PLIST,v 1.28 2023/01/06 10:02:16 vins Exp $ 1@comment $NetBSD: PLIST,v 1.29 2023/01/28 13:09:28 ryoon Exp $
2bin/notmuch 2bin/notmuch
3${PLIST.emacs}bin/notmuch-emacs-mua 
4include/notmuch.h 3include/notmuch.h
5${PLIST.doc}info/nmbug.info 4${PLIST.doc}info/nmbug.info
6${PLIST.doc}info/notmuch-address.info 5${PLIST.doc}info/notmuch-address.info
7${PLIST.doc}info/notmuch-compact.info 6${PLIST.doc}info/notmuch-compact.info
8${PLIST.doc}info/notmuch-config.info 7${PLIST.doc}info/notmuch-config.info
9${PLIST.doc}info/notmuch-count.info 8${PLIST.doc}info/notmuch-count.info
10${PLIST.doc}info/notmuch-dump.info 9${PLIST.doc}info/notmuch-dump.info
11${PLIST.doc}info/notmuch-emacs-mua.info 10${PLIST.doc}info/notmuch-emacs-mua.info
12${PLIST.emacs}${PLIST.doc}info/notmuch-emacs.info 
13${PLIST.doc}info/notmuch-git.info 11${PLIST.doc}info/notmuch-git.info
14${PLIST.doc}info/notmuch-hooks.info 12${PLIST.doc}info/notmuch-hooks.info
15${PLIST.doc}info/notmuch-insert.info 13${PLIST.doc}info/notmuch-insert.info
16${PLIST.doc}info/notmuch-new.info 14${PLIST.doc}info/notmuch-new.info
17${PLIST.doc}info/notmuch-properties.info 15${PLIST.doc}info/notmuch-properties.info
18${PLIST.doc}info/notmuch-reindex.info 16${PLIST.doc}info/notmuch-reindex.info
19${PLIST.doc}info/notmuch-reply.info 17${PLIST.doc}info/notmuch-reply.info
20${PLIST.doc}info/notmuch-restore.info 18${PLIST.doc}info/notmuch-restore.info
21${PLIST.doc}info/notmuch-search-terms.info 19${PLIST.doc}info/notmuch-search-terms.info
22${PLIST.doc}info/notmuch-search.info 20${PLIST.doc}info/notmuch-search.info
23${PLIST.doc}info/notmuch-setup.info 21${PLIST.doc}info/notmuch-setup.info
24${PLIST.doc}info/notmuch-sexp-queries.info 22${PLIST.doc}info/notmuch-sexp-queries.info
25${PLIST.doc}info/notmuch-show.info 23${PLIST.doc}info/notmuch-show.info
@@ -41,59 +39,15 @@ ${PLIST.doc}man/man1/notmuch-new.1 @@ -41,59 +39,15 @@ ${PLIST.doc}man/man1/notmuch-new.1
41${PLIST.doc}man/man1/notmuch-reindex.1 39${PLIST.doc}man/man1/notmuch-reindex.1
42${PLIST.doc}man/man1/notmuch-reply.1 40${PLIST.doc}man/man1/notmuch-reply.1
43${PLIST.doc}man/man1/notmuch-restore.1 41${PLIST.doc}man/man1/notmuch-restore.1
44${PLIST.doc}man/man1/notmuch-search.1 42${PLIST.doc}man/man1/notmuch-search.1
45${PLIST.doc}man/man1/notmuch-setup.1 43${PLIST.doc}man/man1/notmuch-setup.1
46${PLIST.doc}man/man1/notmuch-show.1 44${PLIST.doc}man/man1/notmuch-show.1
47${PLIST.doc}man/man1/notmuch-tag.1 45${PLIST.doc}man/man1/notmuch-tag.1
48${PLIST.doc}man/man1/notmuch.1 46${PLIST.doc}man/man1/notmuch.1
49${PLIST.doc}man/man3/notmuch.3 47${PLIST.doc}man/man3/notmuch.3
50${PLIST.doc}man/man5/notmuch-hooks.5 48${PLIST.doc}man/man5/notmuch-hooks.5
51${PLIST.doc}man/man7/notmuch-properties.7 49${PLIST.doc}man/man7/notmuch-properties.7
52${PLIST.doc}man/man7/notmuch-search-terms.7 50${PLIST.doc}man/man7/notmuch-search-terms.7
53${PLIST.doc}man/man7/notmuch-sexp-queries.7 51${PLIST.doc}man/man7/notmuch-sexp-queries.7
54${PLIST.emacs}share/applications/notmuch-emacs-mua.desktop 
55${PLIST.emacs}share/emacs/site-lisp/coolj.el 
56${PLIST.emacs}share/emacs/site-lisp/coolj.elc 
57${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el 
58${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc 
59${PLIST.emacs}share/emacs/site-lisp/notmuch-company.el 
60${PLIST.emacs}share/emacs/site-lisp/notmuch-company.elc 
61${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.el 
62${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.elc 
63${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el 
64${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc 
65${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.el 
66${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.elc 
67${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el 
68${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.elc 
69${PLIST.emacs}share/emacs/site-lisp/notmuch-jump.el 
70${PLIST.emacs}share/emacs/site-lisp/notmuch-jump.elc 
71${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.el 
72${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.elc 
73${PLIST.emacs}share/emacs/site-lisp/notmuch-logo.svg 
74${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.el 
75${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.elc 
76${PLIST.emacs}share/emacs/site-lisp/notmuch-message.el 
77${PLIST.emacs}share/emacs/site-lisp/notmuch-message.elc 
78${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.el 
79${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.elc 
80${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.el 
81${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.elc 
82${PLIST.emacs}share/emacs/site-lisp/notmuch-print.el 
83${PLIST.emacs}share/emacs/site-lisp/notmuch-print.elc 
84${PLIST.emacs}share/emacs/site-lisp/notmuch-query.el 
85${PLIST.emacs}share/emacs/site-lisp/notmuch-query.elc 
86${PLIST.emacs}share/emacs/site-lisp/notmuch-show.el 
87${PLIST.emacs}share/emacs/site-lisp/notmuch-show.elc 
88${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.el 
89${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.elc 
90${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.el 
91${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.elc 
92${PLIST.emacs}share/emacs/site-lisp/notmuch-version.el 
93${PLIST.emacs}share/emacs/site-lisp/notmuch-version.elc 
94${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.el 
95${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.elc 
96${PLIST.emacs}share/emacs/site-lisp/notmuch.el 
97${PLIST.emacs}share/emacs/site-lisp/notmuch.elc 
98share/zsh/site-functions/_email-notmuch 52share/zsh/site-functions/_email-notmuch
99share/zsh/site-functions/_notmuch 53share/zsh/site-functions/_notmuch

cvs diff -r1.11 -r1.12 pkgsrc/mail/notmuch/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/options.mk 2023/01/06 10:02:16 1.11
+++ pkgsrc/mail/notmuch/options.mk 2023/01/28 13:09:28 1.12
@@ -1,34 +1,21 @@ @@ -1,34 +1,21 @@
1# $NetBSD: options.mk,v 1.11 2023/01/06 10:02:16 vins Exp $ 1# $NetBSD: options.mk,v 1.12 2023/01/28 13:09:28 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.notmuch 3PKG_OPTIONS_VAR= PKG_OPTIONS.notmuch
4PKG_SUPPORTED_OPTIONS= notmuch-emacs doc 4PKG_SUPPORTED_OPTIONS= doc
5PKG_SUGGESTED_OPTIONS+= doc 5PKG_SUGGESTED_OPTIONS+= doc
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### emacs support 
11### 
12BUILDLINK_DEPMETHOD.desktop-file-utils= build 
13.include "../../sysutils/desktop-file-utils/buildlink3.mk" 
14PLIST_VARS+= emacs 
15.if !empty(PKG_OPTIONS:Mnotmuch-emacs) 
16DEPENDS+= emacs>=25.1:../../editors/emacs 
17PLIST.emacs= yes 
18.else 
19CONFIGURE_ARGS+= --without-emacs 
20.endif 
21 
22### 
23### documentation support 10### documentation support
24### 11###
25PLIST_VARS+= doc 12PLIST_VARS+= doc
26.if !empty(PKG_OPTIONS:Mdoc) 13.if !empty(PKG_OPTIONS:Mdoc)
27PLIST.doc= yes 14PLIST.doc= yes
28USE_TOOLS+= perl 15USE_TOOLS+= perl
29BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen 16BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
30BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 17BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
31.else 18.else
32CONFIGURE_ARGS+= --without-docs 19CONFIGURE_ARGS+= --without-docs
33CONFIGURE_ARGS+= --without-api-docs 20CONFIGURE_ARGS+= --without-api-docs
34.endif 21.endif

File Added: pkgsrc/mail/notmuch-emacs/DESCR
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
the Xapian library to provide fast, full-text search with a convenient
search syntax.

This package provides Emacs interface module and its documentation.

File Added: pkgsrc/mail/notmuch-emacs/Makefile
# $NetBSD: Makefile,v 1.1 2023/01/28 13:09:28 ryoon Exp $

.include "../../mail/notmuch/Makefile.common"
PKGNAME=		${DISTNAME:S/notmuch-/notmuch-emacs-/}

DEPENDS+=		emacs>=25.1:../../editors/emacs
DEPENDS+=		notmuch-[0-9]*:../../mail/notmuch

BUILDLINK_DEPMETHOD.desktop-file-utils=	build
.include "../../sysutils/desktop-file-utils/buildlink3.mk"

CONFIGURE_ARGS+=	--with-emacs

MAKE_FLAGS=		INFO_TEXI_FILES=doc/_build/texinfo/notmuch-emacs.texi
MAKE_FLAGS+=		COPY_INFO1= # empty
INSTALL_TARGET=		install-emacs install-info

.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/mail/notmuch-emacs/PLIST
@comment $NetBSD: PLIST,v 1.1 2023/01/28 13:09:28 ryoon Exp $
bin/notmuch-emacs-mua
${PLIST.doc}info/notmuch-emacs.info
share/applications/notmuch-emacs-mua.desktop
share/emacs/site-lisp/coolj.el
share/emacs/site-lisp/coolj.elc
share/emacs/site-lisp/notmuch-address.el
share/emacs/site-lisp/notmuch-address.elc
share/emacs/site-lisp/notmuch-company.el
share/emacs/site-lisp/notmuch-company.elc
share/emacs/site-lisp/notmuch-compat.el
share/emacs/site-lisp/notmuch-compat.elc
share/emacs/site-lisp/notmuch-crypto.el
share/emacs/site-lisp/notmuch-crypto.elc
share/emacs/site-lisp/notmuch-draft.el
share/emacs/site-lisp/notmuch-draft.elc
share/emacs/site-lisp/notmuch-hello.el
share/emacs/site-lisp/notmuch-hello.elc
share/emacs/site-lisp/notmuch-jump.el
share/emacs/site-lisp/notmuch-jump.elc
share/emacs/site-lisp/notmuch-lib.el
share/emacs/site-lisp/notmuch-lib.elc
share/emacs/site-lisp/notmuch-logo.svg
share/emacs/site-lisp/notmuch-maildir-fcc.el
share/emacs/site-lisp/notmuch-maildir-fcc.elc
share/emacs/site-lisp/notmuch-message.el
share/emacs/site-lisp/notmuch-message.elc
share/emacs/site-lisp/notmuch-mua.el
share/emacs/site-lisp/notmuch-mua.elc
share/emacs/site-lisp/notmuch-parser.el
share/emacs/site-lisp/notmuch-parser.elc
share/emacs/site-lisp/notmuch-print.el
share/emacs/site-lisp/notmuch-print.elc
share/emacs/site-lisp/notmuch-query.el
share/emacs/site-lisp/notmuch-query.elc
share/emacs/site-lisp/notmuch-show.el
share/emacs/site-lisp/notmuch-show.elc
share/emacs/site-lisp/notmuch-tag.el
share/emacs/site-lisp/notmuch-tag.elc
share/emacs/site-lisp/notmuch-tree.el
share/emacs/site-lisp/notmuch-tree.elc
share/emacs/site-lisp/notmuch-version.el
share/emacs/site-lisp/notmuch-version.elc
share/emacs/site-lisp/notmuch-wash.el
share/emacs/site-lisp/notmuch-wash.elc
share/emacs/site-lisp/notmuch.el
share/emacs/site-lisp/notmuch.elc