4 files changed, 3 insertions, 207 deletions

diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index ad4a15e291d1..8ce19ab50c17 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mairix
-PORTVERSION=	0.15.2
+PORTVERSION=	0.16.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rpcurnow.force9.co.uk/mairix/
 
@@ -14,13 +14,9 @@ MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	Indexing and searching in Maildir or MH folders
 
 HAS_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
-post-patch:
-	@${REINPLACE_CMD} '/dfasyn/d' ${WRKSRC}/Makefile.in
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mairix ${PREFIX}/bin
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index 1150226a247e..957c7f7c915e 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,2 +1,2 @@
-MD5 (mairix-0.15.2.tar.gz) = cab61e4e95184541e6b7b4f67dfca3cc
-SIZE (mairix-0.15.2.tar.gz) = 118317
+MD5 (mairix-0.16.1.tar.gz) = 61a46c5d52ebfe7fd13a0e7597febcab
+SIZE (mairix-0.16.1.tar.gz) = 126356
diff --git a/mail/mairix/files/patch-datescan.c b/mail/mairix/files/patch-datescan.c
deleted file mode 100644
index 2fecbcf9ba89..000000000000
--- a/mail/mairix/files/patch-datescan.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- /dev/null	Mon Feb 16 12:56:01 2004
-+++ datescan.c	Mon Feb 16 12:55:18 2004
-@@ -0,0 +1,88 @@
-+#include "dates.h"
-+enum DATESCAN_TYPE datescan_exitval[] = {
-+DS_FAILURE, /* State 0 */
-+DS_FAILURE, /* State 1 */
-+DS_D, /* State 2 */
-+DS_D, /* State 3 */
-+DS_D, /* State 4 */
-+DS_FAILURE, /* State 5 */
-+DS_Y, /* State 6 */
-+DS_SCALED, /* State 7 */
-+DS_D, /* State 8 */
-+DS_SCALED, /* State 9 */
-+DS_Y, /* State 10 */
-+DS_FAILURE, /* State 11 */
-+DS_FAILURE, /* State 12 */
-+DS_SCALED, /* State 13 */
-+DS_FAILURE, /* State 14 */
-+DS_FAILURE, /* State 15 */
-+DS_M, /* State 16 */
-+DS_FAILURE, /* State 17 */
-+DS_FAILURE, /* State 18 */
-+DS_Y, /* State 19 */
-+DS_DM, /* State 20 */
-+DS_FAILURE, /* State 21 */
-+DS_MD, /* State 22 */
-+DS_MD, /* State 23 */
-+DS_MD, /* State 24 */
-+DS_FAILURE, /* State 25 */
-+DS_YM, /* State 26 */
-+DS_FAILURE, /* State 27 */
-+DS_FAILURE, /* State 28 */
-+DS_FAILURE, /* State 29 */
-+DS_FAILURE, /* State 30 */
-+DS_MY, /* State 31 */
-+DS_MD, /* State 32 */
-+DS_MY, /* State 33 */
-+DS_YYMMDD, /* State 34 */
-+DS_YMD, /* State 35 */
-+DS_YMD, /* State 36 */
-+DS_YMD, /* State 37 */
-+DS_DMY, /* State 38 */
-+DS_FAILURE, /* State 39 */
-+DS_DMY, /* State 40 */
-+DS_FAILURE, /* State 41 */
-+DS_YYMMDD, /* State 42 */
-+DS_FAILURE  /* State 43 */
-+};
-+
-+static short datescan_trans[] = {
-+     1,    2,    2,    3,    4,    5,    6,    6,
-+     6,    6,    6,    7,    8,    8,    8,    8,
-+     8,    9,    8,    8,   10,   10,   10,    9,
-+    10,   10,   10,   10,   10,    9,   -1,   -1,
-+    -1,   -1,   -1,   11,   12,   12,   12,   12,
-+    12,   13,   -1,   -1,   -1,   -1,   -1,   -1,
-+    14,   14,   14,   14,   14,    9,   -1,   -1,
-+    -1,   -1,   -1,   15,   14,   14,   14,   14,
-+    14,   13,   -1,   -1,   -1,   -1,   -1,   16,
-+    17,   17,   17,   17,   17,    7,   -1,   -1,
-+    -1,   -1,   -1,   18,   19,   19,   19,   19,
-+    19,    7,   -1,   -1,   -1,   -1,   -1,   20,
-+    21,   22,   22,   23,   24,   -1,   25,   25,
-+    25,   25,   25,    7,   -1,   -1,   -1,   -1,
-+    -1,   26,   25,   25,   25,   25,   25,   13,
-+    27,   28,   28,   29,   30,   -1,   31,   31,
-+    31,   31,   31,   -1,   32,   32,   32,   32,
-+    32,   -1,   32,   32,   33,   33,   33,   -1,
-+    33,   33,   33,   33,   33,   -1,   34,   34,
-+    34,   34,   34,    7,   -1,   35,   35,   36,
-+    37,   -1,   38,   38,   38,   38,   38,   -1,
-+    39,   39,   39,   39,   39,   -1,   39,   39,
-+    40,   40,   40,   -1,   40,   40,   40,   40,
-+    40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    21,   21,   21,   21,   21,   -1,   21,   21,
-+    21,   21,   21,   -1,   41,   41,   41,   41,
-+    41,    7,   37,   37,   37,   37,   37,   -1,
-+    37,   37,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   27,   27,   27,   27,   27,   -1,
-+    27,   27,   27,   27,   27,   -1,   42,   42,
-+    42,   42,   42,    7,   43,   43,   43,   43,
-+    43,    7,   43,   43,   43,   43,   43,    7
-+};
-+
-+int datescan_next_state(int current_state, int next_token) {
-+  if (next_token < 0 || next_token >= 6) return -1;
-+  return datescan_trans[6*current_state + next_token];
-+}
diff --git a/mail/mairix/files/patch-fromcheck.c b/mail/mairix/files/patch-fromcheck.c
deleted file mode 100644
index a0d5566bd12e..000000000000
--- a/mail/mairix/files/patch-fromcheck.c
+++ /dev/null
@@ -1,109 +0,0 @@
---- /dev/null	Mon Feb 16 13:00:10 2004
-+++ fromcheck.c	Mon Feb 16 13:00:13 2004
-@@ -0,0 +1,106 @@
-+#include "fromcheck.h"
-+enum fromcheck_result fromcheck_exitval[] = {
-+FROMCHECK_FAIL, /* State 0 */
-+FROMCHECK_FAIL, /* State 1 */
-+FROMCHECK_FAIL, /* State 2 */
-+FROMCHECK_FAIL, /* State 3 */
-+FROMCHECK_FAIL, /* State 4 */
-+FROMCHECK_FAIL, /* State 5 */
-+FROMCHECK_FAIL, /* State 6 */
-+FROMCHECK_FAIL, /* State 7 */
-+FROMCHECK_FAIL, /* State 8 */
-+FROMCHECK_FAIL, /* State 9 */
-+FROMCHECK_FAIL, /* State 10 */
-+FROMCHECK_FAIL, /* State 11 */
-+FROMCHECK_FAIL, /* State 12 */
-+FROMCHECK_FAIL, /* State 13 */
-+FROMCHECK_FAIL, /* State 14 */
-+FROMCHECK_FAIL, /* State 15 */
-+FROMCHECK_FAIL, /* State 16 */
-+FROMCHECK_FAIL, /* State 17 */
-+FROMCHECK_FAIL, /* State 18 */
-+FROMCHECK_FAIL, /* State 19 */
-+FROMCHECK_FAIL, /* State 20 */
-+FROMCHECK_FAIL, /* State 21 */
-+FROMCHECK_FAIL, /* State 22 */
-+FROMCHECK_FAIL, /* State 23 */
-+FROMCHECK_FAIL, /* State 24 */
-+FROMCHECK_FAIL, /* State 25 */
-+FROMCHECK_FAIL, /* State 26 */
-+FROMCHECK_FAIL, /* State 27 */
-+FROMCHECK_FAIL, /* State 28 */
-+FROMCHECK_FAIL, /* State 29 */
-+FROMCHECK_FAIL, /* State 30 */
-+FROMCHECK_FAIL, /* State 31 */
-+FROMCHECK_FAIL, /* State 32 */
-+FROMCHECK_FAIL, /* State 33 */
-+FROMCHECK_FAIL, /* State 34 */
-+FROMCHECK_FAIL, /* State 35 */
-+FROMCHECK_FAIL, /* State 36 */
-+FROMCHECK_FAIL, /* State 37 */
-+FROMCHECK_FAIL, /* State 38 */
-+FROMCHECK_FAIL, /* State 39 */
-+FROMCHECK_PASS, /* State 40 */
-+FROMCHECK_FAIL  /* State 41 */
-+};
-+
-+static short fromcheck_trans[] = {
-+    -1,   -1,    1,   -1,   -1,    2,    1,    1,
-+     3,    1,   -1,   -1,    1,    4,   -1,   -1,
-+     1,    1,    1,    1,   -1,   -1,    1,   -1,
-+    -1,    2,    1,    5,    3,    1,   -1,   -1,
-+     1,    4,   -1,    6,    1,    1,    1,    1,
-+    -1,   -1,    7,   -1,   -1,   -1,    7,    7,
-+     7,    7,   -1,   -1,    1,    4,   -1,   -1,
-+     8,    1,    1,    1,   -1,   -1,   -1,   -1,
-+    -1,    6,   -1,    9,   -1,   -1,   -1,   -1,
-+     7,   -1,   -1,    6,    7,    7,    7,    7,
-+    -1,   -1,    1,    4,   -1,   -1,   10,    1,
-+     1,    1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    11,   -1,   -1,   -1,   -1,   -1,    1,    4,
-+    -1,   12,    1,    1,    1,    1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   13,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   12,   -1,   14,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   12,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   15,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   16,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   17,   -1,   -1,
-+    -1,   -1,   -1,   -1,   18,   -1,   -1,   17,
-+    -1,   -1,   -1,   -1,   -1,   -1,   19,   -1,
-+    -1,   20,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   20,   -1,   -1,   -1,   -1,
-+    -1,   -1,   21,   -1,   -1,   20,   -1,   -1,
-+    -1,   -1,   -1,   -1,   22,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    23,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    24,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   25,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   26,   27,
-+    -1,   -1,   -1,   -1,   -1,   -1,   28,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    29,   -1,   -1,   27,   -1,   30,   31,   -1,
-+    -1,   -1,   32,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   30,   -1,
-+    -1,   34,   30,   30,   -1,   -1,   -1,   -1,
-+    30,   -1,   -1,   -1,   30,   30,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   27,   -1,   -1,
-+    -1,   -1,   -1,   -1,   35,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   29,   -1,
-+    -1,   34,   -1,   36,   37,   -1,   -1,   -1,
-+    38,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   36,   -1,   -1,   39,   36,   36,
-+    -1,   -1,   -1,   -1,   36,   -1,   -1,   -1,
-+    36,   36,   -1,   -1,   40,   41,   -1,   -1,
-+    -1,   38,   -1,   -1,   -1,   -1,   -1,   -1,
-+    29,   -1,   -1,   39,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,
-+    -1,   -1,   -1,   -1
-+};
-+
-+int fromcheck_next_state(int current_state, int next_token) {
-+  if (next_token < 0 || next_token >= 10) return -1;
-+  return fromcheck_trans[10*current_state + next_token];
-+}