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 context 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 @@
-# $NetBSD: Makefile,v 1.85 2022/08/26 13:12:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.86 2023/01/28 13:09:28 ryoon Exp $
 
-DISTNAME=	notmuch-0.37
-CATEGORIES=	mail
-MASTER_SITES=	https://notmuchmail.org/releases/
-EXTRACT_SUFX=	.tar.xz
+.include "../../mail/notmuch/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://notmuchmail.org/
-COMMENT=	Mail indexer
-LICENSE=	gnu-gpl-v3
+CONFIGURE_ARGS+=	--without-emacs
 
-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"
 .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 context 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,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.28 2023/01/06 10:02:16 vins Exp $
+@comment $NetBSD: PLIST,v 1.29 2023/01/28 13:09:28 ryoon Exp $
 bin/notmuch
-${PLIST.emacs}bin/notmuch-emacs-mua
 include/notmuch.h
 ${PLIST.doc}info/nmbug.info
 ${PLIST.doc}info/notmuch-address.info
@@ -9,7 +8,6 @@
 ${PLIST.doc}info/notmuch-count.info
 ${PLIST.doc}info/notmuch-dump.info
 ${PLIST.doc}info/notmuch-emacs-mua.info
-${PLIST.emacs}${PLIST.doc}info/notmuch-emacs.info
 ${PLIST.doc}info/notmuch-git.info
 ${PLIST.doc}info/notmuch-hooks.info
 ${PLIST.doc}info/notmuch-insert.info
@@ -51,49 +49,5 @@
 ${PLIST.doc}man/man7/notmuch-properties.7
 ${PLIST.doc}man/man7/notmuch-search-terms.7
 ${PLIST.doc}man/man7/notmuch-sexp-queries.7
-${PLIST.emacs}share/applications/notmuch-emacs-mua.desktop
-${PLIST.emacs}share/emacs/site-lisp/coolj.el
-${PLIST.emacs}share/emacs/site-lisp/coolj.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-company.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-company.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-jump.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-jump.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-lib.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-logo.svg
-${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-maildir-fcc.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-message.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-message.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-mua.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-parser.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-print.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-print.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-query.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-query.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-show.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-show.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-tag.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-tree.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-version.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-version.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.elc
-${PLIST.emacs}share/emacs/site-lisp/notmuch.el
-${PLIST.emacs}share/emacs/site-lisp/notmuch.elc
 share/zsh/site-functions/_email-notmuch
 share/zsh/site-functions/_notmuch
cvs diff -r1.11 -r1.12 pkgsrc/mail/notmuch/options.mk (expand / switch to context 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,23 +1,10 @@
-# $NetBSD: options.mk,v 1.11 2023/01/06 10:02:16 vins Exp $
+# $NetBSD: options.mk,v 1.12 2023/01/28 13:09:28 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.notmuch
-PKG_SUPPORTED_OPTIONS=	notmuch-emacs doc
+PKG_SUPPORTED_OPTIONS=	doc
 PKG_SUGGESTED_OPTIONS+=	doc
 
 .include "../../mk/bsd.options.mk"
-
-###
-### emacs support
-###
-BUILDLINK_DEPMETHOD.desktop-file-utils=	build
-.include "../../sysutils/desktop-file-utils/buildlink3.mk"
-PLIST_VARS+=		emacs
-.if !empty(PKG_OPTIONS:Mnotmuch-emacs)
-DEPENDS+=		emacs>=25.1:../../editors/emacs
-PLIST.emacs=		yes
-.else
-CONFIGURE_ARGS+=	--without-emacs
-.endif
 
 ###
 ### documentation support
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