Update the version to 6_15_7-01-quimby (based on Oort Gnus v0.07)

Add a port of t-gnus for Emacs 21 by repository-copy from t-gnus-emacs20

22 files changed, 1022 insertions, 1394 deletions

diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile
index 9b2f1e80bd74..3f4905dcc97f 100644
--- a/news/t-gnus-emacs20/Makefile
+++ b/news/t-gnus-emacs20/Makefile
@@ -5,115 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	t-gnus
-PORTVERSION=	${TGNUSVERSION:S/_/./g:S/-/./g}
-CATEGORIES=	news mail elisp
-MASTER_SITES=	http://www.jpl.org/elips/t-gnus-6.14/snapshots/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-${TGNUSVERSION}
+MASTERDIR=	${.CURDIR}/../t-gnus
 
-MAINTAINER=	taoka@FreeBSD.org
+EMACS_PORT_NAME=	emacs20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-USE_GMAKE=	yes
-TGNUSVERSION=	6_14_6-04
-MIMEUI_PRODUCT?=semi
-MIMEUI_BRANCH?=	1.13
-MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
-
-EMACS_PORT_NAME?=emacs20
-
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-	${EMACS_PORT_NAME} == "xemacs21-mule")
-WITH_MULE=yes
-.else
-WITHOUT_MULE=yes
-.endif
-
-.if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
-CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
-		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
-		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
-.else
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
-		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
-		--infodir=${INFODIR}
-.endif
-
-.if defined(EMACS_PACKAGESDIR)
-INFODIR=	${LOCALBASE}/${EMACS_PACKAGESDIR}/info
-STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp
-INFOFILES=	emacs-mime gnus gnus-ja message message-ja
-.if (${EMACS_PORT_NAME} == "xemacs21")
-ALL_TARGET=	package
-INSTALL_TARGET=	install-package
-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-ALL_TARGET=	package-ja
-INSTALL_TARGET=	install-package-ja
-.endif
-.elif (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
-ALL_TARGET=	all-ja
-INSTALL_TARGET=	install-ja
-INFODIR=	${LOCALBASE}/info
-STARTUPDIR=	${EMACS_SITE_LISPDIR}
-.endif
-
-DIRSECTION=	"The Emacs editor and associated tools"
-PORTDOCDIR=	share/doc/t-gnus-${EMACS_PORT_NAME}
-DOCS=		ChangeLog ChangeLog.1 ChangeLog.2 GNUS-NEWS Mule23@1934.en Mule23@1934.ja README README-gnus-bbdb.en README-gnus-bbdb.ja README-offline.en README-offline.ja README.T-gnus README.branch README.branch.ja README.semi README.semi.ja TODO.ja
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		DIRSECTION=${DIRSECTION} \
-		EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		INFODIR=${INFODIR:S/${LOCALBASE}\///} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
-PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-
-.if (${EMACS_PORT_NAME} == "mule")
-post-extract:
-	${ECHO_CMD} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel
-	${CHMOD} +x ${WRKDIR}/mule-apel
-.endif
-
-post-configure:
-	@${SED} \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \
-		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
-		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
-		< ${FILESDIR}/t-gnus-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/t-gnus-startup.el
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${PORTDOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
-.endfor
-.endif
-	${INSTALL_DATA} ${WRKDIR}/t-gnus-startup.el ${PREFIX}/${STARTUPDIR}
-# For XEmacs, ${INFODIR}/dir is not necessary.
-.if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
-.for file in ${INFOFILES}
-	 install-info --delete ${INFODIR}/${file} ${INFODIR}/dir
-.endfor
-	if [ `${GREP} '^*' ${INFODIR}/dir | wc -l` -eq 1 ]; then \
-		${RM} ${INFODIR}/dir; \
-	fi
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
-
-.if (${EMACS_PORT_NAME} == "mule")
-MAKE_ARGS+=	EMACS="${WRKDIR}/mule-apel"  XEMACS="${WRKDIR}/mule-apel"
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/news/t-gnus-emacs20/distinfo b/news/t-gnus-emacs20/distinfo
deleted file mode 100644
index 5a32ba9cf2d7..000000000000
--- a/news/t-gnus-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (t-gnus-6_14_6-04.tar.gz) = a0a8d55a688842e4f304505604e43248
diff --git a/news/t-gnus-emacs20/files/patch-info b/news/t-gnus-emacs20/files/patch-info
deleted file mode 100644
index a792d88166c9..000000000000
--- a/news/t-gnus-emacs20/files/patch-info
+++ /dev/null
@@ -1,9 +0,0 @@
---- lisp/dgnushack.el.orig	Thu Mar  1 15:35:02 2001
-+++ lisp/dgnushack.el	Sat Apr 14 09:21:25 2001
-@@ -445,5 +445,5 @@
- 	      (set-buffer-modified-p nil)
- 	      (message "texinfo formatting %s..." file)
--	      (texinfo-format-buffer nil)
-+	      (texinfo-format-buffer t)
- 	      (if (buffer-modified-p)
- 		  (progn (message "Saving modified %s" (buffer-file-name))
diff --git a/news/t-gnus-emacs20/files/t-gnus-startup.mule.el.tmpl b/news/t-gnus-emacs20/files/t-gnus-startup.mule.el.tmpl
deleted file mode 100644
index 6c2d7b30e459..000000000000
--- a/news/t-gnus-emacs20/files/t-gnus-startup.mule.el.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-(mapcar
- (lambda (symbol)
-   (makunbound (intern (format "message-%s" symbol))))
- '(citation-line-function
-   cite-function courtesy-message default-headers default-mail-headers
-   default-news-headers deletable-headers fcc-handler-function
-   followup-to-function from-style generate-headers-first generate-new-buffers
-   ignored-bounced-headers ignored-cited-headers ignored-mail-headers
-   ignored-news-headers ignored-resent-headers ignored-supersedes-headers
-   included-forward-headers indent-citation-function interactive
-   kill-buffer-on-exit post-method reply-to-function required-mail-headers
-   required-news-headers send-mail-function send-news-function
-   signature signature-before-forwarded-message signature-file
-   signature-separator syntax-checks use-followup-to user-organization-file
-   wide-reply-to-function yank-prefix))
-
-(setq load-path (append (list
-	 "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/semi"
-	 "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/apel"
-	 "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/flim"
-	 "%%PREFIX%%/%%EMACS_LIBDIR%%/19.34/site-lisp/emu"
-	 "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/t-gnus"
-	 ) load-path))
-(load "mime-setup")
-(provide 't-gnus-startup)
diff --git a/news/t-gnus-emacs20/files/t-gnus-startup.xemacs21-mule.el.tmpl b/news/t-gnus-emacs20/files/t-gnus-startup.xemacs21-mule.el.tmpl
deleted file mode 100644
index 0559ea7c2fbb..000000000000
--- a/news/t-gnus-emacs20/files/t-gnus-startup.xemacs21-mule.el.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-(load "mime-setup")
-(provide 't-gnus-startup)
diff --git a/news/t-gnus-emacs20/pkg-comment b/news/t-gnus-emacs20/pkg-comment
deleted file mode 100644
index 67b82effe5d9..000000000000
--- a/news/t-gnus-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-I18N Gnus using SEMI, which provides MIME capabilities
diff --git a/news/t-gnus-emacs20/pkg-descr b/news/t-gnus-emacs20/pkg-descr
deleted file mode 100644
index c90ab54819ed..000000000000
--- a/news/t-gnus-emacs20/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-The gnus Newsreader
-*******************
-
-   You can read news (and mail) from within Emacs by using gnus.  The
-news can be gotten by any nefarious means you can think of--NNTP, local
-spool or your mbox file.  All at the same time, if you want to push your
-luck.
-
-   T-gnus provides MIME features based on SEMI API.  So T-gnus supports
-your right to read strange messages including big images or other
-various kinds of formats.  T-gnus also supports
-internationalization/localization and multiscript features based on MULE
-API.  So T-gnus does not discriminate various language communities.
-Oh, if you are a Klingon, please wait Unicode Next Generation.
diff --git a/news/t-gnus-emacs20/pkg-message b/news/t-gnus-emacs20/pkg-message
deleted file mode 100644
index 24a4eb7b8e9b..000000000000
--- a/news/t-gnus-emacs20/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-************************************************************
-* Before using T-gnus, you must set following elisp to     *
-* your own .emacs file.                                    *
-*                                                          *
-* (require 't-gnus-startup)                                *
-************************************************************
diff --git a/news/t-gnus-emacs20/pkg-plist.emacs20 b/news/t-gnus-emacs20/pkg-plist.emacs20
deleted file mode 100644
index 8d06ebc60aaf..000000000000
--- a/news/t-gnus-emacs20/pkg-plist.emacs20
+++ /dev/null
@@ -1,243 +0,0 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.T-gnus
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime
-%%INFODIR%%/gnus
-%%INFODIR%%/gnus-ja
-%%INFODIR%%/message
-%%INFODIR%%/message-ja
-@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-@dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
-@dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus-emacs20/pkg-plist.mule b/news/t-gnus-emacs20/pkg-plist.mule
deleted file mode 100644
index 1d763a38fcbe..000000000000
--- a/news/t-gnus-emacs20/pkg-plist.mule
+++ /dev/null
@@ -1,245 +0,0 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.T-gnus
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime
-%%INFODIR%%/gnus
-%%INFODIR%%/gnus-ja
-%%INFODIR%%/message
-%%INFODIR%%/message-ja
-@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-@dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
-@dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule b/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
deleted file mode 100644
index 871a80287dd7..000000000000
--- a/news/t-gnus-emacs20/pkg-plist.xemacs21-mule
+++ /dev/null
@@ -1,264 +0,0 @@
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus-startup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/base64.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/base64.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/flow-fill.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/flow-fill.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/format-spec.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/format-spec.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-agent.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-agent.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-art.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-art.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-async.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-async.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-audio.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-audio.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-bbdb.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-bbdb.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-bcklg.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-bcklg.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cache.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cache.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cite.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cite.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-clfns.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-clfns.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cus.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cus.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-demon.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-demon.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-draft.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-draft.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-dup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-dup.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-eform.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-eform.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ems.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ems.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-gl.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-gl.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-group.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-group.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-i18n.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-i18n.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-int.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-int.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-kill.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-kill.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-load.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-logic.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-logic.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mailcap.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mailcap.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mh.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ml.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mlspl.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-move.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-move.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-msg.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-msg.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-nocem.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-nocem.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-offline.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-offline.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ofsetup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ofsetup.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-picon.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-picon.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-range.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-range.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-salt.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-salt.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-score.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-score.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-soup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-soup.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-spec.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-spec.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-srvr.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-srvr.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-start.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-start.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-sum.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-sum.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-topic.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-topic.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-undo.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-undo.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-util.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-uu.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-uu.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-vers.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-vers.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-vm.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-vm.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-win.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-win.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-xmas.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-xmas.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-parse.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/messagexmas.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/messagexmas.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/messcompat.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/messcompat.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-bodies.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-bodies.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-decode.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-decode.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-encode.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-encode.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-partial.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-partial.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-util.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-uu.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-uu.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-view.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-view.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mmgnus.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mmgnus.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnagent.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnagent.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnbabyl.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnbabyl.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndb.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndb.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndir.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndir.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndoc.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndoc.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndraft.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndraft.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nneething.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nneething.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnfolder.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnfolder.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nngateway.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nngateway.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnheader.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnheader.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnheaderxm.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnheaderxm.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnimap.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnimap.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnkiboze.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnkiboze.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnlistserv.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnlistserv.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmail.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmail.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmbox.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmbox.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmh.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmh.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnml.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnml.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnoo.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnoo.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnslashdot.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnslashdot.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnsoup.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnsoup.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnspool.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnspool.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nntp.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nntp.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnultimate.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnultimate.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnvirtual.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnvirtual.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwarchive.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwarchive.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnweb.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnwfm.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/parse-time.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/pop3.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/pop3.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/qp.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/qp.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/read-passwd.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/read-passwd.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc1843.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc1843.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2045.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2045.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2047.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2047.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2104.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2104.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2231.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2231.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/utf7.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/utf7.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/uudecode.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/uudecode.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/webmail.elc
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.t-gnus
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.T-gnus
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/gnus-ja.info
-%%INFODIR%%/message.info
-%%INFODIR%%/message-ja.info
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/t-gnus
-@dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus-mule/Makefile b/news/t-gnus-mule/Makefile
index 998d8a63997c..ae202f0f3547 100644
--- a/news/t-gnus-mule/Makefile
+++ b/news/t-gnus-mule/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../t-gnus-emacs20
+MASTERDIR=	${.CURDIR}/../t-gnus
 
 EMACS_PORT_NAME=	mule
 
diff --git a/news/t-gnus-xemacs21-mule/Makefile b/news/t-gnus-xemacs21-mule/Makefile
index 617790dff0fe..a2ac11083cb7 100644
--- a/news/t-gnus-xemacs21-mule/Makefile
+++ b/news/t-gnus-xemacs21-mule/Makefile
@@ -5,10 +5,8 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../t-gnus-emacs20
+MASTERDIR=	${.CURDIR}/../t-gnus
 
 EMACS_PORT_NAME=	xemacs21-mule
-EMACS_PACKAGESDIR=	lib/xemacs/site-packages
-MANIFEST=		MANIFEST.t-gnus
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index 9b2f1e80bd74..3befd7ee6eea 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	T-gnus (for emacs)
+# New ports collection makefile for:	T-gnus (for emacs21)
 # Date created:		13 September 2000
 # Whom: 		Satoshi Taoka <taoka@FreeBSD.org>
 #
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	t-gnus
-PORTVERSION=	${TGNUSVERSION:S/_/./g:S/-/./g}
+PORTVERSION=	${TGNUSVERSION:S/quimby/q/g:S/_/./g:S/-/./g}
 CATEGORIES=	news mail elisp
-MASTER_SITES=	http://www.jpl.org/elips/t-gnus-6.14/snapshots/
+MASTER_SITES=	http://www.jpl.org/elips/t-gnus-6.15/snapshots/ \
+		http://cvs.m17n.org/archives/gnus/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-${TGNUSVERSION}
 
@@ -18,39 +19,49 @@ BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MI
 RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
-TGNUSVERSION=	6_14_6-04
-MIMEUI_PRODUCT?=semi
-MIMEUI_BRANCH?=	1.13
-MIMEUI_PORT_NAME?=${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
-EMACS_PORT_NAME?=emacs20
+TGNUSVERSION=	6_15_7-01-quimby
+EMACS_PORT_NAME?=emacs21
+EMACS_W3M_PORT_NAME?=	emacs-w3m
+EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
 
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-	${EMACS_PORT_NAME} == "xemacs21-mule")
-WITH_MULE=yes
+.include <bsd.port.pre.mk>
+
+.if exists(${EMACS_W3M_LISP_FILE})
+BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+SHIMBUN=	""
+.else
+SHIMBUN=	"@comment "
+.endif
+
+.if (${EMACS_PORT_NAME} == "mule")
+MIMEUI_VERSION=	1.13
+MIMEUI_PRODUCT=	semi113
+.else # emacs21, emacs20, xemacs21 or xemacs21-mule
+MIMEUI_VERSION=	1.14
+MIMEUI_PRODUCT=	semi
+.endif
+.if (${EMACS_PORT_NAME} == "emacs21")
+MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 .else
-WITHOUT_MULE=yes
+MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}
 .endif
+MIMEUI_COOKIE=		${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
+MANIFEST=		MANIFEST.t-gnus
+EMACS_PACKAGESDIR=	lib/xemacs/site-packages
 CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD} --with-packagedir=${LOCALBASE}/${EMACS_PACKAGESDIR}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
 		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages \
 		${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb.el:${PORTSDIR}/editors/xemacs-comm-packages
-.else
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
-		--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/t-gnus \
-		--infodir=${INFODIR}
-.endif
-
-.if defined(EMACS_PACKAGESDIR)
 INFODIR=	${LOCALBASE}/${EMACS_PACKAGESDIR}/info
 STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp
-INFOFILES=	emacs-mime gnus gnus-ja message message-ja
+INFOFILES=	emacs-mime gnus gnus-ja message message-ja sieve
 .if (${EMACS_PORT_NAME} == "xemacs21")
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
@@ -58,23 +69,27 @@ INSTALL_TARGET=	install-package
 ALL_TARGET=	package-ja
 INSTALL_TARGET=	install-package-ja
 .endif
-.elif (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
+.else  # emacs21, emacs20 or mule
+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
+		--with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/t-gnus \
+		--infodir=${INFODIR}
 ALL_TARGET=	all-ja
 INSTALL_TARGET=	install-ja
 INFODIR=	${LOCALBASE}/info
-STARTUPDIR=	${EMACS_SITE_LISPDIR}
+STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 .endif
 
 DIRSECTION=	"The Emacs editor and associated tools"
 PORTDOCDIR=	share/doc/t-gnus-${EMACS_PORT_NAME}
-DOCS=		ChangeLog ChangeLog.1 ChangeLog.2 GNUS-NEWS Mule23@1934.en Mule23@1934.ja README README-gnus-bbdb.en README-gnus-bbdb.ja README-offline.en README-offline.ja README.T-gnus README.branch README.branch.ja README.semi README.semi.ja TODO.ja
+DOCS=		ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 GNUS-NEWS Mule23@1934.en Mule23@1934.ja README-gnus-bbdb.en README-gnus-bbdb.ja README-offline.en README-offline.ja README.T-gnus README.branch README.branch.ja README.semi README.semi.ja TODO.ja
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		DIRSECTION=${DIRSECTION} \
 		EMACS_PORT_NAME=${EMACS_PORT_NAME} \
 		INFODIR=${INFODIR:S/${LOCALBASE}\///} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+		EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} \
+		SHIMBUN=${SHIMBUN}
 PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 
 .if (${EMACS_PORT_NAME} == "mule")
@@ -98,8 +113,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
 .endfor
 .endif
-	${INSTALL_DATA} ${WRKDIR}/t-gnus-startup.el ${PREFIX}/${STARTUPDIR}
-# For XEmacs, ${INFODIR}/dir is not necessary.
+	${INSTALL_DATA} ${WRKDIR}/t-gnus-startup.el ${LOCALBASE}/${STARTUPDIR}
+# For XEmacs, ${INFODIR}/dir is not necessary. So these were deleted.
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 .for file in ${INFOFILES}
 	 install-info --delete ${INFODIR}/${file} ${INFODIR}/dir
@@ -110,8 +125,6 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 .if (${EMACS_PORT_NAME} == "mule")
 MAKE_ARGS+=	EMACS="${WRKDIR}/mule-apel"  XEMACS="${WRKDIR}/mule-apel"
 .endif
diff --git a/news/t-gnus/distinfo b/news/t-gnus/distinfo
index 5a32ba9cf2d7..4db1c491dfb9 100644
--- a/news/t-gnus/distinfo
+++ b/news/t-gnus/distinfo
@@ -1 +1 @@
-MD5 (t-gnus-6_14_6-04.tar.gz) = a0a8d55a688842e4f304505604e43248
+MD5 (t-gnus-6_15_7-01-quimby.tar.gz) = 1736fcd570291333ebaf0e799ae44e06
diff --git a/news/t-gnus/files/patch-info b/news/t-gnus/files/patch-info
index a792d88166c9..8caf1b9e286d 100644
--- a/news/t-gnus/files/patch-info
+++ b/news/t-gnus/files/patch-info
@@ -1,9 +1,11 @@
---- lisp/dgnushack.el.orig	Thu Mar  1 15:35:02 2001
-+++ lisp/dgnushack.el	Sat Apr 14 09:21:25 2001
-@@ -445,5 +445,5 @@
- 	      (set-buffer-modified-p nil)
- 	      (message "texinfo formatting %s..." file)
--	      (texinfo-format-buffer nil)
-+	      (texinfo-format-buffer t)
- 	      (if (buffer-modified-p)
- 		  (progn (message "Saving modified %s" (buffer-file-name))
+--- texi/infohack.el.~1~	Tue Jan  8 14:20:24 2002
++++ texi/infohack.el	Mon Jun  3 13:14:54 2002
+@@ -137,7 +137,7 @@
+ 	  (texinfo-every-node-update)
+ 	  (set-buffer-modified-p nil)
+ 	  (message "texinfo formatting %s..." file)
+-	  (texinfo-format-buffer nil)
++	  (texinfo-format-buffer t)
+ 	  (if (buffer-modified-p)
+ 	      (progn (message "Saving modified %s" (buffer-file-name))
+ 		     (save-buffer))))
diff --git a/news/t-gnus-emacs20/files/t-gnus-startup.emacs20.el.tmpl b/news/t-gnus/files/t-gnus-startup.emacs21.el.tmpl
index 0559ea7c2fbb..0559ea7c2fbb 100644
--- a/news/t-gnus-emacs20/files/t-gnus-startup.emacs20.el.tmpl
+++ b/news/t-gnus/files/t-gnus-startup.emacs21.el.tmpl
diff --git a/news/t-gnus/pkg-message b/news/t-gnus/pkg-message
index 24a4eb7b8e9b..a7918396d0ce 100644
--- a/news/t-gnus/pkg-message
+++ b/news/t-gnus/pkg-message
@@ -1,5 +1,5 @@
 ************************************************************
-* Before using T-gnus, you must set following elisp to     *
+* Before using T-gnus, you must add the following line to  *
 * your own .emacs file.                                    *
 *                                                          *
 * (require 't-gnus-startup)                                *
diff --git a/news/t-gnus/pkg-plist.emacs20 b/news/t-gnus/pkg-plist.emacs20
index 8d06ebc60aaf..2bf1ceae1fcf 100644
--- a/news/t-gnus/pkg-plist.emacs20
+++ b/news/t-gnus/pkg-plist.emacs20
@@ -1,219 +1,293 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus-startup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sieve.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.elc
+%%SHIMBUN%%%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnshimbun.el
+%%SHIMBUN%%%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.elc
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.3
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
@@ -229,15 +303,18 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
 @unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
 @unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/sieve %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime
 %%INFODIR%%/gnus
 %%INFODIR%%/gnus-ja
 %%INFODIR%%/message
 %%INFODIR%%/message-ja
+%%INFODIR%%/sieve
 @exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-@dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
+@exec install-info %D/%%INFODIR%%/sieve %D/%%INFODIR%%/dir
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus/pkg-plist.emacs21 b/news/t-gnus/pkg-plist.emacs21
new file mode 100644
index 000000000000..081e617ff014
--- /dev/null
+++ b/news/t-gnus/pkg-plist.emacs21
@@ -0,0 +1,322 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus-startup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sieve.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnrss.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnrss.elc
+%%SHIMBUN%%%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnshimbun.el
+%%SHIMBUN%%%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smiley.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smiley.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.elc
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.3
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.ja
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.T-gnus
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.branch.ja
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/README.semi.ja
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
+@unexec install-info --delete %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/%%INFODIR%%/sieve %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-mime
+%%INFODIR%%/gnus
+%%INFODIR%%/gnus-ja
+%%INFODIR%%/message
+%%INFODIR%%/message-ja
+%%INFODIR%%/sieve
+@exec install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
+@exec install-info %D/%%INFODIR%%/sieve %D/%%INFODIR%%/dir
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/t-gnus
+@dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus/pkg-plist.mule b/news/t-gnus/pkg-plist.mule
index 1d763a38fcbe..46ef0d273130 100644
--- a/news/t-gnus/pkg-plist.mule
+++ b/news/t-gnus/pkg-plist.mule
@@ -1,221 +1,291 @@
-%%EMACS_SITE_LISPDIR%%/t-gnus-startup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/base64.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/earcon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/flow-fill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/format-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-art.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-async.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-group.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-int.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-load.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-move.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-range.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-score.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-start.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/gnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-parse.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/md5.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/messcompat.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-decode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-encode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-partial.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-util.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-uu.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mm-view.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mmgnus.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/mml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnagent.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndb.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndir.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndoc.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nndraft.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nneething.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnfolder.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nngateway.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnimap.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmail.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmbox.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnmh.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnml.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnoo.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnshimbun.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnsoup.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnspool.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/parse-time.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/pop3.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/qp.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/read-passwd.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc1843.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2045.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2047.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2104.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/rfc2231.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/starttls.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/time-date.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/utf7.elc
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.el
-%%EMACS_SITE_LISPDIR%%/t-gnus/uudecode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/binhex.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/base64.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/base64.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock-om.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/canlock-om.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/compface.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/deuglify.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dig.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/dns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/earcon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/flow-fill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/format-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-agent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-art.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-async.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-audio.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-bcklg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cache.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cite.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-clfns.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-delay.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-demon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-diary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dired.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-draft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-dup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-eform.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ems.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-fun.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-gl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-group.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-i18n.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-int.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-kill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-load.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-logic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-mlspl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-move.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-msg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-namazu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-nocem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-offline.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-ofsetup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-picon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-range.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-salt.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-score.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-soup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-srvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-start.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-sum.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-topic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-undo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vers.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-vm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus-win.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/gnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/html2text.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/ietf-drums.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/imap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-prsvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mail-source.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mailheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/message.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/messcompat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-bodies.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-extern.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-url.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mm-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mmgnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-sec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml-smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml1991.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/mml2015.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/netrc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnagent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnbabyl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndiary.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nndraft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nneething.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnfolder.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nngateway.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnimap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnkiboze.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnlistserv.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmaildir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmbox.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnmh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnnil.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnoo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnslashdot.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnsoup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnspool.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nntp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnvirtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnwarchive.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/nnweb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/parse-time.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/pop3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/qp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/read-passwd.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc1843.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2045.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2047.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2104.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/rfc2231.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/score-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-manage.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/sieve.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/starttls.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/time-date.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/utf7.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/uudecode.elc
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.3
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
@@ -241,5 +311,5 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 @exec install-info %D/%%INFODIR%%/gnus-ja %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
 @exec install-info %D/%%INFODIR%%/message-ja %D/%%INFODIR%%/dir
-@dirrm %%EMACS_SITE_LISPDIR%%/t-gnus
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%
diff --git a/news/t-gnus/pkg-plist.xemacs21-mule b/news/t-gnus/pkg-plist.xemacs21-mule
index 871a80287dd7..b15e910bc9b4 100644
--- a/news/t-gnus/pkg-plist.xemacs21-mule
+++ b/news/t-gnus/pkg-plist.xemacs21-mule
@@ -5,8 +5,18 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/base64.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/binhex.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/canlock.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/canlock.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/compface.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/compface.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/deuglify.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/deuglify.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dig.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dig.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dns.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/dns.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/earcon.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/flow-fill.el
@@ -33,8 +43,14 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-clfns.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cus.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-cus.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-delay.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-delay.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-demon.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-demon.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-diary.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-diary.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-dired.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-dired.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-draft.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-draft.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-dup.el
@@ -43,6 +59,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-eform.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ems.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-ems.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-fun.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-fun.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-gl.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-gl.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-group.el
@@ -53,8 +71,6 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-int.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-kill.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-kill.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-load.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-load.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-logic.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-logic.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-mailcap.el
@@ -69,6 +85,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-move.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-msg.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-msg.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-namazu.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-namazu.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-nocem.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-nocem.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-offline.el
@@ -85,6 +103,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-score.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-setup.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-setup.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-sieve.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-sieve.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-soup.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-soup.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-spec.el
@@ -113,6 +133,10 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus-xmas.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/gnus.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/hex-util.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/hex-util.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/html2text.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/html2text.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/ietf-drums.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/imap.el
@@ -123,6 +147,10 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-prsvr.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mail-source.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mailheader.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/message-utils.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/message-utils.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/message.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/messagexmas.el
@@ -135,8 +163,12 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-decode.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-encode.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-encode.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-extern.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-extern.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-partial.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-partial.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-url.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-url.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-util.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-util.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-uu.el
@@ -145,14 +177,26 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mm-view.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mmgnus.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mmgnus.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml-sec.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml-sec.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml-smime.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml-smime.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml1991.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml1991.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml2015.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/mml2015.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/netrc.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/netrc.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnagent.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnagent.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnbabyl.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnbabyl.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndb.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndb.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndiary.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndiary.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndir.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndir.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nndoc.el
@@ -171,22 +215,28 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnheaderxm.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnimap.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnimap.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnir.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnir.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnkiboze.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnkiboze.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnlistserv.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnlistserv.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmail.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmail.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmaildir.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmaildir.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmbox.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmbox.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmh.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnmh.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnml.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnml.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnnil.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnnil.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnoo.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnoo.elc
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.el
-%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.elc
+%%SHIMBUN%%%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.el
+%%SHIMBUN%%%%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnshimbun.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnslashdot.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnslashdot.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/nnsoup.el
@@ -225,8 +275,20 @@
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/rfc2231.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/score-mode.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sha1-el.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sha1-el.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve-manage.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve-manage.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve-mode.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve-mode.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/sieve.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/smiley.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/smime.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/smime.elc
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/spam.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/spam.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/time-date.el
@@ -241,10 +303,10 @@
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.1
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.2
+share/doc/t-gnus-%%EMACS_PORT_NAME%%/ChangeLog.3
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/Mule23@1934.ja
-share/doc/t-gnus-%%EMACS_PORT_NAME%%/README
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.en
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-gnus-bbdb.ja
 share/doc/t-gnus-%%EMACS_PORT_NAME%%/README-offline.en
@@ -260,5 +322,6 @@ share/doc/t-gnus-%%EMACS_PORT_NAME%%/TODO.ja
 %%INFODIR%%/gnus-ja.info
 %%INFODIR%%/message.info
 %%INFODIR%%/message-ja.info
+%%INFODIR%%/sieve.info
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/t-gnus
 @dirrm share/doc/t-gnus-%%EMACS_PORT_NAME%%