4 files changed, 28 insertions, 10 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 7f1e88837381..659262165ba0 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0b5
-PORTREVISION=	2
+PORTVERSION=	2.0b6
 CATEGORIES=	mail
 MASTER_SITES=   http://download.sourceforge.net/mailman/
-DISTNAME=       mailman-2.0beta5
+DISTNAME=       mailman-2.0beta6
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS+=	$(LOCALBASE)/sbin/httpd:${PORTSDIR}/www/apache13\
+RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13  \
 		python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-mail-gid=daemon --with-cgi-gid=nogroup
 
-UNAME=		mailman
-UID=		89
+UNAME?=		mailman
+UID?=		89
 
-MAILMANDIR=	${PREFIX}/mailman
+MAILMANDIR?=	${PREFIX}/mailman
 
 pre-configure:
 	# Add the username, uid, group amd gid
@@ -39,7 +38,7 @@ pre-configure:
 post-install:
 	@${CHOWN} -R :${UNAME} ${MAILMANDIR}
 	@echo All related binaries have been installed in ${MAILMANDIR}/bin
-	@echo See ${WRKDIR}/INSTALL for installation instructions \($$prefix == ${MAILMANDIR}\).
+	@echo See ${WRKDIR}/INSTALL for installation instructions \(prefix == ${MAILMANDIR}\).
 	@echo Sample entry for httpd.conf for Apache:
 	@echo "  ScriptAlias /mailman/ ${MAILMANDIR}/cgi-bin/"
 	@echo '  <Directory ${MAILMANDIR}/cgi-bin/>'
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index e0e27037fbcb..2744acbd5ae8 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.0beta5.tgz) = 2c2602b7745a56adecd4f24fdd6d446f
+MD5 (mailman-2.0beta6.tgz) = d5eee07318664f430f998306196d7a26
diff --git a/mail/mailman/pkg-descr b/mail/mailman/pkg-descr
index 01c67bd88f87..b2b6e98e8bef 100644
--- a/mail/mailman/pkg-descr
+++ b/mail/mailman/pkg-descr
@@ -13,4 +13,5 @@ Python is a free object-oriented scripting language. A few files are written in
 C for security purposes. 
 
 The manual is still only a set of READMEs provided in the Mailman distribution.
-For now, more information can be found at www.list.org.
+
+WWW: http://www.list.org/
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index d1e9b85736f9..4b8aec7192d1 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -18,16 +18,26 @@ mailman/Mailman/Bouncers/Caiwireless.py
 mailman/Mailman/Bouncers/Caiwireless.pyc
 mailman/Mailman/Bouncers/Catchall.py
 mailman/Mailman/Bouncers/Catchall.pyc
+mailman/Mailman/Bouncers/Compuserve.py
+mailman/Mailman/Bouncers/Compuserve.pyc
 mailman/Mailman/Bouncers/DSN.py
 mailman/Mailman/Bouncers/DSN.pyc
 mailman/Mailman/Bouncers/Exim.py
 mailman/Mailman/Bouncers/Exim.pyc
+mailman/Mailman/Bouncers/GroupWise.py
+mailman/Mailman/Bouncers/GroupWise.pyc
+mailman/Mailman/Bouncers/Microsoft.py
+mailman/Mailman/Bouncers/Microsoft.pyc
 mailman/Mailman/Bouncers/Netscape.py
 mailman/Mailman/Bouncers/Netscape.pyc
 mailman/Mailman/Bouncers/Postfix.py
 mailman/Mailman/Bouncers/Postfix.pyc
 mailman/Mailman/Bouncers/Qmail.py
 mailman/Mailman/Bouncers/Qmail.pyc
+mailman/Mailman/Bouncers/SMTP32.py
+mailman/Mailman/Bouncers/SMTP32.pyc
+mailman/Mailman/Bouncers/SimpleMatch.py
+mailman/Mailman/Bouncers/SimpleMatch.pyc
 mailman/Mailman/Bouncers/Smail.py
 mailman/Mailman/Bouncers/Smail.pyc
 mailman/Mailman/Bouncers/Yahoo.py
@@ -66,6 +76,8 @@ mailman/Mailman/Deliverer.py
 mailman/Mailman/Deliverer.pyc
 mailman/Mailman/Digester.py
 mailman/Mailman/Digester.pyc
+mailman/Mailman/EncWord.py
+mailman/Mailman/EncWord.pyc
 mailman/Mailman/Errors.py
 mailman/Mailman/Errors.pyc
 mailman/Mailman/GatewayManager.py
@@ -208,6 +220,10 @@ mailman/cron/senddigests
 mailman/data/last_mailman_version
 mailman/data/pending_subscriptions.db
 mailman/filters/bowa-strip
+mailman/icons/PythonPowered.png
+mailman/icons/gnu-head-tiny.jpg
+mailman/icons/mailman-large.jpg
+mailman/icons/mailman.jpg
 mailman/mail/wrapper
 mailman/scripts/answer_majordomo_mail
 mailman/scripts/driver
@@ -225,6 +241,7 @@ mailman/templates/checkdbs.txt
 mailman/templates/convert.txt
 mailman/templates/cronpass.txt
 mailman/templates/handle_opts.html
+mailman/templates/headfoot.html
 mailman/templates/help.txt
 mailman/templates/listinfo.html
 mailman/templates/masthead.txt
@@ -257,6 +274,7 @@ mailman/templates/verify.txt
 @dirrm mailman/cron
 @dirrm mailman/data
 @dirrm mailman/filters
+@dirrm mailman/icons
 @dirrm mailman/lists
 @dirrm mailman/locks
 @dirrm mailman/logs