Import notmuch-0.17 as mail/notmuch, packaged for wip by myself

and tonnerre.

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.

7 files changed, 164 insertions, 0 deletions

diff --git a/mail/notmuch/DESCR b/mail/notmuch/DESCR
new file mode 100644
index 00000000000..b6d70ca0f4a
--- /dev/null
+++ b/mail/notmuch/DESCR
@@ -0,0 +1,4 @@
+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.
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
new file mode 100644
index 00000000000..a6e0d64e7fa
--- /dev/null
+++ b/mail/notmuch/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2014/01/09 12:15:23 wiz Exp $
+
+DISTNAME=	notmuch-0.17
+CATEGORIES=	mail
+MASTER_SITES=	http://notmuchmail.org/releases/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://notmuchmail.org/
+COMMENT=	Mail indexer
+LICENSE=	gnu-gpl-v3
+
+HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake pkg-config
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+
+.include "../../mail/gmime24/buildlink3.mk"
+.include "../../textproc/xapian/buildlink3.mk"
+.include "../../devel/talloc/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
new file mode 100644
index 00000000000..c995160badb
--- /dev/null
+++ b/mail/notmuch/PLIST
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST,v 1.1 2014/01/09 12:15:23 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
+share/emacs/site-lisp/coolj.el
+share/emacs/site-lisp/notmuch-address.el
+share/emacs/site-lisp/notmuch-crypto.el
+share/emacs/site-lisp/notmuch-hello.el
+share/emacs/site-lisp/notmuch-lib.el
+share/emacs/site-lisp/notmuch-logo.png
+share/emacs/site-lisp/notmuch-maildir-fcc.el
+share/emacs/site-lisp/notmuch-message.el
+share/emacs/site-lisp/notmuch-mua.el
+share/emacs/site-lisp/notmuch-parser.el
+share/emacs/site-lisp/notmuch-print.el
+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-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/buildlink3.mk b/mail/notmuch/buildlink3.mk
new file mode 100644
index 00000000000..4ca2a87ebae
--- /dev/null
+++ b/mail/notmuch/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/01/09 12:15:23 wiz Exp $
+
+BUILDLINK_TREE+=	notmuch
+
+.if !defined(NOTMUCH_BUILDLINK3_MK)
+NOTMUCH_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.notmuch+=	notmuch>=0.16
+BUILDLINK_PKGSRCDIR.notmuch?=	../../mail/notmuch
+
+.include "../../mail/gmime24/buildlink3.mk"
+.include "../../textproc/xapian/buildlink3.mk"
+.endif	# NOTMUCH_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-notmuch
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
new file mode 100644
index 00000000000..ee0e566558b
--- /dev/null
+++ b/mail/notmuch/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2014/01/09 12:15:23 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
diff --git a/mail/notmuch/patches/patch-aa b/mail/notmuch/patches/patch-aa
new file mode 100644
index 00000000000..aec2251c99d
--- /dev/null
+++ b/mail/notmuch/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2014/01/09 12:15:23 wiz Exp $
+
+Install completion files into example directory.
+
+--- configure.orig	2013-08-03 11:29:40.000000000 +0000
++++ configure
+@@ -668,10 +668,10 @@ HAVE_EMACS = ${have_emacs}
+ desktop_dir = \$(prefix)/share/applications
+ 
+ # The directory to which bash completions files should be installed
+-bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(sysconfdir)/bash_completion.d}
++bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(prefix)/share/examples/notmuch/bash_completion.d}
+ 
+ # The directory to which zsh completions files should be installed
+-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
+ # build its own version)
diff --git a/mail/notmuch/patches/patch-notmuch-config.c b/mail/notmuch/patches/patch-notmuch-config.c
new file mode 100644
index 00000000000..aa06cfac66a
--- /dev/null
+++ b/mail/notmuch/patches/patch-notmuch-config.c
@@ -0,0 +1,57 @@
+$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;
+ }