5 files changed, 11 insertions, 42 deletions

diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index bff8ae15979b..f82f65ea9748 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	avenger
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dm+bugs+avenger@mailavenger.org
 COMMENT=	An anti-spam SMTP server
 
 LIB_DEPENDS=	db-4.3:${PORTSDIR}/databases/db43
@@ -23,12 +23,13 @@ MAN1=		aliascheck.1 avenger.1 dbutil.1 deliver.1 dotlock.1 \
 MAN5=		asmtpd.conf.5
 MAN8=		asmtpd.8 avenger.local.8
 
-CONFIGURE_ARGS=	--with-db=${LOCALBASE}
+AVETC=		${PREFIX}/etc
+CONFIGURE_ENV=	WFLAGS='-Wall'
+CONFIGURE_ARGS=	--with-db=${LOCALBASE} --with-etcdir=${AVETC}
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -e \
-		's|\(/etc/avenger\)|${PREFIX}\1|g' {} \;
-	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC}/doc -name "*.[158]" | ${XARGS} \
+		${REINPLACE_CMD} -e 's|/etc/avenger|${PREFIX}/etc/avenger|g'
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index e9d70f8c79a5..4210cb3a26e4 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,2 +1,2 @@
-MD5 (avenger-0.6.2.tar.gz) = 40d81f693192d79c1c1a3070f6df54d7
-SIZE (avenger-0.6.2.tar.gz) = 756450
+MD5 (avenger-0.6.5.tar.gz) = cb546fd4872496441c329ff479c488c9
+SIZE (avenger-0.6.5.tar.gz) = 759989
diff --git a/mail/avenger/files/patch-asmtpd_smtpd.C b/mail/avenger/files/patch-asmtpd_smtpd.C
deleted file mode 100644
index 0cbec840c7c7..000000000000
--- a/mail/avenger/files/patch-asmtpd_smtpd.C
+++ /dev/null
@@ -1,19 +0,0 @@
---- asmtpd/smtpd.C.orig	Fri May 20 08:10:46 2005
-+++ asmtpd/smtpd.C	Fri May 20 08:11:15 2005
-@@ -88,14 +88,14 @@
-     p++;
- 
-   for (;;) {
--    const char *q = p + min (e - p, 75);
-+    const char *q = p + min ((long) (e - p), (long) 75);
-     if (q != e)
-       while (q > p && !isspace (q[-1]))
- 	q--;
-     while (q > p && isspace (q[-1]))
-       q--;
-     if (q == p) {
--      q = p + min (e - p, 75);
-+      q = p + min ((long) (e - p), (long) 75);
-       while (q < e && !isspace (*q))
- 	q++;
-     }
diff --git a/mail/avenger/files/patch-libasync_stktrace.c b/mail/avenger/files/patch-libasync_stktrace.c
deleted file mode 100644
index 87a3f69787b2..000000000000
--- a/mail/avenger/files/patch-libasync_stktrace.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libasync/stktrace.c.orig	Sun Apr 10 03:54:35 2005
-+++ libasync/stktrace.c	Fri May 20 06:52:45 2005
-@@ -144,7 +144,7 @@
- #else /* !gcc 2 || !i386 */
- 
- const char *
--__backtrace (const char *file)
-+__backtrace (const char *file, int lim)
- {
-   return file;
- }
diff --git a/mail/avenger/pkg-install b/mail/avenger/pkg-install
index 03780480e38b..5d77d7ed8312 100644
--- a/mail/avenger/pkg-install
+++ b/mail/avenger/pkg-install
@@ -6,8 +6,6 @@ fi
 
 USER=avenger
 GROUP=avenger
-UID=172
-GID=172
 AVDIR=/var/spool/avenger
 AVETC=${PKG_PREFIX}/etc/avenger
 
@@ -19,7 +17,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
 
 	if ! ${PW} groupshow $GROUP >/dev/null 2>&1; then
 		echo -n "doesn't exist, adding... "
-		if ${PW} groupadd $GROUP -g ${GID}; then
+		if ${PW} groupadd $GROUP; then
 			echo "success."
 		else
 			echo "FAILED!"
@@ -33,7 +31,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
 
 	if ! ${PW} usershow $USER >/dev/null 2>&1; then
 		echo -n "doesn't exist, adding... "
-		if ${PW} useradd $USER -u ${UID} -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!"