6 files changed, 70 insertions, 79 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index e918de31ba16..60745711268e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU} \
@@ -59,8 +59,7 @@ PLIST_SUB=	MMDIR=${MM_DIR} MMGRP=${MM_GROUPNAME} IMGDIR=${IMGDIR}
 
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
-	@ ${PERL} -ne '/^#/ || /^\s/ && print || \
-	  print sprintf "* %s [%s]\n  %s", split(/\|/)' ${PKGOPTS}
+	@ ${CAT} ${PKGOPTS}
 
 post-extract:
 .if !defined(BATCH)
@@ -71,12 +70,13 @@ post-extract:
 .endif
 
 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} \
 	  -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' pkg-install > \
 	  ${PKGINSTALL}
-# Mailman's configure script needs the "mailman" user/group to exist.
 	@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-configure:
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index a82ddf917095..5da376d46fd3 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.0.12.tgz) = 94999f0954ff91e880a2102717c0474e
+MD5 (mailman-2.0.13.tgz) = 64419dca3669ea255a6758c6cc94ef33
diff --git a/mail/mailman/files/pkg-opts b/mail/mailman/files/pkg-opts
index 6ddc1312ede4..bd465af1c70c 100644
--- a/mail/mailman/files/pkg-opts
+++ b/mail/mailman/files/pkg-opts
@@ -1,29 +1,48 @@
-# Variable|Default value|Short description
-# 	Multi-line/long description (optional).
-# 	Multi-line/long description lines must start with whitespace!
-#
-MM_USERNAME|mailman|The username of the Mailman user
-MM_USERID|92|The user ID of the Mailman user
-	It is recommended that you do not change this option.
-MM_GROUPNAME|mailman|The group to which the Mailman user will belong
-MM_GROUPID|92|The group ID for the Mailman user
-	It is recommended that you do not change this option.
-MM_DIR|mailman|Mailman will be installed in ${PREFIX}/${MM_DIR}
-MAIL_GID|26|The group id under which your MTA performs mail delivery
-	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!)
-	----------------------------------------------
-	MTA     | MAIL_GID | Submitted by
-	Exim    | 65534    | <wjv>
-	Postfix | 65534    | <shamrock@cypherpunks.to>
-	Qmail   | ???      |
-CGI_GID|80|The group id under which your web server executes CGI scripts
-	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.
-IMGDIR|www/icons|Icon images will be installed in ${PREFIX}/${IMGDIR}
-WITH_APACHE2|undefined|Port depends on Apache 2.x if defined, not 1.3.x
+
+* MM_USERNAME [mailman]
+  The username of the Mailman user
+
+* MM_USERID [92]
+  The user ID of the Mailman user
+
+    It is recommended that you do not change this option.
+
+* MM_GROUPNAME [mailman]
+  The group to which the Mailman user will belong
+
+* MM_GROUPID [92]
+  The group ID for the Mailman user
+
+    It is recommended that you do not change this option.
+
+* MM_DIR [mailman]
+  Mailman will be installed in ${PREFIX}/${MM_DIR}
+
+* MAIL_GID [26]
+  The group id under which your MTA performs mail delivery
+
+    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!)
+
+    ----------------------------------------------
+    MTA     | MAIL_GID | Submitted by
+    Exim    | 65534    | <wjv>
+    Postfix | 65534    | <shamrock@cypherpunks.to>
+    Qmail   | ???      |
+
+* CGI_GID [80]
+  The group id under which your web server executes CGI scripts
+
+    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.
+
+* IMGDIR [www/icons]
+  Icon images will be installed in ${PREFIX}/${IMGDIR}
+
+* WITH_APACHE2 [undefined]
+  If defined, port depends on Apache 2.x instead of 1.3.x
+
diff --git a/mail/mailman/pkg-install b/mail/mailman/pkg-install
index 16f6ff16a700..6fb4173e5fb9 100644
--- a/mail/mailman/pkg-install
+++ b/mail/mailman/pkg-install
@@ -59,31 +59,21 @@ create_crontab() {
 
 }
 
+fix_perms() {
+  echo -n "Checking (and fixing) permissions... "
+  %%MAILMANDIR%%/bin/check_perms -f >/dev/null 2>&1
+  echo "done."
+}
+
 case $2 in
 
 PRE-INSTALL)
