- Add OPTIONS to choose MTA integration.

- Remove "make options", it's not necessary.
- Fix/update FreeBSD-post-install-notes doc.
- Fix both pkg-install and pkg-deinstall to add/delete mailman user in /var/cron/allow
- Use pkg-message as SUB_FILES.

Approved by:	mnag (mentor)

1 files changed, 69 insertions, 72 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 3f0c8730d7d6..b715d5919c71 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -14,27 +14,15 @@ MASTER_SITE_SUBDIR=	mailman
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	mailman
 
-.if defined(WITH_HTDIG)
-# see http://www.openinfo.co.uk/mailman/index.html
-# Order of application of these patches is critical.
-PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
-		http://www.openinfo.co.uk/mm/patches/444884/:patch2
-PATCHFILES+=	indexing-2.1.6-0.1.patch.gz:patch1 \
-		htdig-2.1.6-0.1.patch.gz:patch2
-PATCH_DIST_STRIP=	-p1
-PKGNAMESUFFIX+=	-with-htdig
-.endif
-
 MAINTAINER?=	jmelo@FreeBSD.org
 COMMENT?=	A mailing list manager (MLM) with a user-friendly web front-end
 
-RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
-.if defined(WITH_CHINESE)
-RUN_DEPENDS+=	${PYTHONPREFIX_SITELIBDIR}/cjkcodecs.pth:${PORTSDIR}/converters/py-cjkcodecs
-.endif
-.if defined(WITH_HTDIG)
-RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
-.endif
+OPTIONS=	SENDMAIL "for use with sendmail" off \
+		EXIM3 "for use with exim3" off \
+		EXIM4 "for use with exim4" off \
+		POSTFIX "for use with postfix" off \
+		CHINESE "support for Chinese mailing lists" off \
+		HTDIG "htdig integration patches" off
 
 HAS_CONFIGURE=	yes
 USE_PYTHON=	yes
@@ -42,39 +30,26 @@ CONFIGURE_ARGS=	--prefix=${MAILMANDIR} --with-python=${PYTHON_CMD} \
 		--with-username=${MM_USERNAME} \
 		--with-groupname=${MM_GROUPNAME} \
 		--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID}
-
-.if defined(WITH_HTDIG)
-PLIST_SUB+=	SUB_HTDIG=""
-.else
-PLIST_SUB+=	SUB_HTDIG="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
+SUB_LIST+=	MAILMANDIR=${MAILMANDIR}
+USE_RC_SUBR=	mailman
 
 # The Mailman port supports a number of variables that may be tweaked at
 # build time.  Getting the values of some of them right is crucial!
-# Perform a "make options" to see more information on these variables.
 #
 MM_USERNAME?=	mailman
 MM_USERID?=	91
 MM_GROUPNAME?=	${MM_USERNAME}
 MM_GROUPID?=	${MM_USERID}
 MM_DIR?=	mailman
-.if ${OSVERSION} >= 450000
-MAIL_GID?=	mailnull
-.else
-MAIL_GID?=	daemon
-.endif
 CGI_GID?=	www
 IMGDIR?=	www/icons
 #
 # End of user-configurable variables.
 
 MAILMANDIR=	${PREFIX}/${MM_DIR}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGOPTS=	${FILESDIR}/pkg-opts
 PLIST_SUB+=	MMDIR=${MM_DIR} IMGDIR=${IMGDIR}
 DOCFILES=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 	  	README.CONTRIB README.NETSCAPE \
@@ -85,77 +60,99 @@ DOCFILES=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 
 IMGFILES=	PythonPowered.png mailman.jpg mm-icon.png
 
