Update mail/imapfilter to 1.3

Version 1.3 - 13 February 2007
------------------------------
- Perl Compatible Regular Expression (PCRE) support.
- Compile against Lua 5.1 by default.
- Bug fix; program fault in some cases and when namespace prefix was empty
- Bug fix; program fault on some platforms when running in verbose mode

4 files changed, 21 insertions, 20 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 72429606be4..0dde3e90a60 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2006/08/14 22:36:12 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/06/10 21:55:39 tonio Exp $
 
-DISTNAME=		imapfilter-1.2.2
-PKGREVISION=		1
+DISTNAME=		imapfilter-1.3
 CATEGORIES=		mail
 MASTER_SITES=		http://imapfilter.hellug.gr/source/
 EXTRACT_SUFX=		.tar.bz2
@@ -21,5 +20,6 @@ post-install:
 .endfor
 
 .include "../../lang/lua/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapfilter/PLIST b/mail/imapfilter/PLIST
index bd2d73a76a6..9245ce6ff65 100644
--- a/mail/imapfilter/PLIST
+++ b/mail/imapfilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/23 20:52:09 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/06/10 21:55:39 tonio Exp $
 bin/imapfilter
 man/man1/imapfilter.1
 man/man5/imapfilter_config.5
@@ -6,5 +6,6 @@ share/examples/imapfilter/sample.config.lua
 share/examples/imapfilter/sample.extend.lua
 share/imapfilter/auxiliary.lua
 share/imapfilter/interface.lua
+share/imapfilter/regex.lua
 @dirrm share/imapfilter
 @dirrm share/examples/imapfilter
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index e4029bc3193..48bfefc6930 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2006/08/14 22:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.16 2007/06/10 21:55:39 tonio Exp $
 
-SHA1 (imapfilter-1.2.2.tar.bz2) = a033cb7128cba0cd9cb514e55743f84ad7608ecd
-RMD160 (imapfilter-1.2.2.tar.bz2) = 0bbe32f16ab956a8a736d9e072829d7974186cf3
-Size (imapfilter-1.2.2.tar.bz2) = 32625 bytes
-SHA1 (patch-aa) = 0dd1536013f6f8422125fa7fa184e7994acc73c9
+SHA1 (imapfilter-1.3.tar.bz2) = 3b3e92537408a05740a4502b256a23af1ac43c92
+RMD160 (imapfilter-1.3.tar.bz2) = f5f76630ac930a504ef9800b26b2cc40b30577dd
+Size (imapfilter-1.3.tar.bz2) = 34174 bytes
+SHA1 (patch-aa) = 459d380643938afdcfd3999cfb88d6dfcf1a3467
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index 464ff369663..613e01054d5 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2007/06/10 21:55:39 tonio Exp $
 
---- Makefile.orig	2006-08-01 12:11:34.000000000 +0000
+--- Makefile.orig	2007-02-14 02:08:35.000000000 +0100
 +++ Makefile
-@@ -1,20 +1,13 @@
+@@ -1,18 +1,11 @@
 -DESTDIR = /usr/local
 -BINDIR = /usr/local/bin
 -SHAREDIR = /usr/local/share/imapfilter
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
 -INCDIRS = -I/usr/local/include
 -LIBDIRS = -L/usr/local/lib
 -
--MYCFLAGS = -Wall -O
+-MYCFLAGS = -Wall -g
 -MYLDFLAGS = 
 +DESTDIR = $(PREFIX)
 +BINDIR = $(PREFIX)/bin
@@ -24,12 +24,9 @@ $NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
 -LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
 +CFLAGS+= $(DEFS)
  
--LIBS = -lm -llua -llualib -lssl -lcrypto
-+LIBS = -lm -llua -lssl -lcrypto
+ LIBS = -lm -llua -lssl -lcrypto -lpcre
  
- MAN_BIN = imapfilter.1
- MAN_CONFIG = imapfilter_config.5
-@@ -30,7 +23,7 @@ OBJ = auth.o buffer.o cert.o core.o file
+@@ -31,7 +24,7 @@ OBJ = auth.o buffer.o cert.o core.o file
  all: $(BIN)
  
  $(BIN): $(OBJ)
@@ -38,7 +35,7 @@ $NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
  
  $(OBJ): imapfilter.h
  buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h
-@@ -42,19 +35,15 @@ auth.o cert.o imap.o imapfilter.o log.o 
+@@ -43,21 +36,16 @@ auth.o cert.o imap.o imapfilter.o log.o 
  imapfilter.o: version.h
  
  install: $(BIN)
@@ -49,6 +46,8 @@ $NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
 -		chmod 0644 $(SHAREDIR)/$(INTERFACE_LUA)
 -	cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \
 -		chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA)
+-	cp -f $(REGEX_LUA) $(SHAREDIR) && \
+-		chmod 0644 $(SHAREDIR)/$(REGEX_LUA)
 -	if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi
 -	cp -f $(MAN_BIN) $(MANDIR)/man1 && \
 -		chmod 0644 $(MANDIR)/man1/$(MAN_BIN)
@@ -60,10 +59,11 @@ $NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
 +	$(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
 +	$(BSD_INSTALL_DATA) $(INTERFACE_LUA) $(SHAREDIR)/$(INTERFACE_LUA)
 +	$(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(AUXILIARY_LUA)
++	$(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(REGEX_LUA)
 +	$(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN)
 +	$(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5
 +	$(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
  
  deinstall:
- 	rm -f $(BINDIR)/$(BIN) $(SHAREDIR)/$(INTERFACE_LUA) \
+ 	rm -f $(BINDIR)/$(BIN) \