diff options
-rw-r--r-- | mail/mailman/Makefile | 17 | ||||
-rw-r--r-- | mail/mailman/PLIST | 51 | ||||
-rw-r--r-- | mail/mailman/distinfo | 12 | ||||
-rw-r--r-- | mail/mailman/patches/patch-aa | 10 | ||||
-rw-r--r-- | mail/mailman/patches/patch-ah | 8 |
5 files changed, 28 insertions, 70 deletions
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 8bb4c958e24..135950631e3 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2009/02/09 22:56:25 joerg Exp $ +# $NetBSD: Makefile,v 1.58 2009/06/03 06:55:07 adam Exp $ -DISTNAME= mailman-2.1.11 -PKGREVISION= 1 +DISTNAME= mailman-2.1.12 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/} EXTRACT_SUFX= .tgz @@ -22,12 +21,12 @@ GNU_CONFIGURE_PREFIX= ${EXECDIR} MAKE_FLAGS+= DIRSETGID=${TRUE:Q} EXECDIR= ${PREFIX}/lib/mailman MAILMAN_DATADIR?= ${VARBASE}/db/mailman -EGDIR= ${PREFIX}/share/examples/mailman -DOCDIR= ${PREFIX}/share/doc/mailman -MAILMAN_USER?= mailman -MAILMAN_GROUP?= mailman -MAILMAN_CGIGROUP?= ${APACHE_GROUP} -MAILMAN_MAILGROUP?= daemon # group sendmail runs under; +EGDIR= ${PREFIX}/share/examples/mailman +DOCDIR= ${PREFIX}/share/doc/mailman +MAILMAN_USER?= mailman +MAILMAN_GROUP?= mailman +MAILMAN_CGIGROUP?= ${APACHE_GROUP} +MAILMAN_MAILGROUP?= daemon # group sendmail runs under; # use 'nobody' for postfix MAILMAN_CGIEXT?= .cgi diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST index b438855f19e..dfabd230ccb 100644 --- a/mail/mailman/PLIST +++ b/mail/mailman/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2008/12/30 01:39:25 markd Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/06/03 06:55:07 adam Exp $ lib/mailman/Mailman/Archiver/Archiver.py lib/mailman/Mailman/Archiver/Archiver.pyc lib/mailman/Mailman/Archiver/HyperArch.py @@ -445,50 +445,6 @@ lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.mo lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.po lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.mo lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.po -lib/mailman/pythonlib/email/Charset.py -lib/mailman/pythonlib/email/Charset.pyc -lib/mailman/pythonlib/email/Encoders.py -lib/mailman/pythonlib/email/Encoders.pyc -lib/mailman/pythonlib/email/Errors.py -lib/mailman/pythonlib/email/Errors.pyc -lib/mailman/pythonlib/email/Generator.py -lib/mailman/pythonlib/email/Generator.pyc -lib/mailman/pythonlib/email/Header.py -lib/mailman/pythonlib/email/Header.pyc -lib/mailman/pythonlib/email/Iterators.py -lib/mailman/pythonlib/email/Iterators.pyc -lib/mailman/pythonlib/email/MIMEAudio.py -lib/mailman/pythonlib/email/MIMEAudio.pyc -lib/mailman/pythonlib/email/MIMEBase.py -lib/mailman/pythonlib/email/MIMEBase.pyc -lib/mailman/pythonlib/email/MIMEImage.py -lib/mailman/pythonlib/email/MIMEImage.pyc -lib/mailman/pythonlib/email/MIMEMessage.py -lib/mailman/pythonlib/email/MIMEMessage.pyc -lib/mailman/pythonlib/email/MIMEMultipart.py -lib/mailman/pythonlib/email/MIMEMultipart.pyc -lib/mailman/pythonlib/email/MIMENonMultipart.py -lib/mailman/pythonlib/email/MIMENonMultipart.pyc -lib/mailman/pythonlib/email/MIMEText.py -lib/mailman/pythonlib/email/MIMEText.pyc -lib/mailman/pythonlib/email/Message.py -lib/mailman/pythonlib/email/Message.pyc -lib/mailman/pythonlib/email/Parser.py -lib/mailman/pythonlib/email/Parser.pyc -lib/mailman/pythonlib/email/Utils.py -lib/mailman/pythonlib/email/Utils.pyc -lib/mailman/pythonlib/email/__init__.py -lib/mailman/pythonlib/email/__init__.pyc -lib/mailman/pythonlib/email/_compat21.py -lib/mailman/pythonlib/email/_compat21.pyc -lib/mailman/pythonlib/email/_compat22.py -lib/mailman/pythonlib/email/_compat22.pyc -lib/mailman/pythonlib/email/_parseaddr.py -lib/mailman/pythonlib/email/_parseaddr.pyc -lib/mailman/pythonlib/email/base64MIME.py -lib/mailman/pythonlib/email/base64MIME.pyc -lib/mailman/pythonlib/email/quopriMIME.py -lib/mailman/pythonlib/email/quopriMIME.pyc lib/mailman/pythonlib/japanese/__init__.py lib/mailman/pythonlib/japanese/__init__.pyc lib/mailman/pythonlib/japanese/aliases/__init__.py @@ -2163,6 +2119,7 @@ lib/mailman/tests/bounces/qmail_02.txt lib/mailman/tests/bounces/qmail_03.txt lib/mailman/tests/bounces/qmail_04.txt lib/mailman/tests/bounces/qmail_05.txt +lib/mailman/tests/bounces/qmail_06.txt lib/mailman/tests/bounces/sendmail_01.txt lib/mailman/tests/bounces/simple_01.txt lib/mailman/tests/bounces/simple_02.txt @@ -2197,6 +2154,9 @@ lib/mailman/tests/bounces/simple_30.txt lib/mailman/tests/bounces/simple_31.txt lib/mailman/tests/bounces/simple_32.txt lib/mailman/tests/bounces/simple_33.txt +lib/mailman/tests/bounces/simple_34.txt +lib/mailman/tests/bounces/simple_35.txt +lib/mailman/tests/bounces/simple_36.txt lib/mailman/tests/bounces/sina_01.txt lib/mailman/tests/bounces/smtp32_01.txt lib/mailman/tests/bounces/smtp32_02.txt @@ -2313,7 +2273,6 @@ share/examples/rc.d/mailman @dirrm lib/mailman/pythonlib/japanese/c @dirrm lib/mailman/pythonlib/japanese/aliases @dirrm lib/mailman/pythonlib/japanese -@dirrm lib/mailman/pythonlib/email @dirrm lib/mailman/pythonlib @dirrm lib/mailman/messages/zh_TW/LC_MESSAGES @dirrm lib/mailman/messages/zh_TW diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo index d3466b52850..bb125b644c4 100644 --- a/mail/mailman/distinfo +++ b/mail/mailman/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.16 2008/12/19 21:10:39 markd Exp $ +$NetBSD: distinfo,v 1.17 2009/06/03 06:55:07 adam Exp $ -SHA1 (mailman-2.1.11.tgz) = 068f1927f4d8dd0896b5064bdf6d102798491b72 -RMD160 (mailman-2.1.11.tgz) = 667297720aae9fef07600eab6fbf3d2cfc205c8b -Size (mailman-2.1.11.tgz) = 7992229 bytes -SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f +SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae +RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94 +Size (mailman-2.1.12.tgz) = 8010027 bytes +SHA1 (patch-aa) = 77235e964da9d2b0c2725cd7d47c247b0356a45d SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e SHA1 (patch-ag) = 5fda86a90ef17a08c304ae89f0934812601d5dfc -SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df +SHA1 (patch-ah) = c7cde35f787c003ace550a98d8d5e166ba2d48dc diff --git a/mail/mailman/patches/patch-aa b/mail/mailman/patches/patch-aa index 4c1a2a3bb3a..58bfa1fe376 100644 --- a/mail/mailman/patches/patch-aa +++ b/mail/mailman/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2004/01/14 01:46:29 xtraeme Exp $ +$NetBSD: patch-aa,v 1.4 2009/06/03 06:55:07 adam Exp $ ---- misc/Makefile.in.orig 2004-01-14 02:40:49.000000000 +0100 -+++ misc/Makefile.in 2004-01-14 02:41:48.000000000 +0100 -@@ -40,7 +40,7 @@ +--- misc/Makefile.in.orig 2009-02-23 22:23:35.000000000 +0100 ++++ misc/Makefile.in +@@ -41,7 +41,7 @@ DEFS= @DEFS@ OPT= @OPT@ CFLAGS= $(OPT) $(DEFS) PACKAGEDIR= $(prefix)/Mailman @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2004/01/14 01:46:29 xtraeme Exp $ ICONDIR= $(prefix)/icons SCRIPTSDIR= $(prefix)/scripts -@@ -91,6 +91,7 @@ +@@ -99,6 +99,7 @@ install-packages: do \ gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \ (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ diff --git a/mail/mailman/patches/patch-ah b/mail/mailman/patches/patch-ah index 8877b9fe25b..01333e752a5 100644 --- a/mail/mailman/patches/patch-ah +++ b/mail/mailman/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2004/09/06 04:12:46 lukem Exp $ +$NetBSD: patch-ah,v 1.2 2009/06/03 06:55:07 adam Exp $ ---- Mailman/htmlformat.py.orig 2003-09-22 12:58:13.000000000 +1000 +--- Mailman/htmlformat.py.orig 2009-02-23 22:23:35.000000000 +0100 +++ Mailman/htmlformat.py -@@ -599,13 +599,15 @@ class DefinitionList(Container): +@@ -611,13 +611,15 @@ class DefinitionList(Container): # from mm_cfg import MAILMAN_URL PYTHON_URL = 'http://www.python.org/' @@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.1 2004/09/06 04:12:46 lukem Exp $ def MailmanLogo(): -@@ -617,17 +619,17 @@ def MailmanLogo(): +@@ -629,17 +631,17 @@ def MailmanLogo(): '<br>version %s' % (logo(DELIVERED_BY), mm_cfg.VERSION) pylink = '<img src="%s" alt="Python Powered" border=0>' % \ logo(PYTHON_POWERED) |