3 files changed, 32 insertions, 17 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 24cf7c4affa5..afa7bcdcda70 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	mail
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mailman
@@ -14,20 +14,21 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	demon@FreeBSD.org
 
-BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13  \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-mail-gid=daemon --with-cgi-gid=nogroup
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${MAILMANDIR} \
+		--with-mail-gid=daemon --with-cgi-gid=nogroup
+USE_PYTHON=	yes
 
 USERNAME?=	mailman
 USERID?=	89
 
-MAILMANDIR?=	${PREFIX}/mailman
+MMDIR?=		mailman
+MAILMANDIR=	${PREFIX}/${MMDIR}
 
 pre-configure:
-	# Add the username, uid, group amd gid
+	# Add the username, uid, group and gid
 	${SH} ${FILESDIR}/configure.sh ${USERNAME} ${USERID} ${MAILMANDIR}
 
 	# Create the dir and the correct permissions for it.
@@ -37,18 +38,19 @@ pre-configure:
 
 post-install:
 	@${CHOWN} -R :${USERNAME} ${MAILMANDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/mailman
+.for f in BUGS FAQ INSTALL NEWS README* UPGRADING
+	@${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/mailman
+.endfor
+.endif
 	@echo All related binaries have been installed in ${MAILMANDIR}/bin
-	@echo See ${WRKDIR}/INSTALL for installation instructions \(prefix == ${MAILMANDIR}\).
-	@echo Sample entry for httpd.conf for Apache:
-	@echo "  ScriptAlias /mailman/ ${MAILMANDIR}/cgi-bin/"
+	@echo See ${PREFIX}/share/doc/mailman/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/>'
 	@echo '     Options FollowSymLinks ExecCGI'
 	@echo '	   ... other options ...'
 	@echo '  </Directory>'
 
 .include <bsd.port.mk>
-
-# Override the prefix (it is being abused in mailman)
-# XXX It might be a good idea to have a look again at where
-# the various files are put
-CONFIGURE_ARGS+=	--prefix=${MAILMANDIR}
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 9ba590a7cf63..6c51498a89f8 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.0.tgz) = 562da6fc3b93aab7e6d627451449441b
+MD5 (mailman-2.0.1.tgz) = 8367bcbad1ae4b63e287b0bd4c6e241b
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 88deddb7427f..8b300ddb3ef6 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -258,6 +258,18 @@ mailman/templates/subscribe.html
 mailman/templates/subscribeack.txt
 mailman/templates/userpass.txt
 mailman/templates/verify.txt
+share/doc/mailman/BUGS
+share/doc/mailman/FAQ
+share/doc/mailman/INSTALL
+share/doc/mailman/NEWS
+share/doc/mailman/README
+share/doc/mailman/README.BSD
+share/doc/mailman/README.EXIM
+share/doc/mailman/README.LINUX
+share/doc/mailman/README.NETSCAPE
+share/doc/mailman/README.QMAIL
+share/doc/mailman/README.SENDMAIL
+share/doc/mailman/UPGRADING
 @dirrm mailman/Mailman/Archiver
 @dirrm mailman/Mailman/Bouncers
 @dirrm mailman/Mailman/Cgi
@@ -283,3 +295,4 @@ mailman/templates/verify.txt
 @dirrm mailman/spam
 @dirrm mailman/templates
 @dirrm mailman
+@dirrm share/doc/mailman