From 059631fba203433aef6e17dfe2e296fa8d1646cd Mon Sep 17 00:00:00 2001
From: kurt <kurt@openbsd.org>
Date: Fri, 24 Apr 2009 14:43:16 +0000
Subject: [PATCH] Fix an intermittent build failure caused by a segfault in
 dfasyn. okay sthen

---
 mail/mairix/Makefile                       |  3 ++-
 mail/mairix/patches/patch-dfasyn_compdfa_c | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 mail/mairix/patches/patch-dfasyn_compdfa_c

diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index bb5144863b7..7524c192fc2 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2008/02/12 22:11:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/04/24 14:43:16 kurt Exp $
 
 COMMENT=		program for indexing & searching email
 
 DISTNAME=		mairix-0.21
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		mail
 HOMEPAGE=		http://www.rpcurnow.force9.co.uk/mairix/
 
diff --git a/mail/mairix/patches/patch-dfasyn_compdfa_c b/mail/mairix/patches/patch-dfasyn_compdfa_c
new file mode 100644
index 00000000000..ccfa0776409
--- /dev/null
+++ b/mail/mairix/patches/patch-dfasyn_compdfa_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-dfasyn_compdfa_c,v 1.1 2009/04/24 14:43:16 kurt Exp $
+--- dfasyn/compdfa.c.orig	Sun Apr 19 09:57:26 2009
++++ dfasyn/compdfa.c	Sun Apr 19 09:56:53 2009
+@@ -425,7 +425,7 @@ do_next_dfa_state:
+ 
+     for (j=0; j<ntokens; j++) {
+       int next_state = dfas[i]->map[j];
+-      if (leads_to_result[next_state] == 0) {
++      if ((next_state >= 0) && leads_to_result[next_state] == 0) {
+         dfas[i]->map[j] = -1;
+       }
+     }