Update to version 2.0.6

Changes since last packaged version (2.0.3):
Version 2.0.6 - 7 October 2007
------------------------------
- Bug fix; the search query that was sent with the select_all() method had an
  incorrect format and this caused an error in some mail servers.


Version 2.0.5 - 4 October 2007
------------------------------
- Bug fix; an error in the sample extensions file.
- Bug fix; typo errors in the manual page.
- The documentation was updated with details and examples on how to access
  mailboxes inside folders.
- Examples were added on how to define composite filters that include multiple
  searching rules.


Version 2.0.4 - 27 September 2007
---------------------------------
- Bug fix; the send_query() method didn't return the special form of table that
  the rest of the searching methods did.
- An additional searching method has been added to search for keyword flags
  set.
- A new variable that was added to the Makefile makes it possible to set an
  alternative environment for the installation path.

3 files changed, 46 insertions, 41 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index f3fe16a2c75..da67a90cc12 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2007/08/15 21:22:54 seb Exp $
+# $NetBSD: Makefile,v 1.27 2007/10/28 16:42:48 seb Exp $
 
-DISTNAME=		imapfilter-2.0.3
+DISTNAME=		imapfilter-2.0.6
 CATEGORIES=		mail
 MASTER_SITES=		http://imapfilter.hellug.gr/source/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index a72fb2ea42b..f53aa0db07b 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2007/08/15 21:22:54 seb Exp $
+$NetBSD: distinfo,v 1.18 2007/10/28 16:42:48 seb Exp $
 
-SHA1 (imapfilter-2.0.3.tar.bz2) = 525189444c96051456ed5c409e2688072e0f0346
-RMD160 (imapfilter-2.0.3.tar.bz2) = b925b35d1180f84c08ff06c1c600c699193b2033
-Size (imapfilter-2.0.3.tar.bz2) = 37929 bytes
-SHA1 (patch-aa) = 9e60555564697a3c870bc3008a30bebcd7c878de
+SHA1 (imapfilter-2.0.6.tar.bz2) = 93ce31079f0a350b5b4bbf824fdf9c1d00653ec7
+RMD160 (imapfilter-2.0.6.tar.bz2) = 1ae1e9ac16119d85f64594669b9aa1e918cba16b
+Size (imapfilter-2.0.6.tar.bz2) = 38536 bytes
+SHA1 (patch-aa) = b7ede32938ae3a25041d23176043ce3061ee867e
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index 8f77495cb61..233eb0b395d 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.9 2007/08/15 21:22:55 seb Exp $
+$NetBSD: patch-aa,v 1.10 2007/10/28 16:42:48 seb Exp $
 
---- Makefile.orig	2007-06-30 20:38:47.000000000 +0000
+--- Makefile.orig	2007-10-07 11:07:19.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
--DESTDIR = /usr/local
+-DESTDIR =
 -BINDIR = /usr/local/bin
 -SHAREDIR = /usr/local/share/imapfilter
 -MANDIR = /usr/local/man
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2007/08/15 21:22:55 seb Exp $
  
 -CFLAGS = $(MYCFLAGS) $(DEFS) $(INCDIRS)
 -LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
-+CFLAGS+= $(DEFS)
++CFLAGS+=	$(DEFS)
  
  LIBS = -lm -llua -lpcre -lssl -lcrypto
  
@@ -29,41 +29,46 @@ $NetBSD: patch-aa,v 1.9 2007/08/15 21:22:55 seb Exp $
  
  $(BIN): $(OBJ)
 -	$(CC) -o $(BIN) $(LDFLAGS) $(OBJ) $(LIBS)
-+	$(CC) -o $(BIN) $(LDFLAGS) $(CFLAGS) $(OBJ) $(LIBS)
++	$(CC) -o $(BIN) $(LDFLAGS) $(CLFAGS) $(OBJ) $(LIBS)
  
  $(OBJ): imapfilter.h
  buffer.o imap.o imapfilter.o namespace.o request.o response.o: buffer.h