-  if which -s pw && which -s lockf; then
-    :
-  else
-    cat <<EOF
-
-This system looks like a pre-2.2 version of FreeBSD. I see that it
-is missing the "lockf" and/or "pw" utilities. I need these utilities.
-Please get them and install them, and try again. You can get the
-sources from:
-
- ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.bin/lockf.tar.gz
- ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
-
-EOF
-    exit 1
-  fi
-
   make_account %%USER%% %%UID%% %%GROUP%% %%GID%% \
     "Mailman User" "%%MAILMANDIR%%" "/sbin/nologin"
   ;;
 
 POST-INSTALL)
   create_crontab %%USER%% "%%MAILMANDIR%%/cron/crontab.in"
+  fix_perms
   ;;
 esac
diff --git a/mail/mailman/pkg-message b/mail/mailman/pkg-message
index 1eb07d74d52c..17083b0ac74d 100644
--- a/mail/mailman/pkg-message
+++ b/mail/mailman/pkg-message
@@ -12,8 +12,8 @@ You will also find README files with MTA-specific hints in
 You'll need to add at least the following to Apache's httpd.conf to
 activate Mailman's web interface:
 
-  ScriptAlias /mailman/ "%%MAILMANDIR%%/cgi-bin/"
-  Alias /pipermail/ "%%MAILMANDIR%%/archives/public/"
+  ScriptAlias /mailman "%%MAILMANDIR%%/cgi-bin"
+  Alias /pipermail "%%MAILMANDIR%%/archives/public"
 
 Remember to reload your mail aliases if required, and to restart your httpd!
 
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index cf4855c02856..cd37c87f3a96 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -1,13 +1,13 @@
 @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
-@exec mkdir -p %D/%%MMDIR%%/lists && chmod 2775 %D/%%MMDIR%%/lists
-@exec mkdir -p %D/%%MMDIR%%/locks && chmod 2775 %D/%%MMDIR%%/locks
-@exec mkdir -p %D/%%MMDIR%%/logs && chmod 2775 %D/%%MMDIR%%/logs
-@exec mkdir -p %D/%%MMDIR%%/qfiles && chmod 2775 %D/%%MMDIR%%/qfiles
-@exec mkdir -p %D/%%MMDIR%%/spam && chmod 2775 %D/%%MMDIR%%/spam
+@exec mkdir -p %D/%%MMDIR%%/archives/private
+@exec mkdir -p %D/%%MMDIR%%/archives/public
+@exec mkdir -p %D/%%MMDIR%%/archives
+@exec mkdir -p %D/%%MMDIR%%/lists
+@exec mkdir -p %D/%%MMDIR%%/locks
+@exec mkdir -p %D/%%MMDIR%%/logs
+@exec mkdir -p %D/%%MMDIR%%/qfiles
+@exec mkdir -p %D/%%MMDIR%%/spam
 %%IMGDIR%%/PythonPowered.png
 %%IMGDIR%%/gnu-head-tiny.jpg
 %%IMGDIR%%/mailman.jpg
@@ -22,7 +22,6 @@
 %%MMDIR%%/Mailman/Archiver/__init__.pyc
 %%MMDIR%%/Mailman/Archiver/pipermail.py
 %%MMDIR%%/Mailman/Archiver/pipermail.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/Autoresponder.py
 %%MMDIR%%/Mailman/Autoresponder.pyc
 %%MMDIR%%/Mailman/Bouncer.py
@@ -59,7 +58,6 @@
 %%MMDIR%%/Mailman/Bouncers/Yahoo.pyc
 %%MMDIR%%/Mailman/Bouncers/__init__.py
 %%MMDIR%%/Mailman/Bouncers/__init__.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/Cgi/Auth.py
 %%MMDIR%%/Mailman/Cgi/Auth.pyc
 %%MMDIR%%/Mailman/Cgi/__init__.py
@@ -82,7 +80,6 @@
 %%MMDIR%%/Mailman/Cgi/roster.pyc
 %%MMDIR%%/Mailman/Cgi/subscribe.py
 %%MMDIR%%/Mailman/Cgi/subscribe.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/Cookie.py
 %%MMDIR%%/Mailman/Cookie.pyc
 %%MMDIR%%/Mailman/Crypt.py