-options:
-	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
-	@ ${CAT} ${PKGOPTS}
-
-post-extract:
-.if !defined(BATCH)
-	@ ${TEST} -r ${PKGOPTS} && \
-	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
-	   ${ECHO_MSG} '                        = IMPORTANT NOTICE =                             '; \
-	   ${ECHO_MSG} 'Getting the values of certain build time variables right is CRUCIAL if   '; \
-	   ${ECHO_MSG} 'you want your Mailman installation to function!  Pay specific attention  '; \
-	   ${ECHO_MSG} 'to the value of MAIL_GID if you use an alternative MTA (not Sendmail).   '; \
-	   ${ECHO_MSG} '                                                                         '; \
-	   ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \
-	   ${ECHO_MSG} '-------------------------------------------------------------------------')
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SENDMAIL)
+.if defined(WITH_EXIM3) || defined(WITH_EXIM4) || defined(WITH_POSTFIX)
+BROKEN=	choose only one MTA integration
+.endif
+MAIL_GID+=	mailnull
+.endif
+
+.if defined(WITH_EXIM3)
+.if defined(WITH_SENDMAIL) || defined(WITH_EXIM4) || defined(WITH_POSTFIX)
+BROKEN=	choose only one MTA integration
+.endif
+MAIL_GID+=	nobody
+.endif
+
+.if defined(WITH_EXIM4)
+.if defined(WITH_SENDMAIL) || defined(WITH_EXIM3) || defined(WITH_POSTFIX)
+BROKEN=	choose only one MTA integration
+.endif
+MAIL_GID+=	mail
+.endif
+
+.if defined(WITH_POSTFIX)
+.if defined(WITH_SENDMAIL) || defined(WITH_EXIM3) || defined(WITH_EXIM4)
+BROKEN=	choose only one MTA integration
+.endif
+MAIL_GID+=	mailman
+.endif
+
+.if defined(WITH_CHINESE)
+RUN_DEPENDS+=	${PYTHONPREFIX_SITELIBDIR}/cjkcodecs.pth:${PORTSDIR}/converters/py-cjkcodecs
+.endif
+
+.if defined(WITH_HTDIG)
+PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
+		http://www.openinfo.co.uk/mm/patches/444884/:patch2
+PATCHFILES+=	indexing-2.1.6-0.1.patch.gz:patch1 \
+		htdig-2.1.6-0.1.patch.gz:patch2
+PATCH_DIST_STRIP=	-p1
+PKGNAMESUFFIX+=	-with-htdig
+RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
+PLIST_SUB+=	SUB_HTDIG=""
+.else
+PLIST_SUB+=	SUB_HTDIG="@comment "
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
+	@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
 	  ${WRKSRC}/Mailman/Defaults.py.in
 
 pre-configure::
 # Mailman's configure script needs the "mailman" user/group to exist, so
 # $PKGINSTALL has to be patched before the do-configure target executes.
-	@ ${SED} \
+	@${SED} \
 	  -e 's#%%USER%%#${MM_USERNAME}#g' -e 's#%%UID%%#${MM_USERID}#g' \
 	  -e 's#%%GROUP%%#${MM_GROUPNAME}#g' -e 's#%%GID%%#${MM_GROUPID}#g' \
 	  -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' ${MASTERDIR}/pkg-install > \
 	  ${PKGINSTALL}
-	@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-configure:
-	@ ${SED} \
+	@${SED} \
 	  -e 's#%%USER%%#${MM_USERNAME}#g' -e 's#%%GROUP%%#${MM_GROUPNAME}#g' \
 	  -e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
 	  ${MASTERDIR}/pkg-deinstall > ${PKGDEINSTALL}
-	@ ${SED} -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
-	  -e 's#%%DOCSDIR%%#${DOCSDIR}#g' -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
-	  ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 # port system auditors complain if dir is created prior to install
 # but configure demands it be there.  we delete it now if empty,
 # so it will be re-created.  For existing installs, this is ignored
 	@- ${RMDIR} ${MAILMANDIR} 2> /dev/null
 
 pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-	@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .for dir in cron scripts
-	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir}
 .endfor
-	@ ${CHGRP} -R ${MM_GROUPNAME} ${MAILMANDIR}
-	@ ${MKDIR} ${PREFIX}/${IMGDIR}
+	@${CHGRP} -R ${MM_GROUPNAME} ${MAILMANDIR}
+	@${MKDIR} ${PREFIX}/${IMGDIR}
 .for imgfile in ${IMGFILES}
-	@ ${CP} ${MAILMANDIR}/icons/${imgfile} ${PREFIX}/${IMGDIR}
+	@${CP} ${MAILMANDIR}/icons/${imgfile} ${PREFIX}/${IMGDIR}
 .endfor
-	@ uudecode -p ${FILESDIR}/powerlogo.gif.uue > \
+	@uudecode -p ${FILESDIR}/powerlogo.gif.uue > \
 	  ${PREFIX}/${IMGDIR}/powerlogo.gif
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-	@ ${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${DOCSDIR}
 .for docfile in ${DOCFILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
-	@ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/misc/mailman \
-	  ${PREFIX}/etc/rc.d/mailman.sh
-.if !defined(BATCH)
-	@ ${CAT} ${PKGMESSAGE}
-.endif
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>