svn commit: r449582 - in head/mail/mailman: . files

[Matthias Andree]

Author: mandree
Date: Sun Sep 10 16:53:56 2017
New Revision: 449582
URL: https://svnweb.freebsd.org/changeset/ports/449582

Log:
  Fix up DEFAULT_URL_HOST/DEFAULT_MAIL_HOST for jailed or external builds.
  
  If the package is built in, for instance, poudriere, or on a computer other
  than the one it is later installed on, the DEFAULT_MAIL_HOST and
  DEFAULT_URL_HOST variables in the Mailman/Defaults.py file were unsuitable.
  
  Leverage pkg-install to fix these up to be the same as hostname -f at
  install time.
  
  [The MFH would require the intermediate update to 2.1.24 to be included.]
  
  MFH:		2017Q3

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

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Sun Sep 10 16:49:46 2017	(r449581)
+++ head/mail/mailman/Makefile	Sun Sep 10 16:53:56 2017	(r449582)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.24
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -34,7 +35,9 @@ CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} \
 		--with-username=${MM_USERNAME} \
 		--with-groupname=${MM_GROUPNAME} \
 		--with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID} \
-		--with-permcheck=no
+		--with-permcheck=no \
+		--with-mailhost=// \
+		--with-urlhost=//
 
 # 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!

Modified: head/mail/mailman/files/pkg-install.in
==============================================================================
--- head/mail/mailman/files/pkg-install.in	Sun Sep 10 16:49:46 2017	(r449581)
+++ head/mail/mailman/files/pkg-install.in	Sun Sep 10 16:53:56 2017	(r449582)
@@ -106,6 +106,9 @@ POST-INSTALL)
     echo "---> rcfile sets mailman_fix_perms to no, skipping check_perms"
   fi
 
+  echo "---> Fixing up default host names (MAILHOST, URLHOST)"
+  sed -Ee "s}^(DEFAULT_(EMAIL|URL)_HOST) = '//'}\1 = '`hostname -f`'}" -i '' "%%MAILMANDIR%%/Mailman/Defaults.py"
+
   echo "---> Running assorted other checks"
   if egrep -q "^[ \t]*MTA.*=.*Postfix" "%%MAILMANDIR%%/Mailman/mm_cfg.py" ; then
       # run Postfix-specific checks