@@ -135,7 +132,6 @@
 %%MMDIR%%/Mailman/Handlers/ToUsenet.pyc
 %%MMDIR%%/Mailman/Handlers/__init__.py
 %%MMDIR%%/Mailman/Handlers/__init__.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/ListAdmin.py
 %%MMDIR%%/Mailman/ListAdmin.pyc
 %%MMDIR%%/Mailman/LockFile.py
@@ -152,7 +148,6 @@
 %%MMDIR%%/Mailman/Logging/Utils.pyc
 %%MMDIR%%/Mailman/Logging/__init__.py
 %%MMDIR%%/Mailman/Logging/__init__.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/MailCommandHandler.py
 %%MMDIR%%/Mailman/MailCommandHandler.pyc
 %%MMDIR%%/Mailman/MailList.py
@@ -191,10 +186,8 @@
 %%MMDIR%%/Mailman/pythonlib/smtplib.pyc
 %%MMDIR%%/Mailman/pythonlib/tempfile.py
 %%MMDIR%%/Mailman/pythonlib/tempfile.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/Mailman/versions.py
 %%MMDIR%%/Mailman/versions.pyc
-@exec chmod 2775 %B
 %%MMDIR%%/bin/add_members
 %%MMDIR%%/bin/arch
 %%MMDIR%%/bin/check_db
@@ -217,7 +210,6 @@
 %%MMDIR%%/bin/update
 %%MMDIR%%/bin/version
 %%MMDIR%%/bin/withlist
-@exec chmod 2775 %B
 %%MMDIR%%/cgi-bin/admin
 %%MMDIR%%/cgi-bin/admindb
 %%MMDIR%%/cgi-bin/edithtml
@@ -227,7 +219,6 @@
 %%MMDIR%%/cgi-bin/private
 %%MMDIR%%/cgi-bin/roster
 %%MMDIR%%/cgi-bin/subscribe
-@exec chmod 2775 %B
 %%MMDIR%%/cron/bumpdigests
 %%MMDIR%%/cron/checkdbs
 %%MMDIR%%/cron/crontab.in
@@ -238,19 +229,14 @@
 %%MMDIR%%/cron/paths.pyc
 %%MMDIR%%/cron/qrunner
 %%MMDIR%%/cron/senddigests
-@exec chmod 2775 %B
 %%MMDIR%%/data/last_mailman_version
 %%MMDIR%%/data/pending_subscriptions.db
-@exec chmod 2775 %B
 %%MMDIR%%/filters/bowa-strip
-@exec chmod 2775 %B
 %%MMDIR%%/icons/PythonPowered.png
 %%MMDIR%%/icons/gnu-head-tiny.jpg
 %%MMDIR%%/icons/mailman-large.jpg
 %%MMDIR%%/icons/mailman.jpg
-@exec chmod 2775 %B
 %%MMDIR%%/mail/wrapper
-@exec chmod 2775 %B
 %%MMDIR%%/scripts/answer_majordomo_mail
 %%MMDIR%%/scripts/driver
 %%MMDIR%%/scripts/mailcmd
@@ -258,7 +244,6 @@
 %%MMDIR%%/scripts/paths.py
 %%MMDIR%%/scripts/paths.pyc
 %%MMDIR%%/scripts/post
-@exec chmod 2775 %B
 %%MMDIR%%/templates/admindbpreamble.html
 %%MMDIR%%/templates/adminsubscribeack.txt
 %%MMDIR%%/templates/adminunsubscribeack.txt
@@ -287,8 +272,6 @@
 %%MMDIR%%/templates/subscribeack.txt
 %%MMDIR%%/templates/userpass.txt
 %%MMDIR%%/templates/verify.txt
-@exec chmod 2775 %B
-@exec chgrp -R %%MMGRP%% %D/%%MMDIR%%
 %%PORTDOCS%%share/doc/mailman/BUGS
 %%PORTDOCS%%share/doc/mailman/FAQ
 %%PORTDOCS%%share/doc/mailman/INSTALL
@@ -327,4 +310,3 @@
 @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
-@unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true