5 files changed, 26 insertions, 28 deletions

diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 8bb45f02e231..ef76a107efcd 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	avenger
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
@@ -17,20 +16,15 @@ COMMENT=	An anti-spam SMTP server
 LIB_DEPENDS=	db-4.3:${PORTSDIR}/databases/db43
 
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
 MAN1=		aliascheck.1 avenger.1 dbutil.1 deliver.1 dotlock.1 \
-		edinplace.1 macutil.1 mailexec.1 match.1 smtpdcheck.1 synos.1
+		edinplace.1 escape.1 macutil.1 mailexec.1 match.1 \
+		smtpdcheck.1 synos.1
 MAN5=		asmtpd.conf.5
 MAN8=		asmtpd.8 avenger.local.8
 
-AVETC=		${PREFIX}/etc/avenger
 CONFIGURE_ENV=	WFLAGS='-Wall'
-CONFIGURE_ARGS=	--with-db=${LOCALBASE} --with-etcdir=${AVETC}
-
-post-patch:
-	@${FIND} ${WRKSRC}/doc -name "*.[158]" | ${XARGS} \
-		${REINPLACE_CMD} -e 's|/etc/avenger|${PREFIX}/etc/avenger|g'
+CONFIGURE_ARGS=	--with-db=${LOCALBASE}
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index 4210cb3a26e4..57f057e77110 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,2 +1,2 @@
-MD5 (avenger-0.6.5.tar.gz) = cb546fd4872496441c329ff479c488c9
-SIZE (avenger-0.6.5.tar.gz) = 759989
+MD5 (avenger-0.7.tar.gz) = b6ec78edde4b8befc8f2129701c7484f
+SIZE (avenger-0.7.tar.gz) = 789780
diff --git a/mail/avenger/pkg-deinstall b/mail/avenger/pkg-deinstall
index 74fdb43ba02a..9b1bcdb4f6fc 100644
--- a/mail/avenger/pkg-deinstall
+++ b/mail/avenger/pkg-deinstall
@@ -11,11 +11,12 @@ fi
 USER=avenger
 GROUP=avenger
 AVDIR=/var/spool/avenger
-AVETC=${PKG_PREFIX}/etc/avenger
+AVETC=/etc/avenger
 
 PW=/usr/sbin/pw
 
 if ${PW} groupshow "${GROUP}" >/dev/null 2>&1; then
+	echo
 	echo "If you're done with Mail Avenger permanently, delete the $GROUP group manually: pw groupdel ${GROUP}" | fmt
 fi
 
@@ -29,4 +30,5 @@ for dir in "$AVETC" "$AVDIR"; do
 	echo
 	echo "You may wish to investigate the contents of $dir and delete the directory if you're done with Mail Avenger permanently." | fmt
     fi
+    echo
 done
diff --git a/mail/avenger/pkg-install b/mail/avenger/pkg-install
index 5d77d7ed8312..7969f695eab8 100644
--- a/mail/avenger/pkg-install
+++ b/mail/avenger/pkg-install
@@ -7,7 +7,6 @@ fi
 USER=avenger
 GROUP=avenger
 AVDIR=/var/spool/avenger
-AVETC=${PKG_PREFIX}/etc/avenger
 
 PW=/usr/sbin/pw
 
@@ -31,7 +30,8 @@ if [ "$2" = "PRE-INSTALL" ]; then
 
 	if ! ${PW} usershow $USER >/dev/null 2>&1; then
 		echo -n "doesn't exist, adding... "
-		if ${PW} useradd $USER -c 'Mail Avenger' -d "$AVDIR" -g $GROUP -s /sbin/nologin -h -; then
+		if ${PW} useradd $USER -c 'Mail Avenger' \
+		    -d "$AVDIR" -g $GROUP -s /sbin/nologin -h -; then
 			echo "success."
 		else
 			echo "FAILED!"
@@ -41,19 +41,11 @@ if [ "$2" = "PRE-INSTALL" ]; then
 		echo "exists."
 	fi
 elif [ "$2" = "POST-INSTALL" ]; then
-	echo -n "Checking for config directory ($AVETC)... "
-
-	if [ -d "$AVETC" ]; then
-		echo "already exists."
-	else
-		echo -n "creating... "
-		if mkdir $AVETC; then
-			echo "success."
-		else
-			echo "FAILED!"
-			exit 1
-		fi
-	fi
+	echo "Before using Mail Avenger, you will need to configure it."
+	echo "Instructions are available in:"
+	echo ""
+	echo "    ${PKG_PREFIX}/share/avenger/INSTALL"
+	echo ""
 fi
 
 exit 0
diff --git a/mail/avenger/pkg-plist b/mail/avenger/pkg-plist
index f57a14cd236d..eff75e43c65f 100644
--- a/mail/avenger/pkg-plist
+++ b/mail/avenger/pkg-plist
@@ -3,12 +3,22 @@ bin/dbutil
 bin/deliver
 bin/dotlock
 bin/edinplace
+bin/escape
 bin/macutil
 bin/mailexec
 bin/match
+bin/sendmac
 bin/smtpdcheck
 bin/synos
 libexec/avenger
 libexec/avenger.local
 sbin/asmtpd
+%%DATADIR%%/INSTALL
+%%DATADIR%%/INSTALL.html
+%%DATADIR%%/asmtpd.conf
+%%DATADIR%%/avsendmail.m4
+%%DATADIR%%/smtp-filter.iptables
+%%DATADIR%%/smtp-filter.pf
+%%DATADIR%%/unknown
 share/pf.os
+@dirrm %%DATADIR%%