-@@ -49,33 +48,22 @@ auth.o cert.o imap.o imapfilter.o log.o 
+@@ -49,38 +48,22 @@ auth.o cert.o imap.o imapfilter.o log.o 
  imapfilter.o: version.h
  
  install: $(BIN)
--	if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
--	cp -f $(BIN) $(BINDIR) && chmod 0755 $(BINDIR)/$(BIN)
--	if test ! -d $(SHAREDIR); then mkdir -p $(SHAREDIR); fi
--	cp -f $(COMMON_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(COMMON_LUA)
--	cp -f $(SET_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(SET_LUA)
--	cp -f $(REGEX_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(REGEX_LUA)
--	cp -f $(ACCOUNT_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(ACCOUNT_LUA)
--	cp -f $(MAILBOX_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(MAILBOX_LUA)
--	cp -f $(MESSAGE_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(MESSAGE_LUA)
--	cp -f $(OPTIONS_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(OPTIONS_LUA)
--	cp -f $(AUXILIARY_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(AUXILIARY_LUA)
--	cp -f $(DEPRECATED_LUA) $(SHAREDIR) && \
--		chmod 0644 $(SHAREDIR)/$(DEPRECATED_LUA)
--	if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi
--	cp -f $(MAN_BIN) $(MANDIR)/man1 && \
--		chmod 0644 $(MANDIR)/man1/$(MAN_BIN)
--	if test ! -d $(MANDIR)/man5; then mkdir -p $(MANDIR)/man5; fi
--	cp -f $(MAN_CONFIG) $(MANDIR)/man5 && \
--		chmod 0644 $(MANDIR)/man5/$(MAN_CONFIG)
+-	if test ! -d $(DESTDIR)$(BINDIR); then \
+-		mkdir -p $(DESTDIR)$(BINDIR); fi
+-	cp -f $(BIN) $(DESTDIR)$(BINDIR) && \
+-		chmod 0755 $(DESTDIR)$(BINDIR)/$(BIN)
+-	if test ! -d $(DESTDIR)$(SHAREDIR); then \
+-		mkdir -p $(DESTDIR)$(SHAREDIR); fi
+-	cp -f $(COMMON_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(COMMON_LUA)
+-	cp -f $(SET_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(SET_LUA)
+-	cp -f $(REGEX_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(REGEX_LUA)
+-	cp -f $(ACCOUNT_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(ACCOUNT_LUA)
+-	cp -f $(MAILBOX_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MAILBOX_LUA)
+-	cp -f $(MESSAGE_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(MESSAGE_LUA)
+-	cp -f $(OPTIONS_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(OPTIONS_LUA)
+-	cp -f $(AUXILIARY_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(AUXILIARY_LUA)
+-	cp -f $(DEPRECATED_LUA) $(DESTDIR)$(SHAREDIR) && \
+-		chmod 0644 $(DESTDIR)$(SHAREDIR)/$(DEPRECATED_LUA)
+-	if test ! -d $(DESTDIR)$(MANDIR)/man1; then \
+-		mkdir -p $(DESTDIR)$(MANDIR)/man1; fi
+-	cp -f $(MAN_BIN) $(DESTDIR)$(MANDIR)/man1 && \
+-		chmod 0644 $(DESTDIR)$(MANDIR)/man1/$(MAN_BIN)
+-	if test ! -d $(DESTDIR)$(MANDIR)/man5; then \
+-		mkdir -p $(DESTDIR)$(MANDIR)/man5; fi
+-	cp -f $(MAN_CONFIG) $(DESTDIR)$(MANDIR)/man5 && \
+-		chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN_CONFIG)
 +	$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
 +	$(BSD_INSTALL_PROGRAM) $(BIN) $(BINDIR)/$(BIN)
 +	$(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
@@ -82,4 +87,4 @@ $NetBSD: patch-aa,v 1.9 2007/08/15 21:22:55 seb Exp $
 +	$(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
  
  deinstall:
- 	rm -f $(BINDIR)/$(BIN) \
+ 	rm -f $(DESTDIR)$(BINDIR)/$(BIN) \