summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/notmuch/Makefile11
-rw-r--r--mail/notmuch/PLIST34
-rw-r--r--mail/notmuch/distinfo13
-rw-r--r--mail/notmuch/patches/patch-aa17
-rw-r--r--mail/notmuch/patches/patch-doc_Makefile.local15
-rw-r--r--mail/notmuch/patches/patch-doc_prerst2man.py11
-rw-r--r--mail/notmuch/patches/patch-notmuch-config.c57
7 files changed, 72 insertions, 86 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index a6e0d64e7fa..fb2484b25f3 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/01/09 12:15:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/03 15:01:46 wiz Exp $
-DISTNAME= notmuch-0.17
+DISTNAME= notmuch-0.18.1
CATEGORIES= mail
MASTER_SITES= http://notmuchmail.org/releases/
@@ -9,14 +9,21 @@ HOMEPAGE= http://notmuchmail.org/
COMMENT= Mail indexer
LICENSE= gnu-gpl-v3
+BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+
HAS_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
+MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN}
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.18
+.include "../../lang/python/application.mk"
.include "../../mail/gmime24/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"
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
index c995160badb..e9171591c31 100644
--- a/mail/notmuch/PLIST
+++ b/mail/notmuch/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/09 12:15:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/07/03 15:01:46 wiz Exp $
bin/notmuch
include/notmuch.h
lib/libnotmuch.so
lib/libnotmuch.so.3
lib/libnotmuch.so.3.1.0
-man/man1/notmuch-compact.1
-man/man1/notmuch-config.1
-man/man1/notmuch-count.1
-man/man1/notmuch-dump.1
-man/man1/notmuch-insert.1
-man/man1/notmuch-new.1
-man/man1/notmuch-reply.1
-man/man1/notmuch-restore.1
-man/man1/notmuch-search.1
-man/man1/notmuch-setup.1
-man/man1/notmuch-show.1
-man/man1/notmuch-tag.1
-man/man1/notmuch.1
-man/man5/notmuch-hooks.5
-man/man7/notmuch-search-terms.7
+man/man1/notmuch-compact.1.gz
+man/man1/notmuch-config.1.gz
+man/man1/notmuch-count.1.gz
+man/man1/notmuch-dump.1.gz
+man/man1/notmuch-insert.1.gz
+man/man1/notmuch-new.1.gz
+man/man1/notmuch-reply.1.gz
+man/man1/notmuch-restore.1.gz
+man/man1/notmuch-search.1.gz
+man/man1/notmuch-setup.1.gz
+man/man1/notmuch-show.1.gz
+man/man1/notmuch-tag.1.gz
+man/man1/notmuch.1.gz
+man/man5/notmuch-hooks.5.gz
+man/man7/notmuch-search-terms.7.gz
share/emacs/site-lisp/coolj.el
share/emacs/site-lisp/notmuch-address.el
share/emacs/site-lisp/notmuch-crypto.el
@@ -34,7 +34,7 @@ share/emacs/site-lisp/notmuch-query.el
share/emacs/site-lisp/notmuch-show.el
share/emacs/site-lisp/notmuch-tag.el
share/emacs/site-lisp/notmuch-tree.el
+share/emacs/site-lisp/notmuch-version.el
share/emacs/site-lisp/notmuch-wash.el
share/emacs/site-lisp/notmuch.el
-share/examples/notmuch/bash_completion.d/notmuch
share/examples/notmuch/zsh/functions/Completion/Unix/_notmuch
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index ee0e566558b..98bde9928d7 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2014/01/09 12:15:23 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/07/03 15:01:46 wiz Exp $
-SHA1 (notmuch-0.17.tar.gz) = 0fe14140126a0da04754f548edf7e7b135eeec86
-RMD160 (notmuch-0.17.tar.gz) = 3bc5635dabe9987ad0535ac6d76cb160eb2413ff
-Size (notmuch-0.17.tar.gz) = 606710 bytes
-SHA1 (patch-aa) = 905585b294983e88e04274e70e817c2ddc2a3dce
-SHA1 (patch-notmuch-config.c) = 21aafdcfb3a53d29c3d0d37283fecef0194cefc5
+SHA1 (notmuch-0.18.1.tar.gz) = ad82d6d5355594c4cab3c6d28c70ae4993acbec9
+RMD160 (notmuch-0.18.1.tar.gz) = 2e4825029cce0a972bf7d2b4493657e4366e262c
+Size (notmuch-0.18.1.tar.gz) = 634691 bytes
+SHA1 (patch-aa) = d439fe1539c14524832e0059ad8201f8131e3b04
+SHA1 (patch-doc_Makefile.local) = 4bdae1a7cb16db7ffd60948b30a1b73fe73af8ea
+SHA1 (patch-doc_prerst2man.py) = 66db50b64da9d0ccb4ec35cd9fb8327524e19af8
diff --git a/mail/notmuch/patches/patch-aa b/mail/notmuch/patches/patch-aa
index aec2251c99d..06007b7386a 100644
--- a/mail/notmuch/patches/patch-aa
+++ b/mail/notmuch/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.1 2014/01/09 12:15:23 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2014/07/03 15:01:46 wiz Exp $
Install completion files into example directory.
---- configure.orig 2013-08-03 11:29:40.000000000 +0000
+--- configure.orig 2014-05-06 07:27:29.000000000 +0000
+++ configure
-@@ -668,10 +668,10 @@ HAVE_EMACS = ${have_emacs}
+@@ -418,7 +418,7 @@ else
+ have_sphinx=0
+
+ printf "Checking if rst2man is available... "
+- if rst2man -V > /dev/null 2>&1; then
++ if rst2man.py -V > /dev/null 2>&1; then
+ printf "Yes.\n"
+ have_rst2man=1
+ else
+@@ -824,10 +824,10 @@ HAVE_RST2MAN=${have_rst2man}
desktop_dir = \$(prefix)/share/applications
# The directory to which bash completions files should be installed
@@ -15,5 +24,5 @@ Install completion files into example directory.
-zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix}
+zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/examples/notmuch/zsh/functions/Completion/Unix}
- # Whether the getline function is available (if not, then notmuch will
+ # Whether the canonicalize_file_name function is available (if not, then notmuch will
# build its own version)
diff --git a/mail/notmuch/patches/patch-doc_Makefile.local b/mail/notmuch/patches/patch-doc_Makefile.local
new file mode 100644
index 00000000000..d65a034978d
--- /dev/null
+++ b/mail/notmuch/patches/patch-doc_Makefile.local
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_Makefile.local,v 1.1 2014/07/03 15:01:46 wiz Exp $
+
+--- doc/Makefile.local.orig 2014-05-06 07:27:29.000000000 +0000
++++ doc/Makefile.local
+@@ -7,8 +7,8 @@ SPHINXOPTS := -q
+ SPHINXBUILD = sphinx-build
+ DOCBUILDDIR := $(dir)/_build
+
+-prerst2man := python $(srcdir)/$(dir)/prerst2man.py
+-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
++prerst2man := ${PYTHONBIN} $(srcdir)/$(dir)/prerst2man.py
++mkdocdeps := ${PYTHONBIN} $(srcdir)/$(dir)/mkdocdeps.py
+
+ # Internal variables.
+ ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)
diff --git a/mail/notmuch/patches/patch-doc_prerst2man.py b/mail/notmuch/patches/patch-doc_prerst2man.py
new file mode 100644
index 00000000000..2d831b7b472
--- /dev/null
+++ b/mail/notmuch/patches/patch-doc_prerst2man.py
@@ -0,0 +1,11 @@
+$NetBSD: patch-doc_prerst2man.py,v 1.1 2014/07/03 15:01:46 wiz Exp $
+
+--- doc/prerst2man.py.orig 2014-05-06 07:27:29.000000000 +0000
++++ doc/prerst2man.py
+@@ -59,5 +59,5 @@ for page in man_pages:
+ outfile.write("".join(lines))
+ outfile.close()
+
+- system('set -x; rst2man {0} {1}/{2}.{3}'
++ system('set -x; rst2man.py {0} {1}/{2}.{3}'
+ .format(filename, outdir, page[0], page[4]))
diff --git a/mail/notmuch/patches/patch-notmuch-config.c b/mail/notmuch/patches/patch-notmuch-config.c
deleted file mode 100644
index aa06cfac66a..00000000000
--- a/mail/notmuch/patches/patch-notmuch-config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-notmuch-config.c,v 1.1 2014/01/09 12:15:23 wiz Exp $
-
-NULL as second argument for realpath() is only supported in glibc
-and POSIX 2008. Work around this. See BUGS section for problems:
-http://man7.org/linux/man-pages/man3/realpath.3.html
-
---- notmuch-config.c.orig 2013-12-31 00:39:25.000000000 +0000
-+++ notmuch-config.c
-@@ -23,6 +23,8 @@
- #include <pwd.h>
- #include <netdb.h>
- #include <assert.h>
-+#include <sys/param.h>
-+#include <stdlib.h>
-
- static const char toplevel_config_comment[] =
- " .notmuch-config - Configuration file for the notmuch mail system\n"
-@@ -444,7 +446,7 @@ int
- notmuch_config_save (notmuch_config_t *config)
- {
- size_t length;
-- char *data, *filename;
-+ char *data, filename[MAXPATHLEN];
- GError *error = NULL;
-
- data = g_key_file_to_data (config->key_file, &length, NULL);
-@@ -454,15 +456,9 @@ notmuch_config_save (notmuch_config_t *c
- }
-
- /* Try not to overwrite symlinks. */
-- filename = realpath (config->filename, NULL);
-- if (! filename) {
-+ if (! realpath (config->filename, filename)) {
- if (errno == ENOENT) {
-- filename = strdup (config->filename);
-- if (! filename) {
-- fprintf (stderr, "Out of memory.\n");
-- g_free (data);
-- return 1;
-- }
-+ strncpy(filename, config->filename, MAXPATHLEN);
- } else {
- fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename,
- strerror (errno));
-@@ -480,12 +476,10 @@ notmuch_config_save (notmuch_config_t *c
- filename, error->message);
- }
- g_error_free (error);
-- free (filename);
- g_free (data);
- return 1;
- }
-
-- free (filename);
- g_free (data);
- return 0;
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 02:15:45 +0000