Allow IMAGE3_URL IMAGE3_IMG and IMAGE3_ALT to be specified in mm_cfg.py to

override the third image in the web pages (which is currently the "gnu head").

4 files changed, 64 insertions, 5 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 36ae7337f0b..dda9f1c28ad 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/01/14 01:46:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/09/06 04:12:46 lukem Exp $
 
 DISTNAME=	mailman-2.1.4
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU:=mailman/}
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 950308e8f0b..8f2e2ce299c 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/01/14 01:46:29 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/09/06 04:12:46 lukem Exp $
 
 SHA1 (mailman-2.1.4.tgz) = b77d22283d5780b6d8449f19f86c210e4e58a032
 Size (mailman-2.1.4.tgz) = 5779983 bytes
@@ -6,6 +6,7 @@ SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
 SHA1 (patch-ac) = da26a9a02d0fc90e7a58edebdb3601a30c865821
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
-SHA1 (patch-ae) = a63c55b5a95f5d4b90645146595b7a06f71d87ac
+SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
 SHA1 (patch-ag) = f94f190e69ce892841b88574ec8e9f100b182ed9
+SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df
diff --git a/mail/mailman/patches/patch-ae b/mail/mailman/patches/patch-ae
index edd9358049d..4e719b2be03 100644
--- a/mail/mailman/patches/patch-ae
+++ b/mail/mailman/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2004/09/06 04:12:46 lukem Exp $
 
---- Mailman/Defaults.py.in.orig	Sun Apr 20 00:02:03 2003
+--- Mailman/Defaults.py.in.orig	2003-12-14 03:34:17.000000000 +1100
 +++ Mailman/Defaults.py.in
 @@ -54,7 +54,7 @@ No = no = Off = off = False
  # disable Mailman's logo footer altogther, hack
@@ -11,3 +11,15 @@ $NetBSD: patch-ae,v 1.2 2003/12/23 11:02:13 xtraeme Exp $
  
  # The name of the Mailman favicon
  SHORTCUT_ICON = 'mm-icon.png'
+@@ -64,6 +64,11 @@ MAILMAN_URL = 'http://www.gnu.org/softwa
+ #MAILMAN_URL = 'http://www.list.org/'
+ #MAILMAN_URL = 'http://mailman.sf.net/'
+ 
++# Details of third image
++IMAGE3_URL = 'http://www.gnu.org/'
++IMAGE3_IMG = 'gnu-head-tiny.jpg'
++IMAGE3_ALT = 'Gnu\'s Not Unix'
++
+ # Mailman needs to know about (at least) two fully-qualified domain names
+ # (fqdn); 1) the hostname used in your urls, and 2) the hostname used in email
+ # addresses for your domain.  For example, if people visit your Mailman system
diff --git a/mail/mailman/patches/patch-ah b/mail/mailman/patches/patch-ah
new file mode 100644
index 00000000000..8877b9fe25b
--- /dev/null
+++ b/mail/mailman/patches/patch-ah
@@ -0,0 +1,45 @@
+$NetBSD: patch-ah,v 1.1 2004/09/06 04:12:46 lukem Exp $
+
+--- Mailman/htmlformat.py.orig	2003-09-22 12:58:13.000000000 +1000
++++ Mailman/htmlformat.py
+@@ -599,13 +599,15 @@ class DefinitionList(Container):
+ #
+ from mm_cfg import MAILMAN_URL
+ PYTHON_URL  = 'http://www.python.org/'
+-GNU_URL     = 'http://www.gnu.org/'
+ 
+ # The names of the image logo files.  These are concatentated onto
+ # mm_cfg.IMAGE_LOGOS (not urljoined).
+ DELIVERED_BY = 'mailman.jpg'
+ PYTHON_POWERED = 'PythonPowered.png'
+-GNU_HEAD = 'gnu-head-tiny.jpg'
++
++from mm_cfg import IMAGE3_URL
++from mm_cfg import IMAGE3_IMG
++from mm_cfg import IMAGE3_ALT
+ 
+ 
+ def MailmanLogo():
+@@ -617,17 +619,17 @@ def MailmanLogo():
+                  '<br>version %s' % (logo(DELIVERED_BY), mm_cfg.VERSION)
+         pylink = '<img src="%s" alt="Python Powered" border=0>' % \
+                  logo(PYTHON_POWERED)
+-        gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
+-                  logo(GNU_HEAD)
+-        t.AddRow([mmlink, pylink, gnulink])
++        image3link = '<img src="%s" alt="%s" border=0>' % \
++                  (logo(IMAGE3_IMG), IMAGE3_ALT)
++        t.AddRow([mmlink, pylink, image3link])
+     else:
+         # use only textual links
+         version = mm_cfg.VERSION
+         mmlink = Link(MAILMAN_URL,
+                       _('Delivered by Mailman<br>version %(version)s'))
+         pylink = Link(PYTHON_URL, _('Python Powered'))
+-        gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
+-        t.AddRow([mmlink, pylink, gnulink])
++        image3link = Link(IMAGE3_URL, _(IMAGE3_ALT))
++        t.AddRow([mmlink, pylink, image3link])
+     return t
+ 
+