1 files changed, 34 insertions, 14 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index eb618a300636..a19cde077ae8 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,29 +6,40 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.8
 CATEGORIES=	mail
-MASTER_SITES=   ${MASTER_SITE_GNU} \
+MASTER_SITES=	http://www.list.org/ \
+		${MASTER_SITE_GNU} \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mailman
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wjv@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${MAILMANDIR} \
+CONFIGURE_ARGS=	--prefix=${MAILMANDIR} \
+		--with-python=${PYTHON_CMD} \
 		--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID}
 USE_PYTHON=	yes
 
 USERNAME?=	mailman
 USERID?=	89
 
-CGI_GID?=	nogroup
-MAIL_GID?=	daemon
+# The default value of '1' for MAIL_GID works with sendmail.  If you're
+# using installed from ports, you should set MAIL_GID at build time
+# according to the following table:
+#
+# MTA		| MAIL_GID
+# Exim		| 6
+# Postfix	| ???
 
+MAIL_GID?=	1
+CGI_GID?=	80
 MMDIR?=		mailman
 MAILMANDIR=	${PREFIX}/${MMDIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 pre-configure:
 	# Add the username, uid, group and gid
@@ -39,6 +50,20 @@ pre-configure:
 	${CHOWN} ${USERNAME}:${USERNAME} ${MAILMANDIR}
 	${CHMOD} 2775 ${MAILMANDIR}
 
+post-configure:
+	@ ${SED} -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
+	  -e 's#%%DOCSDIR%%#${DOCSDIR}#g' pkg-message > \
+	  ${PKGMESSAGE}
+
+pre-build:
+.if !defined(BATCH)
+	@ ${ECHO_MSG} "-------------------------------------------------------"
+	@ ${ECHO_MSG} "  If you're using an alternative MTA (not Sendmail),"
+	@ ${ECHO_MSG} "  you may have to set MAIL_GID to the gid under which"
+	@ ${ECHO_MSG} "  your MTA is executing."
+	@ ${ECHO_MSG} "-------------------------------------------------------"
+.endif
+
 post-install:
 	@${CHOWN} -R :${USERNAME} ${MAILMANDIR}
 .if !defined(NOPORTDOCS)
@@ -47,13 +72,8 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 .endfor
 .endif
-	@echo All related binaries have been installed in ${MAILMANDIR}/bin
-	@echo See ${DOCSDIR}/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>'
+.if !defined(BATCH)
+	@ ${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>