ports/85064: Update port: mail/avenger

[David Mazieres]

>Number:         85064
>Category:       ports
>Synopsis:       Update port: mail/avenger
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 17 23:40:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     David Mazieres
>Release:        FreeBSD 4.9-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD amsterdam.lcs.mit.edu 4.9-RELEASE-p11 FreeBSD 4.9-RELEASE-p11 #3: Wed Feb 23 10:03:41 EST 2005 rtm at toil.lcs.mit.edu:/usr/src/sys/compile/PDOS i386


	
>Description:

This is a patch which updates the mail/avenger port to version 0.7.

Note that Mail Avenger no longer installs any files in /etc (which
needed to be moved to /usr/local/etc and required man page patching).
Thus, the port has been slightly simplified.

>How-To-Repeat:
	
>Fix:


diff -ru /usr/ports/mail/avenger/Makefile avenger/Makefile
--- /usr/ports/mail/avenger/Makefile	Mon Aug  1 11:02:53 2005
+++ avenger/Makefile	Wed Aug 17 19:29:48 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	avenger
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.7
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
@@ -17,20 +17,15 @@
 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 -ru /usr/ports/mail/avenger/distinfo avenger/distinfo
--- /usr/ports/mail/avenger/distinfo	Fri Jul  8 10:52:42 2005
+++ avenger/distinfo	Wed Aug 17 18:58:47 2005
@@ -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 -ru /usr/ports/mail/avenger/pkg-deinstall avenger/pkg-deinstall
--- /usr/ports/mail/avenger/pkg-deinstall	Mon May  9 19:19:58 2005
+++ avenger/pkg-deinstall	Wed Aug 17 19:31:53 2005
@@ -11,11 +11,12 @@
 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 @@
 	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 -ru /usr/ports/mail/avenger/pkg-install avenger/pkg-install
--- /usr/ports/mail/avenger/pkg-install	Fri Jul  8 10:52:42 2005
+++ avenger/pkg-install	Wed Aug 17 19:08:05 2005
@@ -7,7 +7,6 @@
 USER=avenger
 GROUP=avenger
 AVDIR=/var/spool/avenger
-AVETC=${PKG_PREFIX}/etc/avenger
 
 PW=/usr/sbin/pw
 
@@ -31,7 +30,8 @@
 
 	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 @@
 		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 -ru /usr/ports/mail/avenger/pkg-plist avenger/pkg-plist
--- /usr/ports/mail/avenger/pkg-plist	Mon May  9 19:19:58 2005
+++ avenger/pkg-plist	Wed Aug 17 19:02:58 2005
@@ -3,12 +3,22 @@
 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
+share/avenger/INSTALL
+share/avenger/INSTALL.html
+share/avenger/asmtpd.conf
+share/avenger/avsendmail.m4
+share/avenger/smtp-filter.iptables
+share/avenger/smtp-filter.pf
+share/avenger/unknown
 share/pf.os
+ at dirrm share/avenger

>Release-Note:
>Audit-Trail:
>Unformatted: