aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/mailman/Makefile26
-rw-r--r--mail/mailman/pkg-deinstall3
-rw-r--r--mail/mailman/pkg-message19
-rw-r--r--mail/mailman/pkg-plist7
4 files changed, 38 insertions, 17 deletions
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 84decfecd1cb..c85c9bf429a4 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mailman
PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.list.org/ \
${MASTER_SITE_GNU} \
@@ -25,6 +25,8 @@ CONFIGURE_ARGS= --prefix=${MAILMANDIR} \
--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID}
USE_PYTHON= yes
+.include <bsd.port.pre.mk>
+
# These variables may be tweaked if required. However, it is recommended
# that the USERID and GROUPID not be changed.
#
@@ -34,7 +36,8 @@ GROUPNAME?= ${USERNAME}
GROUPID?= ${USERID}
MMDIR?= mailman
-# The default value of '1' for MAIL_GID works with sendmail. If you're using
+# Getting the value of MAIL_GID right is crucial to getting Mailman to work
+# with your MTA. By default, this port works with sendmail. If you're using
# an alternative MTA installed from ports, you should set MAIL_GID at build
# time according to the following table. (Please contact this port's
# maintainer if you can fill in the blanks, or to report mistakes!)
@@ -44,7 +47,15 @@ MMDIR?= mailman
# Postfix | 65534 | <shamrock@cypherpunks.to>
# Qmail | ??? |
#
+.if ${OSVERSION} >= 450000
+MAIL_GID?= 26
+.else
MAIL_GID?= 1
+.endif
+
+# By default, this port works with the current port of Apache. If your WWW
+# server executes CGI scripts under a different GID, you'll have to set this
+# at build time.
CGI_GID?= 80
MAILMANDIR= ${PREFIX}/${MMDIR}
@@ -71,10 +82,11 @@ post-configure:
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. See the comments in the"
- @ ${ECHO_MSG} " port's Makefile for further information."
+ @ ${ECHO_MSG} " If you're using an alternative MTA (not Sendmail)"
+ @ ${ECHO_MSG} " OR an older version of Sendmail, you may have to"
+ @ ${ECHO_MSG} " set MAIL_GID to the gid under which your MTA is"
+ @ ${ECHO_MSG} " executing. See the comments in the port's"
+ @ ${ECHO_MSG} " Makefile for further information."
@ ${ECHO_MSG} "-------------------------------------------------------"
.endif
@@ -94,4 +106,4 @@ post-install:
@ ${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/mailman/pkg-deinstall b/mail/mailman/pkg-deinstall
index 311e6a8c3048..2a9ce66c683d 100644
--- a/mail/mailman/pkg-deinstall
+++ b/mail/mailman/pkg-deinstall
@@ -40,7 +40,8 @@ DEINSTALL)
POST-DEINSTALL)
if [ -d %%MAILMANDIR%% ]; then
echo "%%MAILMANDIR%% is not empty - this installation may have active lists"
- echo "The \"%%USER%%\" user and \"%%GROUP%%\" group were therefore not deleted."
+ echo "- The \"%%USER%%\" user and \"%%GROUP%%\" group were therefore not deleted."
+ echo "- You may delete them with \"pw userdel %%USER%%\"."
else
delete_account %%USER%% %%GROUP%%
fi
diff --git a/mail/mailman/pkg-message b/mail/mailman/pkg-message
index aa861b4e8a44..44c65dda19f1 100644
--- a/mail/mailman/pkg-message
+++ b/mail/mailman/pkg-message
@@ -1,12 +1,19 @@
----------------------------------------------------------------------------
-All related binaries have been installed in %%MAILMANDIR%%/bin.
+----------------------------------------------------------------------------
+Mailman has been installed, but is not quite ready to be used yet!
+You need to configure both Mailman and your MTA to integrate with each
+other. At the very least, you'll have to create some aliases.
See %%DOCSDIR%%/INSTALL for post-installation instructions,
-with "prefix" being "%%MAILMANDIR%%".
+with "prefix" being "%%MAILMANDIR%%". You may also find README
+files with MTA-specific hints in %%DOCSDIR%%.
-A sample entry for Apache's httpd.conf to enable use of Mailman's web
-interface:
+The entire Mailman installation resides under %%MAILMANDIR%%.
+The command-line scripts necessary to administer Mailman have been
+installed in %%MAILMANDIR%%/bin.
+
+You'll need to add at least the following to Apache's httpd.conf to
+activate Mailman's web interface. (Remember to restart your httpd!)
ScriptAlias /mailman/ "%%MAILMANDIR%%/cgi-bin/"
Alias /pipermail/ "%%MAILMANDIR%%/archives/public/"
----------------------------------------------------------------------------
+----------------------------------------------------------------------------
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index a761a4fda472..afc7d5908d7b 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -1,3 +1,5 @@
+@unexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi
+@unexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc
@exec mkdir -p %D/%%MMDIR%%/archives/private && chmod 2770 %D/%%MMDIR%%/archives/private
@exec mkdir -p %D/%%MMDIR%%/archives/public && chmod 2775 %D/%%MMDIR%%/archives/public
@exec mkdir -p %D/%%MMDIR%%/archives && chmod 2775 %D/%%MMDIR%%/archives
@@ -169,9 +171,8 @@
%%MMDIR%%/Mailman/aliases.pyc
%%MMDIR%%/Mailman/htmlformat.py
%%MMDIR%%/Mailman/htmlformat.pyc
-%%MMDIR%%/Mailman/mm_cfg.py
%%MMDIR%%/Mailman/mm_cfg.py.dist
-%%MMDIR%%/Mailman/mm_cfg.pyc
+@exec [ -f %B/mm_cfg.py ] || cp %B/%f %B/mm_cfg.py
%%MMDIR%%/Mailman/pythonlib/StringIO.py
%%MMDIR%%/Mailman/pythonlib/StringIO.pyc
%%MMDIR%%/Mailman/pythonlib/__init__.py
@@ -312,7 +313,6 @@
@dirrm %%MMDIR%%/Mailman/Cgi
@dirrm %%MMDIR%%/Mailman/Bouncers
@dirrm %%MMDIR%%/Mailman/Archiver
-@dirrm %%MMDIR%%/Mailman
%%PORTDOCS%%@dirrm share/doc/mailman
@unexec rmdir %D/%%MMDIR%%/spam 2>/dev/null || true
@unexec rmdir %D/%%MMDIR%%/qfiles 2>/dev/null || true
@@ -322,4 +322,5 @@
@unexec rmdir %D/%%MMDIR%%/archives/public 2>/dev/null || true
@unexec rmdir %D/%%MMDIR%%/archives/private 2>/dev/null || true
@unexec rmdir %D/%%MMDIR%%/archives 2>/dev/null || true
+@unexec rmdir %D/%%MMDIR%%/Mailman 2>/dev/null || true
@unexec rmdir %D/%%MMDIR%%/ 2>/dev/null || true