[PATCH v2 0/9] FreeBSD Support Patches

2012-05-30 Thread Mike Kelly
Hi, Here's a second attempt at adding FreeBSD support. Hopefully most of the concerns raised about the initial patch set have been addressed. I'll send my I don't have emacs patches in a separate email. ___ notmuch mailing list notmuch@notmuchmail.org

[PATCH v2 1/9] configure: Add support for FreeBSD.

2012-05-30 Thread Mike Kelly
This makes FreeBSD a recognized platform. Follow up patches make it work properly. --- configure |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5602be2..344f413 100755 --- a/configure +++ b/configure @@ -360,6 +360,10 @@ elif [ $uname =

[PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test

2012-05-30 Thread Mike Kelly
On FreeBSD, and probably anywhere else someone installed xapian to some other prefix, we need to use XAPIAN_LDFLAGS to make the linker can actually find libxapian. --- test/Makefile.local |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile.local

[PATCH v2 4/9] test/smtp-dummy.c: fix compilation on FreeBSD

2012-05-30 Thread Mike Kelly
Use the more portable netint/in.h, instead of netint/ip.h, to include htons(3), etc. --- test/smtp-dummy.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c index 3801a5e..86d4316 100644 --- a/test/smtp-dummy.c +++ b/test/smtp-dummy.c

[PATCH v2 5/9] tests: Test against source man pages.

2012-05-30 Thread Mike Kelly
Without this, help-test tests against the installed man pages, rather than the default ones. --- test/test-lib.sh | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 06aaea2..da792b7 100644 --- a/test/test-lib.sh +++

[PATCH v2 6/9] test/basic: use portable args for find

2012-05-30 Thread Mike Kelly
`-executable` isn't available in FreeBSD's version of find, so use a more portable version, `-perm +111`. --- test/basic |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/basic b/test/basic index d6aed24..3b635c8 100755 --- a/test/basic +++ b/test/basic @@ -53,8

[PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD

2012-05-30 Thread Mike Kelly
FreeBSD's `wc -l` includes some white space in front of the number. Instead, we add a test_expect_equal_num() to test-lib.sh, which ensures we do a proper numeric comparision, and in a portable way. --- test/count |8 test/test-lib.sh | 22 ++ 2 files

[PATCH v2 8/9] test/atomicity: use a more portable 'cp' form

2012-05-30 Thread Mike Kelly
-a already implies -r/-R, so no need for both. FreeBSD's cp complains: cp: the -R and -r options may not be specified together --- test/atomicity |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/atomicity b/test/atomicity index 6df0a00..1c786fa 100755 ---

Re: search summary and exclusions

2012-05-30 Thread Mark Walters
On Wed, 30 May 2012, Peter Wang noval...@gmail.com wrote: On Tue, 29 May 2012 08:00:00 -0700, Jameson Graef Rollins jroll...@finestructure.net wrote: On Mon, May 28 2012, Peter Wang noval...@gmail.com wrote: % ./notmuch search --format=json --exclude=true -- thread:9598

Re: [PATCH v2 0/9] FreeBSD Support Patches

2012-05-30 Thread Tomi Ollila
On Wed, May 30 2012, Mike Kelly pi...@pioto.org wrote: Hi, Here's a second attempt at adding FreeBSD support. Hopefully most of the concerns raised about the initial patch set have been addressed. LGTM and patches apply, compiles fine and related tests pass. Tomi

Re: [PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD

2012-05-30 Thread Jameson Graef Rollins
On Wed, May 30 2012, Mike Kelly pi...@pioto.org wrote: FreeBSD's `wc -l` includes some white space in front of the number. Instead, we add a test_expect_equal_num() to test-lib.sh, which ensures we do a proper numeric comparision, and in a portable way. Is there a way we can avoid adding

Re: [PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD

2012-05-30 Thread Tomi Ollila
On Wed, May 30 2012, Jameson Graef Rollins jroll...@finestructure.net wrote: On Wed, May 30 2012, Mike Kelly pi...@pioto.org wrote: FreeBSD's `wc -l` includes some white space in front of the number. Instead, we add a test_expect_equal_num() to test-lib.sh, which ensures we do a proper

search summary and exclusions

2012-05-30 Thread Peter Wang
On Tue, 29 May 2012 08:00:00 -0700, Jameson Graef Rollins wrote: > On Mon, May 28 2012, Peter Wang wrote: > > % ./notmuch search --format=json --exclude=true -- thread:9598 > > tag:unread > > [{"thread": "9598", > > "timestamp": 1338231998, > > "date_relative": "Today

[PATCH v2 0/9] FreeBSD Support Patches

2012-05-30 Thread Mike Kelly
Hi, Here's a second attempt at adding FreeBSD support. Hopefully most of the concerns raised about the initial patch set have been addressed. I'll send my "I don't have emacs" patches in a separate email.

[PATCH v2 1/9] configure: Add support for FreeBSD.

2012-05-30 Thread Mike Kelly
This makes FreeBSD a recognized platform. Follow up patches make it work properly. --- configure |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5602be2..344f413 100755 --- a/configure +++ b/configure @@ -360,6 +360,10 @@ elif [ $uname =

[PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test

2012-05-30 Thread Mike Kelly
On FreeBSD, and probably anywhere else someone installed xapian to some other prefix, we need to use XAPIAN_LDFLAGS to make the linker can actually find libxapian. --- test/Makefile.local |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile.local

[PATCH v2 4/9] test/smtp-dummy.c: fix compilation on FreeBSD

2012-05-30 Thread Mike Kelly
Use the more portable netint/in.h, instead of netint/ip.h, to include htons(3), etc. --- test/smtp-dummy.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c index 3801a5e..86d4316 100644 --- a/test/smtp-dummy.c +++ b/test/smtp-dummy.c

[PATCH v2 5/9] tests: Test against source man pages.

2012-05-30 Thread Mike Kelly
Without this, help-test tests against the installed man pages, rather than the default ones. --- test/test-lib.sh | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 06aaea2..da792b7 100644 --- a/test/test-lib.sh +++

[PATCH v2 6/9] test/basic: use portable args for find

2012-05-30 Thread Mike Kelly
`-executable` isn't available in FreeBSD's version of find, so use a more portable version, `-perm +111`. --- test/basic |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/basic b/test/basic index d6aed24..3b635c8 100755 --- a/test/basic +++ b/test/basic @@ -53,8

[PATCH v2 3/9] Makefile.local: define _GNU_SOURCE

2012-05-30 Thread Mike Kelly
Several places currently define _GNU_SOURCE above the #includes to make sure that things like 'getline(3)' are available, but defining these in one place also helps to improve portability to other platforms where these may not be available otherwise. --- Makefile.local |4 ++--

[PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD

2012-05-30 Thread Mike Kelly
FreeBSD's `wc -l` includes some white space in front of the number. Instead, we add a test_expect_equal_num() to test-lib.sh, which ensures we do a proper numeric comparision, and in a portable way. --- test/count |8 test/test-lib.sh | 22 ++ 2 files

[PATCH v2 8/9] test/atomicity: use a more portable 'cp' form

2012-05-30 Thread Mike Kelly
-a already implies -r/-R, so no need for both. FreeBSD's cp complains: cp: the -R and -r options may not be specified together --- test/atomicity |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/atomicity b/test/atomicity index 6df0a00..1c786fa 100755 ---

[PATCH v2 9/9] tests: bsd sed doesn't allow replacing '\n'

2012-05-30 Thread Mike Kelly
Various workarounds still don't act quite the same way. So, just use perl, which seems to act the way these tests expect. --- test/maildir-sync |2 +- test/multipart| 22 +++--- test/test-lib.sh |2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git

search summary and exclusions

2012-05-30 Thread Mark Walters
On Wed, 30 May 2012, Peter Wang wrote: > On Tue, 29 May 2012 08:00:00 -0700, Jameson Graef Rollins finestructure.net> wrote: >> On Mon, May 28 2012, Peter Wang wrote: >> > % ./notmuch search --format=json --exclude=true -- thread:9598 >> > tag:unread >> > [{"thread":

[PATCH v2 0/9] FreeBSD Support Patches

2012-05-30 Thread Tomi Ollila
On Wed, May 30 2012, Mike Kelly wrote: > Hi, > > Here's a second attempt at adding FreeBSD support. Hopefully most of the > concerns raised about the initial patch set have been addressed. LGTM and patches apply, compiles fine and related tests pass. Tomi

[PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD

2012-05-30 Thread Jameson Graef Rollins
diff output, which is important for debugging, and the syntax is different from the standard we've been using: if ...; then We try to maintain syntax consistency across the code base. Thanks. jamie. -- next part -- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 835 bytes Desc: not available URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20120530/02e1f8d9/attachment.pgp>