Update to 0.9.2

PR:		55356
Submitted by:	maintainer

6 files changed, 29 insertions, 36 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 4bd8290b142..857d1db0c52 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imapfilter
-PORTVERSION=	0.8.9
+PORTVERSION=	0.9.2
 CATEGORIES=	mail
 MASTER_SITES=	http://imapfilter.hellug.gr/source/
 
@@ -21,7 +21,7 @@ MAN1=		imapfilter.1
 MAN5=		imapfilterrc.5
 
 post-install:
-	${STRIP_CMD} $(PREFIX)/bin/imapfilter
+	${STRIP_CMD} ${PREFIX}/bin/imapfilter
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@@ -30,6 +30,5 @@ post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.imapfilterrc ${EXAMPLESDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index 744e3536aa1..c214104b529 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1 +1 @@
-MD5 (imapfilter-0.8.9.tar.bz2) = ab7104e7184725e1df18393d2a4980ea
+MD5 (imapfilter-0.9.2.tar.bz2) = 43f37dd6329f43d352d59bbbacbf1388
diff --git a/mail/imapfilter/files/patch-aa b/mail/imapfilter/files/patch-aa
index 3e78fbdffde..d42a30be7b1 100644
--- a/mail/imapfilter/files/patch-aa
+++ b/mail/imapfilter/files/patch-aa
@@ -1,31 +1,24 @@
---- Makefile.orig	Sat Oct  5 12:28:37 2002
-+++ Makefile	Sat Oct  5 12:30:57 2002
-@@ -1,9 +1,9 @@
+--- Makefile.orig	Wed Aug  6 22:00:14 2003
++++ Makefile	Wed Aug  6 22:03:56 2003
+@@ -1,10 +1,9 @@
 -CC = cc
 -CFLAGS = -O
-+DESTDIR = $(PREFIX)
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/man
- 
+-LDFLAGS =
+-
 -DESTDIR = /usr/local
 -BINDIR = /usr/local/bin
 -MANDIR = /usr/local/man
++DESTDIR = $(PREFIX)
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/man
++
 +INST_BIN = $(BSD_INSTALL_PROGRAM)
 +INST_DOC = $(BSD_INSTALL_MAN)
  
  MAN_BIN = imapfilter.1
  MAN_RC = imapfilterrc.5
-@@ -14,6 +14,8 @@
- 
- LIBS =  -lssl -lcrypto
- 
-+all: imapfilter
-+
- imapfilter: $(OBJ)
- 	$(CC) $(LIBS) $(CFLAGS) -o $(BIN) $(OBJ)
- 
-@@ -22,12 +24,9 @@
- data.o imapfilter.o imap.o file.o passwd.o request.o socket.o: data.h
+@@ -32,12 +31,9 @@
+ imapfilter.o: version.h
  
  install: imapfilter
 -	if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
@@ -38,5 +31,5 @@
 +	$(INST_DOC) $(MAN_BIN) $(MANDIR)/man1
 +	$(INST_DOC) $(MAN_RC) $(MANDIR)/man5
  
- uninstall:
+ deinstall:
  	rm -f $(BINDIR)/$(BIN) $(MANDIR)/man1/$(MAN_BIN) $(MANDIR)/man5/$(MAN_RC)
diff --git a/mail/imapfilter/pkg-descr b/mail/imapfilter/pkg-descr
index 370e4a94894..e5d5c738c19 100644
--- a/mail/imapfilter/pkg-descr
+++ b/mail/imapfilter/pkg-descr
@@ -3,10 +3,14 @@ rules, processes mail residing in IMAP mailboxes without downloading them.
 Available searching criteria, which can be combined using logical operators
 (and/or/not), include the matching of a string in the headers or body of
 messages, the size, date or status of them.  Different actions can be applied
-such as deletion, copying or moving of messages to mailboxes in the same
-or different mail server, and changing of their flags.  Other features also
-include daemon mode and encryption and secure storing in the filesystem of the
-user's passwords, using the integrated interactive password editor.
+such as deletion, copying or moving of messages to mailboxes in the same or
+different mail server, and changing of their flags.
+
+IMAPFilter additionally supports connection encryption through either imaps SSL
+wrapped session or the IMAP STARTTLS extension and user authentication using
+the CRAM-MD5 mechanism.  Other features also include encryption and secure
+storing in the filesystem of the user's passwords, running in daemon mode,
+support for the IMAP NAMESPACE extension.
 
 IMAPfilter is purposed as a preconnect utility before a user fetches his/her
 mail, accesses his/her mailboxes with one of the available mail user agents or
diff --git a/mail/imapfilter/pkg-message b/mail/imapfilter/pkg-message
deleted file mode 100644
index ee5a398c8a4..00000000000
--- a/mail/imapfilter/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-You can install imapfilter suid root, in order to lock memory pages and
-avoid swapping sensitive data.  By default it is not installed suid root,
-so this must be done manually.
diff --git a/mail/imapfilter/pkg-plist b/mail/imapfilter/pkg-plist
index 5d6b4a7aec6..6341ab3d11e 100644
--- a/mail/imapfilter/pkg-plist
+++ b/mail/imapfilter/pkg-plist
@@ -1,7 +1,7 @@
 bin/imapfilter
-%%PORTDOCS%%share/doc/imapfilter/README
-%%PORTDOCS%%share/doc/imapfilter/LICENSE
-%%PORTDOCS%%share/doc/imapfilter/NEWS
-%%PORTDOCS%%share/examples/imapfilter/sample.imapfilterrc
-%%PORTDOCS%%@dirrm share/doc/imapfilter
-%%PORTDOCS%%@dirrm share/examples/imapfilter
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.imapfilterrc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%