From b7b1a20e30be12a44ded0d4c5347e81fe7266301 Mon Sep 17 00:00:00 2001
From: pea <pea@openbsd.org>
Date: Tue, 29 Mar 2011 12:03:53 +0000
Subject: [PATCH] Update to 0.8.1 Remove maintainer per his request ok
 ajacoutot@

---
 mail/avenger/Makefile                |  7 ++----
 mail/avenger/distinfo                | 10 ++++-----
 mail/avenger/patches/patch-configure | 30 --------------------------
 mail/avenger/pkg/PLIST               | 32 +++++++++++++---------------
 4 files changed, 22 insertions(+), 57 deletions(-)
 delete mode 100644 mail/avenger/patches/patch-configure

diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 98f7fb128be..f10ac3ecf4c 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2011/01/14 22:17:03 landry Exp $
+# $OpenBSD: Makefile,v 1.15 2011/03/29 12:03:53 pea Exp $
 
 COMMENT=		anti-spam SMTP server
-DISTNAME=		avenger-0.7.4
-REVISION =		3
+DISTNAME=		avenger-0.8.1
 CATEGORIES=		mail
 
 HOMEPAGE=		http://www.mailavenger.org/
 
-MAINTAINER=		David Mazieres (http://www.scs.stanford.edu/~dm/addr/)
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index b760cdbe227..1732d2b7553 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,5 +1,5 @@
-MD5 (avenger-0.7.4.tar.gz) = XZvsYKhJwoGVeYqYdtaTGg==
-RMD160 (avenger-0.7.4.tar.gz) = f2oImfBHXOtEuBIMtiKqaApGae0=
-SHA1 (avenger-0.7.4.tar.gz) = AQT9jXTqwNWMKCjHNtfSXqkdNZQ=
-SHA256 (avenger-0.7.4.tar.gz) = lkdP0i/yNRc2ahJGHAHV17p6uOl/wonKr3TSLzjI9nY=
-SIZE (avenger-0.7.4.tar.gz) = 821675
+MD5 (avenger-0.8.1.tar.gz) = E6aPpbu8+47+LDAyW2hySw==
+RMD160 (avenger-0.8.1.tar.gz) = o/rx7TFUbZEQfZqeExVVXYlZqWY=
+SHA1 (avenger-0.8.1.tar.gz) = DuO0f7tERkTlBP6KYBCjdXr9m1U=
+SHA256 (avenger-0.8.1.tar.gz) = WAwGEhvAzGhDH17wKxELu6Racz1ESwNKd1yXBZfoSho=
+SIZE (avenger-0.8.1.tar.gz) = 830234
diff --git a/mail/avenger/patches/patch-configure b/mail/avenger/patches/patch-configure
deleted file mode 100644
index aab620f0214..00000000000
--- a/mail/avenger/patches/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2007/09/23 09:31:27 steven Exp $
---- configure.orig	Tue Feb 14 10:12:59 2006
-+++ configure	Sun Sep 23 13:21:58 2007
-@@ -27055,7 +27055,7 @@ unset DB_LIB
- 
- rm -f db.h
- 
--for vers in 4.4 4.3 4.2 4.1; do
-+for vers in 4.6 4.5 4.4 4.3 4.2 4.1; do
-     DB_DIR=`cd $srcdir && echo db-$vers.*/dist/`
-     if test -d "$srcdir/$DB_DIR"; then
-         DB_DIR=`echo $DB_DIR | sed -e 's!/$!!'`
-@@ -27076,7 +27076,7 @@ if test "$DB_DIR" -a "$with_db" = yes; then
- echo "${ECHO_T}using distribution in $DB_DIR subdirectory" >&6
- elif test x"$with_db" != xno; then
-     if test "$with_db" = yes; then
--	for vers in 4.4 4.3 4.2 4.1; do
-+	for vers in 4.6 4.5 4.4 4.3 4.2 4.1; do
- 	    for dir in "$prefix/BerkeleyDB.$vers" \
- 			"/usr/BerkeleyDB.$vers" \
- 			"/usr/local/BerkeleyDB.$vers" \
-@@ -27165,7 +27165,7 @@ fi
- 	    done
- 	done
-     else
--	for vers in 4.4 4.3 4.2 4.1; do
-+	for vers in 4.6 4.5 4.4 4.3 4.2 4.1; do
- 	    vers=$vers
- dir=$with_db
- majvers=`echo $vers | sed -e 's/\..*//'`
diff --git a/mail/avenger/pkg/PLIST b/mail/avenger/pkg/PLIST
index 7a4f68c5dc1..3dab44a2946 100644
--- a/mail/avenger/pkg/PLIST
+++ b/mail/avenger/pkg/PLIST
@@ -1,23 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/01/14 22:17:03 landry Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/03/29 12:03:53 pea Exp $
 @conflict macutil-*
 @conflict archiveopteryx-*
-@comment XXX avenger needs to read aliases.db which might end up mode 640
 @newuser _avenger:554:wheel:daemon:Mail Avenger:/var/avenger:/sbin/nologin
-bin/aliascheck
-bin/dbutil
-bin/deliver
-bin/dotlock
-bin/edinplace
-bin/escape
-bin/macutil
-bin/mailexec
-bin/match
-bin/omacutil
-bin/sendmac
-bin/smtpdcheck
-bin/synos
+@bin bin/aliascheck
+@bin bin/dbutil
+@bin bin/deliver
+@bin bin/dotlock
+@bin bin/edinplace
+@bin bin/escape
+@bin bin/macutil
+@bin bin/mailexec
+@bin bin/match
+@bin bin/sendmac
+@bin bin/smtpdcheck
+@bin bin/synos
 libexec/avenger
-libexec/avenger.local
+@bin libexec/avenger.local
 @man man/man1/aliascheck.1
 @man man/man1/avenger.1
 @man man/man1/dbutil.1
@@ -33,7 +31,7 @@ libexec/avenger.local
 @man man/man5/asmtpd.conf.5
 @man man/man8/asmtpd.8
 @man man/man8/avenger.local.8
-sbin/asmtpd
+@bin sbin/asmtpd
 share/avenger/
 share/avenger/INSTALL
 share/avenger/INSTALL.html