From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 16:42:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 91C6FBDF; Fri, 18 Oct 2013 16:42:12 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E7232093; Fri, 18 Oct 2013 16:42:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IGgCbp072181; Fri, 18 Oct 2013 16:42:12 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IGgBcE072167; Fri, 18 Oct 2013 16:42:11 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201310181642.r9IGgBcE072167@svn.freebsd.org> From: Matthias Andree Date: Fri, 18 Oct 2013 16:42:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330763 - in head/mail/mailman: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 16:42:12 -0000 Author: mandree Date: Fri Oct 18 16:42:11 2013 New Revision: 330763 URL: http://svnweb.freebsd.org/changeset/ports/330763 Log: Upgrade to new upstream release 2.1.16, release notes: https://launchpad.net/mailman/2.1/2.1.16/ Support stage directory. (Requires Python 2.7, 2.6 is no longer sufficient.) This requires us to compile the Python scripts ourselves to avoid spilling the stagedir name all over the .pyc files, as Mailman's build would do (causing complaints from make stage-qa). While there, compile bin/*.py programs, too. The post-install section of the Makefile is more verbose now. Run Mailman's bin/update after install. Fixes to handling the mailman_last_version file to avoid leftover dirs from an unused Mailman installation and deinstallation. Scripts are more robust now, and use mktemp -d for temporary directories. Modified: head/mail/mailman/Makefile head/mail/mailman/distinfo head/mail/mailman/files/pkg-deinstall.in (contents, props changed) head/mail/mailman/files/pkg-install.in (contents, props changed) head/mail/mailman/pkg-plist Modified: head/mail/mailman/Makefile ============================================================================== --- head/mail/mailman/Makefile Fri Oct 18 16:28:48 2013 (r330762) +++ head/mail/mailman/Makefile Fri Oct 18 16:42:11 2013 (r330763) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mailman -DISTVERSION= 2.1.15 +DISTVERSION= 2.1.16 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GNU} \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/gnu-COPYING-GPL CONFLICTS= ja-mailman-2.1.* USE_AUTOTOOLS= autoconf -USE_PYTHON= yes +USE_PYTHON= 2.7 USE_RC_SUBR= mailman GNU_CONFIGURE_PREFIX= ${MAILMANDIR} @@ -47,7 +47,7 @@ USERS= ${MM_USERNAME} GROUPS= ${MM_GROUPNAME} MAILMANDIR= ${PREFIX}/${MM_DIR} -PLIST_SUB= MMDIR=${MM_DIR} IMGDIR=${IMGDIR} +PLIST_SUB= MMDIR=${MM_DIR} IMGDIR=${IMGDIR} MM_USERNAME=${MM_USERNAME} MM_GROUPNAME=${MM_GROUPNAME} SUB_FILES= pkg-message pkg-install pkg-deinstall SUB_LIST= MAILMANDIR=${MAILMANDIR} USER=${MM_USERNAME} GROUP=${MM_GROUPNAME} @@ -73,7 +73,6 @@ HTDIG_DESC= - EXPERIMENTAL - htdig integ NAMAZU2_DESC= Make private archives searchable with namazu2 MTA_DESC= Integrate with which MTA? -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -143,6 +142,7 @@ post-patch: @${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \ ${WRKSRC}/Mailman/Defaults.py.in @${REINPLACE_CMD} -e 's/^0,5,10/#&/' ${WRKSRC}/cron/crontab.in.in + @${REINPLACE_CMD} -e '/PYTHON.*compileall/d' ${WRKSRC}/Makefile.in .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in .endif @@ -153,29 +153,41 @@ pre-configure: .endif post-install: - @${RM} -f ${MAILMANDIR}/pythonlib/*.egg-info -.for dir in cron scripts - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir} +.for i in admindb admin confirm create edithtml listinfo options private \ + rmlist roster subscribe + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/cgi-bin/${i} .endfor - @${CHGRP} -R ${MM_GROUPNAME} ${MAILMANDIR} - @${MKDIR} ${PREFIX}/${IMGDIR} +.if ${PORT_OPTIONS:MHTDIG} +.for i in htdig mmsearch + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/cgi-bin/${i} +.endfor +.endif + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/mail/mailman +# Recompile Python scripts to get the real paths in, +# rather than the staged paths: +.for dir in bin Mailman + (cd ${STAGEDIR}${MAILMANDIR} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${MAILMANDIR} -f -q ${dir}) +.endfor + @${RM} -f ${STAGEDIR}${MAILMANDIR}/pythonlib/*.egg-info + @${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc + ${MKDIR} ${STAGEDIR}${PREFIX}/${IMGDIR} .for imgfile in ${IMGFILES} - @${CP} ${MAILMANDIR}/icons/${imgfile} ${PREFIX}/${IMGDIR} + ${CP} ${STAGEDIR}${MAILMANDIR}/icons/${imgfile} ${STAGEDIR}${PREFIX}/${IMGDIR} .endfor - @uudecode -p ${FILESDIR}/powerlogo.gif.uue > \ - ${PREFIX}/${IMGDIR}/powerlogo.gif + uudecode -p ${FILESDIR}/powerlogo.gif.uue > \ + ${STAGEDIR}${PREFIX}/${IMGDIR}/powerlogo.gif .if ${PORT_OPTIONS:MDOCS} - @${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/ - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${DOCSDIR} + ${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOCS:NFreeBSD-post-install-notes} - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .endif - @${MKDIR} ${PYTHON_SITELIBDIR} - @${ECHO} "This marker file ensures that Python's upgrade-site-packages works." >${PYTHON_SITELIBDIR}/mailman-info.txt - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${ECHO} "This marker file ensures that Python's upgrade-site-packages handles ${PKGNAME}." >${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mailman-info.txt .if ${PORT_OPTIONS:MPOSTFIX} @if [ "x`${LOCALBASE}/sbin/postconf -h myhostname`" != "xlocalhost" ]; then \ ${ECHO_CMD} ""; \ Modified: head/mail/mailman/distinfo ============================================================================== --- head/mail/mailman/distinfo Fri Oct 18 16:28:48 2013 (r330762) +++ head/mail/mailman/distinfo Fri Oct 18 16:42:11 2013 (r330763) @@ -1,5 +1,5 @@ -SHA256 (mailman/mailman-2.1.15.tgz) = f355fb3d31772b488449e6f5173dafd31edca93172c307244c791d25d9e2bec8 -SIZE (mailman/mailman-2.1.15.tgz) = 8468107 +SHA256 (mailman/mailman-2.1.16.tgz) = 5d152b069338f5b814222f981c389b050f5c143a11ccf8796cf380e824b64f63 +SIZE (mailman/mailman-2.1.16.tgz) = 9009817 SHA256 (mailman/indexing-2.1.12-0.1.patch.gz) = c9bb8398695d79bbaa1079063d8327f4b7208a1f3cde7766d2f39390da1d820e SIZE (mailman/indexing-2.1.12-0.1.patch.gz) = 8178 SHA256 (mailman/htdig-2.1.12-0.1.patch.gz) = 4675fafe1ba978ec8ebfeb9306363d3ee0468bdbb32f204267ab54e0f15057d4 Modified: head/mail/mailman/files/pkg-deinstall.in ============================================================================== --- head/mail/mailman/files/pkg-deinstall.in Fri Oct 18 16:28:48 2013 (r330762) +++ head/mail/mailman/files/pkg-deinstall.in Fri Oct 18 16:42:11 2013 (r330763) @@ -10,21 +10,21 @@ DEINSTALL) echo "---> Starting deinstall script:" if /usr/bin/crontab -u "%%USER%%" -l | \ - /usr/bin/diff - %%MAILMANDIR%%/cron/crontab.in >/dev/null 2>&1 ; then + /usr/bin/diff - "%%MAILMANDIR%%/cron/crontab.in" >/dev/null 2>&1 ; then echo "---> Zeroing crontab for \"%%USER%%\"" /usr/bin/crontab -u "%%USER%%" /dev/null if [ -e /var/cron/allow ]; then - grep -v %%USER%% /var/cron/allow > /var/cron/allow.new - mv /var/cron/allow.new /var/cron/allow + grep -v "^%%USER%%$" /var/cron/allow > /var/cron/allow.new$$ + mv /var/cron/allow.new$$ /var/cron/allow fi else - echo "---> Crontab for \"%%USER%%\" not removed: please deinstall" - echo "---> manually if you no-longer wish to use Mailman. eg:" - echo "---> /usr/bin/crontab -u "%%USER%%" -r" + echo "---> Crontab for \"%%USER%%\" modified, not removed: please deinstall" + echo "---> it manually if you no longer wish to use Mailman. E.g.:" + echo "---> /usr/bin/crontab -u \"%%USER%%\" -r" fi echo "---> Preserving the \"last_mailman_version\" file" - /bin/cp -f %%MAILMANDIR%%/data/last_mailman_version /var/tmp/ + /bin/mv -f "%%MAILMANDIR%%/data/last_mailman_version" /var/tmp/ # If the errorlog is the only existing logfile, delete it. (If Mailman's # qrunner had not been running, then the process of trying to stop the @@ -33,20 +33,20 @@ DEINSTALL) # errorlog will exist.) if [ "`echo %%MAILMANDIR%%/logs/*`" = "%%MAILMANDIR%%/logs/error" ]; then echo "---> Deleting errorlog (It is the only existing logfile.)" - /bin/rm -f %%MAILMANDIR%%/logs/error + /bin/rm -f "%%MAILMANDIR%%/logs/error" fi ;; POST-DEINSTALL) echo "---> Starting post-deinstall script:" - if [ -d %%MAILMANDIR%% ]; then + rmdir "%%MAILMANDIR%%" >/dev/null 2>&1 + if [ -d "%%MAILMANDIR%%" ]; then echo '---> %%MAILMANDIR%% is not empty - this installation may have active lists!' echo "---> Restoring \"last_mailman_version\" file" - [ -d %%MAILMANDIR%%/data ] || /bin/mkdir %%MAILMANDIR%%/data - /bin/mv -f /var/tmp/last_mailman_version %%MAILMANDIR%%/data/ + /bin/mkdir -p "%%MAILMANDIR%%/data" + /bin/mv -f /var/tmp/last_mailman_version "%%MAILMANDIR%%/data/" fi ;; - esac Modified: head/mail/mailman/files/pkg-install.in ============================================================================== --- head/mail/mailman/files/pkg-install.in Fri Oct 18 16:28:48 2013 (r330762) +++ head/mail/mailman/files/pkg-install.in Fri Oct 18 16:42:11 2013 (r330763) @@ -9,16 +9,24 @@ case $2 in POST-INSTALL) echo "---> Starting post-install script:" + MYTMP="$(mktemp -d "${TMPDIR-/tmp}/mminstall.XXXXXXXXXX")" || exit 1 + trap "rm -rf \"$MYTMP\"" EXIT + /bin/chmod g+s "%%MAILMANDIR%%" || exit 1 + echo "---> Running update:" + + LC_ALL=C "%%MAILMANDIR%%/bin/update" || exit 1 + echo "---> Checking crontab(5) file for user \"%%USER%%\"" if [ -e /var/cron/allow ]; then - echo "%%USER%%" >> /var/cron/allow + grep -q "^%%USER%%\$" /var/cron/allow || \ + printf '%s\n' "%%USER%%" >> /var/cron/allow fi - if /usr/bin/crontab -u "%%USER%%" -l >/tmp/mmctab$$ 2>&1 ; then - if test -s /tmp/mmctab$$; then + if /usr/bin/crontab -u "%%USER%%" -l >"$MYTMP/crontab" 2>&1 ; then + if test -s "$MYTMP/crontab"; then echo "---> \"%%USER%%\" already has a crontab. Not overwriting it" echo "---> Please merge any changes from the standard crontab file" echo "---> %%MAILMANDIR%%/cron/crontab.in" @@ -30,10 +38,10 @@ POST-INSTALL) echo "---> Creating crontab(5) file for user \"%%USER%%\"" /usr/bin/crontab -u "%%USER%%" "%%MAILMANDIR%%/cron/crontab.in" || exit 1 fi - rm -f /tmp/mmctab$$ + rm -f "$MYTMP/crontab" echo "---> Checking (and fixing) file and directory permissions" - %%MAILMANDIR%%/bin/check_perms -f >/dev/null 2>&1 + "%%MAILMANDIR%%/bin/check_perms" -f >/dev/null ;; esac Modified: head/mail/mailman/pkg-plist ============================================================================== --- head/mail/mailman/pkg-plist Fri Oct 18 16:28:48 2013 (r330762) +++ head/mail/mailman/pkg-plist Fri Oct 18 16:42:11 2013 (r330763) @@ -15,6 +15,7 @@ %%IMGDIR%%/mailman.jpg %%IMGDIR%%/mm-icon.png %%IMGDIR%%/powerlogo.gif +@group %%MM_GROUPNAME%% %%MMDIR%%/Mailman/Archiver/Archiver.py %%MMDIR%%/Mailman/Archiver/Archiver.pyc %%MMDIR%%/Mailman/Archiver/HyperArch.py @@ -225,6 +226,8 @@ %%MMDIR%%/Mailman/Handlers/ToOutgoing.pyc %%MMDIR%%/Mailman/Handlers/ToUsenet.py %%MMDIR%%/Mailman/Handlers/ToUsenet.pyc +%%MMDIR%%/Mailman/Handlers/WrapMessage.py +%%MMDIR%%/Mailman/Handlers/WrapMessage.pyc %%MMDIR%%/Mailman/Handlers/__init__.py %%MMDIR%%/Mailman/Handlers/__init__.pyc %%MMDIR%%/Mailman/ListAdmin.py @@ -326,11 +329,14 @@ %%MMDIR%%/bin/clone_member %%MMDIR%%/bin/config_list %%MMDIR%%/bin/convert.py +%%NLS%%%%MMDIR%%/bin/convert.pyc %%MMDIR%%/bin/discard %%MMDIR%%/bin/dumpdb %%MMDIR%%/bin/export.py +%%NLS%%%%MMDIR%%/bin/export.pyc %%MMDIR%%/bin/find_member %%MMDIR%%/bin/fix_url.py +%%NLS%%%%MMDIR%%/bin/fix_url.pyc %%MMDIR%%/bin/genaliases %%MMDIR%%/bin/inject %%MMDIR%%/bin/list_admins @@ -340,6 +346,7 @@ %%MMDIR%%/bin/mailmanctl %%MMDIR%%/bin/mmsitepass %%MMDIR%%/bin/msgfmt.py +%%NLS%%%%MMDIR%%/bin/msgfmt.pyc %%MMDIR%%/bin/newlist %%MMDIR%%/bin/paths.py %%MMDIR%%/bin/paths.pyc @@ -347,6 +354,7 @@ %%MMDIR%%/bin/rb-archfix %%MMDIR%%/bin/remove_members %%MMDIR%%/bin/reset_pw.py +%%NLS%%%%MMDIR%%/bin/reset_pw.pyc %%MMDIR%%/bin/rmlist %%MMDIR%%/bin/show_qfiles %%MMDIR%%/bin/sync_members @@ -378,12 +386,10 @@ %%MMDIR%%/cron/nightly_gzip %%SUB_HTDIG%%%%MMDIR%%/cron/nightly_htdig %%MMDIR%%/cron/paths.py -%%MMDIR%%/cron/paths.pyc %%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig %%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig.pl %%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig_noshare %%MMDIR%%/cron/senddigests -%%MMDIR%%/data/last_mailman_version %%MMDIR%%/data/sitelist.cfg %%MMDIR%%/icons/PythonPowered.png %%MMDIR%%/icons/gnu-head-tiny.jpg @@ -416,6 +422,8 @@ %%NLS%%%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.mo %%NLS%%%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.po %%NLS%%%%MMDIR%%/messages/eu/README.eu +%%NLS%%%%MMDIR%%/messages/fa/LC_MESSAGES/mailman.mo +%%NLS%%%%MMDIR%%/messages/fa/LC_MESSAGES/mailman.po %%NLS%%%%MMDIR%%/messages/fi/LC_MESSAGES/mailman.mo %%NLS%%%%MMDIR%%/messages/fi/LC_MESSAGES/mailman.po %%NLS%%%%MMDIR%%/messages/fi/README.fi @@ -489,7 +497,6 @@ %%MMDIR%%/scripts/mailman %%MMDIR%%/scripts/owner %%MMDIR%%/scripts/paths.py -%%MMDIR%%/scripts/paths.pyc %%MMDIR%%/scripts/post %%MMDIR%%/scripts/request %%MMDIR%%/scripts/subscribe @@ -970,6 +977,42 @@ %%NLS%%%%MMDIR%%/templates/eu/unsubauth.txt %%NLS%%%%MMDIR%%/templates/eu/userpass.txt %%NLS%%%%MMDIR%%/templates/eu/verify.txt +%%NLS%%%%MMDIR%%/templates/fa/adminsubscribeack.txt +%%NLS%%%%MMDIR%%/templates/fa/adminunsubscribeack.txt +%%NLS%%%%MMDIR%%/templates/fa/admlogin.html +%%NLS%%%%MMDIR%%/templates/fa/approve.txt +%%NLS%%%%MMDIR%%/templates/fa/archidxfoot.html +%%NLS%%%%MMDIR%%/templates/fa/archidxhead.html +%%NLS%%%%MMDIR%%/templates/fa/archliststart.html +%%NLS%%%%MMDIR%%/templates/fa/archtoc.html +%%NLS%%%%MMDIR%%/templates/fa/archtocentry.html +%%NLS%%%%MMDIR%%/templates/fa/archtocnombox.html +%%NLS%%%%MMDIR%%/templates/fa/article.html +%%NLS%%%%MMDIR%%/templates/fa/bounce.txt +%%NLS%%%%MMDIR%%/templates/fa/checkdbs.txt +%%NLS%%%%MMDIR%%/templates/fa/convert.txt +%%NLS%%%%MMDIR%%/templates/fa/cronpass.txt +%%NLS%%%%MMDIR%%/templates/fa/disabled.txt +%%NLS%%%%MMDIR%%/templates/fa/emptyarchive.html +%%NLS%%%%MMDIR%%/templates/fa/help.txt +%%NLS%%%%MMDIR%%/templates/fa/invite.txt +%%NLS%%%%MMDIR%%/templates/fa/listinfo.html +%%NLS%%%%MMDIR%%/templates/fa/masthead.txt +%%NLS%%%%MMDIR%%/templates/fa/nomoretoday.txt +%%NLS%%%%MMDIR%%/templates/fa/options.html +%%NLS%%%%MMDIR%%/templates/fa/postack.txt +%%NLS%%%%MMDIR%%/templates/fa/postauth.txt +%%NLS%%%%MMDIR%%/templates/fa/postheld.txt +%%NLS%%%%MMDIR%%/templates/fa/private.html +%%NLS%%%%MMDIR%%/templates/fa/refuse.txt +%%NLS%%%%MMDIR%%/templates/fa/roster.html +%%NLS%%%%MMDIR%%/templates/fa/subauth.txt +%%NLS%%%%MMDIR%%/templates/fa/subscribe.html +%%NLS%%%%MMDIR%%/templates/fa/subscribeack.txt +%%NLS%%%%MMDIR%%/templates/fa/unsub.txt +%%NLS%%%%MMDIR%%/templates/fa/unsubauth.txt +%%NLS%%%%MMDIR%%/templates/fa/userpass.txt +%%NLS%%%%MMDIR%%/templates/fa/verify.txt %%NLS%%%%MMDIR%%/templates/fi/admindbdetails.html %%NLS%%%%MMDIR%%/templates/fi/admindbpreamble.html %%NLS%%%%MMDIR%%/templates/fi/admindbsummary.html @@ -2139,6 +2182,7 @@ %%MMDIR%%/tests/bounces/qmail_05.txt %%MMDIR%%/tests/bounces/qmail_06.txt %%MMDIR%%/tests/bounces/qmail_07.txt +%%MMDIR%%/tests/bounces/qmail_08.txt %%MMDIR%%/tests/bounces/sendmail_01.txt %%MMDIR%%/tests/bounces/simple_01.txt %%MMDIR%%/tests/bounces/simple_02.txt @@ -2178,6 +2222,7 @@ %%MMDIR%%/tests/bounces/simple_36.txt %%MMDIR%%/tests/bounces/simple_37.txt %%MMDIR%%/tests/bounces/simple_38.txt +%%MMDIR%%/tests/bounces/simple_39.txt %%MMDIR%%/tests/bounces/sina_01.txt %%MMDIR%%/tests/bounces/smtp32_01.txt %%MMDIR%%/tests/bounces/smtp32_02.txt @@ -2196,6 +2241,7 @@ %%MMDIR%%/tests/bounces/yahoo_08.txt %%MMDIR%%/tests/bounces/yahoo_09.txt %%MMDIR%%/tests/bounces/yahoo_10.txt +%%MMDIR%%/tests/bounces/yahoo_11.txt %%MMDIR%%/tests/bounces/yale_01.txt %%MMDIR%%/tests/fblast.py %%MMDIR%%/tests/msgs/bad_01.txt @@ -2243,6 +2289,7 @@ %%NLS%%@dirrm %%MMDIR%%/templates/gl %%NLS%%@dirrm %%MMDIR%%/templates/fr %%NLS%%@dirrm %%MMDIR%%/templates/fi +%%NLS%%@dirrm %%MMDIR%%/templates/fa %%NLS%%@dirrm %%MMDIR%%/templates/eu %%NLS%%@dirrm %%MMDIR%%/templates/et %%NLS%%@dirrm %%MMDIR%%/templates/es @@ -2312,6 +2359,8 @@ %%NLS%%@dirrm %%MMDIR%%/messages/fr %%NLS%%@dirrm %%MMDIR%%/messages/fi/LC_MESSAGES %%NLS%%@dirrm %%MMDIR%%/messages/fi +%%NLS%%@dirrm %%MMDIR%%/messages/fa/LC_MESSAGES +%%NLS%%@dirrm %%MMDIR%%/messages/fa %%NLS%%@dirrm %%MMDIR%%/messages/eu/LC_MESSAGES %%NLS%%@dirrm %%MMDIR%%/messages/eu %%NLS%%@dirrm %%MMDIR%%/messages/et/LC_MESSAGES @@ -2334,7 +2383,7 @@ @dirrm %%MMDIR%%/mail @dirrm %%MMDIR%%/icons @dirrm %%MMDIR%%/cron -@dirrm %%MMDIR%%/pythonlib +@dirrmtry %%MMDIR%%/pythonlib @dirrm %%MMDIR%%/cgi-bin @dirrm %%MMDIR%%/bin @dirrm %%MMDIR%%/Mailman/Queue @@ -2358,4 +2407,5 @@ %%SUB_HTDIG%%@dirrmtry %%MMDIR%%/archives/htdig @dirrmtry %%MMDIR%%/archives @dirrmtry %%MMDIR%%/Mailman -@dirrmtry %%MMDIR%%/ +@dirrmtry %%MMDIR%% +@group