Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Apr 2020 18:04:58 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533159 - in head/mail/mailman: . files
Message-ID:  <202004271804.03RI4wZ1058640@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Mon Apr 27 18:04:58 2020
New Revision: 533159
URL: https://svnweb.freebsd.org/changeset/ports/533159

Log:
  mail/mailman: rcfile and pkg-message tweaks
  
  Limit the install message about pkg install -I to installs (not upgrades).
  
  Convert the required_dirs of the rcfile into a coded prereq check,
  so that we can print the proper error message, and point the user to
  the right place.
  
  Bump PORTREVISION.

Modified:
  head/mail/mailman/Makefile
  head/mail/mailman/files/mailman.in
  head/mail/mailman/files/pkg-message.in

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Mon Apr 27 17:33:31 2020	(r533158)
+++ head/mail/mailman/Makefile	Mon Apr 27 18:04:58 2020	(r533159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \

Modified: head/mail/mailman/files/mailman.in
==============================================================================
--- head/mail/mailman/files/mailman.in	Mon Apr 27 17:33:31 2020	(r533158)
+++ head/mail/mailman/files/mailman.in	Mon Apr 27 18:04:58 2020	(r533159)
@@ -24,7 +24,6 @@
 
 name="mailman"
 rcvar="mailman_enable"
-required_dirs="%%MAILMANDIR%%/lists/mailman"
 command_interpreter="%%PYTHON_CMD%%"
 command="%%MAILMANDIR%%/bin/mailmanctl"
 command_args="start"
@@ -44,8 +43,15 @@ reopen_cmd="${command} reopen"
 mailman_prestart() {
 	### check/fix permissions if desired
 	if checkyesno mailman_fix_perms ; then 
-	    check_startmsgs && echo "Fixing ${name} permissions:"
-	    env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f ${rc_debug:+-v}
+		check_startmsgs && echo "Fixing ${name} permissions:"
+		env LC_ALL=C %%MAILMANDIR%%/bin/check_perms -f ${rc_debug:+-v}
+	fi
+
+	### check if site list is created
+	if test ! -d "%%MAILMANDIR%%/lists/mailman" ; then
+		err 78 $'The site-wide "mailman" mailing list has not been created.\n\
+  Please review %%DOCSDIR%%/FreeBSD-post-install-notes,\n\
+  and section 4 onward of %%DOCSDIR%%/mailman-install.txt.'
 	fi
 
 	### check if the default configuration is plausible

Modified: head/mail/mailman/files/pkg-message.in
==============================================================================
--- head/mail/mailman/files/pkg-message.in	Mon Apr 27 17:33:31 2020	(r533158)
+++ head/mail/mailman/files/pkg-message.in	Mon Apr 27 18:04:58 2020	(r533159)
@@ -8,6 +8,7 @@ integrate with Mailman.  If the port's documentation h
 extensive post-installation instructions may be found in:
 
   %%DOCSDIR%%/FreeBSD-post-install-notes
+  %%DOCSDIR%%/mailman-install.txt (start at section 4)
 
 Note (1): 
 - ESPECIALLY RELEVANT FOR USERS OF THE BINARY PACKAGE -
@@ -34,7 +35,8 @@ to copy or link %%LOCALBASE%%/libexec/namazu.cgi to
 Refer to %%LOCALBASE%%/etc/namazu/namazurc.sample.
 EOM
 }
-{ message: <<EOM
+{ type: install,
+  message: <<EOM
 If you did just install mailman with pkg -I, --no-script or
 --no-install-scripts, you MUST(!) run the post-install script now, as root:
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004271804.03RI4wZ1058640>