- Update to version 2.0.9

- Correctly kill running Mailman processes in $PKGDEINSTALL

4 files changed, 15 insertions, 34 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 6b12f00d9f85..b17a6016353e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.0.8
-PORTREVISION=	5
+PORTVERSION=	2.0.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU} \
@@ -77,6 +76,7 @@ pre-configure:
 post-configure:
 	@ ${SED} -e 's#%%USER%%#${USERNAME}#g' \
 	  -e 's#%%GROUP%%#${GROUPNAME}#g' \
+	  -e 's#%%PYTHON_CMD%%#${PYTHON_CMD}#g' \
 	  -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' pkg-deinstall > \
 	  ${PKGDEINSTALL}
 	@ ${SED} -e 's#%%MAILMANDIR%%#${MAILMANDIR}#g' \
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 0e3e1b191f2d..515201f081d0 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.0.8.tgz) = 18b8db0cceeb8e03384a03d96fa3f0d8
+MD5 (mailman-2.0.9.tgz) = f9d93d4d43f1b6ecdf3c9a933d0a82ed
diff --git a/mail/mailman/files/patch-Mailman::htmlformat.py b/mail/mailman/files/patch-Mailman::htmlformat.py
index 887d77441a92..45bd552536bc 100644
--- a/mail/mailman/files/patch-Mailman::htmlformat.py
+++ b/mail/mailman/files/patch-Mailman::htmlformat.py
@@ -1,5 +1,5 @@
---- Mailman/htmlformat.py.orig	Tue Sep 12 06:02:36 2000
-+++ Mailman/htmlformat.py	Tue Feb 19 17:12:53 2002
+--- Mailman/htmlformat.py.orig	Wed Apr  3 00:28:59 2002
++++ Mailman/htmlformat.py	Thu Apr  4 11:28:51 2002
 @@ -503,15 +503,17 @@
  # These are the URLs which the image logos link to.  The Mailman home page now
  # points at the gnu.org site instead of the www.list.org mirror.
@@ -19,36 +19,17 @@
  
  
  def MailmanLogo():
-@@ -529,18 +531,34 @@
-         gnulink = Link(GNU_URL,
-                        '<img src="%s" alt="GNU\'s Not Unix" border=0>' %
-                        logo(GNU_HEAD))
--        text = Container(Link(MAILMAN_URL, 'Mailman home page'),
--                         '<br>',
--                         Link(PYTHON_URL, 'Python home page'),
--                         '<br>',
--                         Link(GNU_URL, 'GNU home page'),
--                         )
--        t.AddRow([mmlink, pylink, gnulink, text])
-+        freebsdlink = Link(FREEBSD_URL,
-+                           '<img src="%s" alt="Powered by FreeBSD" border=0>' %
-+                           logo(FREEBSD_POWERED))
+@@ -525,12 +527,21 @@
+                  logo(PYTHON_POWERED)
+         gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
+                   logo(GNU_HEAD)
+-        t.AddRow([mmlink, pylink, gnulink])
++        freebsdlink = '<img src="%s" alt="Powered by FreeBSD" border=0>' % \
++                      logo(FREEBSD_POWERED)
 +        if LOGO_OS == 'FreeBSD':
-+            text = Container(Link(MAILMAN_URL, 'Mailman home page'),
-+                             '<br>',
-+                             Link(PYTHON_URL, 'Python home page'),
-+                             '<br>',
-+                             Link(FREEBSD_URL, 'FreeBSD home page'),
-+                             )
-+            t.AddRow([mmlink, pylink, freebsdlink, text])
++	    t.AddRow([mmlink, pylink, freebsdlink])
 +        else:
-+            text = Container(Link(MAILMAN_URL, 'Mailman home page'),
-+                             '<br>',
-+                             Link(PYTHON_URL, 'Python home page'),
-+                             '<br>',
-+                             Link(GNU_URL, 'GNU home page'),
-+                             )
-+            t.AddRow([mmlink, pylink, gnulink, text])
++	    t.AddRow([mmlink, pylink, gnulink])
      else:
          # use only textual links
          mmlink = Link(MAILMAN_URL,
diff --git a/mail/mailman/pkg-deinstall b/mail/mailman/pkg-deinstall
index e883398c61bc..0362df163adc 100644
--- a/mail/mailman/pkg-deinstall
+++ b/mail/mailman/pkg-deinstall
@@ -32,7 +32,7 @@ DEINSTALL)
   zero_crontab %%USER%%
   if ps -axwU %%USER%% | grep -q python; then
     echo 'Killing all running processes belonging to user "%%USER%%".'
-    killall -u %%USER%% python
+    killall -u %%USER%% %%PYTHON_CMD%%
     sleep 2
   fi
   ;;