8 files changed, 14 insertions, 64 deletions

diff --git a/news/t-gnus-xemacs21-mule/Makefile b/news/t-gnus-xemacs21-mule/Makefile
index a2ac11083cb7..22460b843388 100644
--- a/news/t-gnus-xemacs21-mule/Makefile
+++ b/news/t-gnus-xemacs21-mule/Makefile
@@ -8,5 +8,7 @@
 MASTERDIR=	${.CURDIR}/../t-gnus
 
 EMACS_PORT_NAME=	xemacs21-mule
+EMACS_W3M_LISP_FILE=	${LOCALBASE}/lib/xemacs/site-packages/lisp/w3m/shimbun.el
+
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index c7d123c71983..e0f34dbe3ea7 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
-TGNUSVERSION=	6_15_8-03-quimby
+TGNUSVERSION=	6_15_8-05-quimby
 EMACS_PORT_NAME?=emacs21
 EMACS_W3M_PORT_NAME?=	emacs-w3m
 EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
@@ -49,7 +49,7 @@ MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 .else
 MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}
 .endif
-MIMEUI_COOKIE=		${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+MIMEUI_COOKIE=		semi-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
 
 .if (${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule")
 MANIFEST=		MANIFEST.t-gnus
diff --git a/news/t-gnus/distinfo b/news/t-gnus/distinfo
index 3dacc7016fd4..5b805161c2b3 100644
--- a/news/t-gnus/distinfo
+++ b/news/t-gnus/distinfo
@@ -1 +1 @@
-MD5 (t-gnus-6_15_8-03-quimby.tar.gz) = 5ef2951765a5bc40c4a5fafbddef048c
+MD5 (t-gnus-6_15_8-05-quimby.tar.gz) = 2a3436ee55d0f154e78d16a53fee8f13
diff --git a/news/t-gnus/pkg-message b/news/t-gnus/pkg-message
index a7918396d0ce..c99b93dd3153 100644
--- a/news/t-gnus/pkg-message
+++ b/news/t-gnus/pkg-message
@@ -1,6 +1,6 @@
 ************************************************************
 * Before using T-gnus, you must add the following line to  *
-* your own .emacs file.                                    *
+* your .emacs.                                             *
 *                                                          *
 * (require 't-gnus-startup)                                *
 ************************************************************
diff --git a/news/t-gnus/pkg-plist.emacs20 b/news/t-gnus/pkg-plist.emacs20
index 38c23557f428..5557714fbbd5 100644
--- a/news/t-gnus/pkg-plist.emacs20
+++ b/news/t-gnus/pkg-plist.emacs20
@@ -143,42 +143,27 @@
 %%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
@@ -271,6 +256,8 @@
 %%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-stat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam-stat.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
diff --git a/news/t-gnus/pkg-plist.emacs21 b/news/t-gnus/pkg-plist.emacs21
index a0dbdaae8967..219dcec801b9 100644
--- a/news/t-gnus/pkg-plist.emacs21
+++ b/news/t-gnus/pkg-plist.emacs21
@@ -141,42 +141,27 @@
 %%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
@@ -273,6 +258,8 @@
 %%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-stat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam-stat.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
diff --git a/news/t-gnus/pkg-plist.mule b/news/t-gnus/pkg-plist.mule
index 87323189ffd0..27e24134ec40 100644
--- a/news/t-gnus/pkg-plist.mule
+++ b/news/t-gnus/pkg-plist.mule
@@ -145,42 +145,27 @@
 %%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
@@ -269,6 +254,8 @@
 %%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-stat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/t-gnus/spam-stat.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
diff --git a/news/t-gnus/pkg-plist.xemacs21-mule b/news/t-gnus/pkg-plist.xemacs21-mule
index 27df63f905fc..75dbf92036d8 100644
--- a/news/t-gnus/pkg-plist.xemacs21-mule
+++ b/news/t-gnus/pkg-plist.xemacs21-mule
@@ -149,8 +149,6 @@
 %%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
@@ -158,35 +156,22 @@
 %%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-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
-%%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-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
@@ -287,6 +272,8 @@
 %%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-stat.el
+%%EMACS_PACKAGESDIR%%/lisp/t-gnus/spam-stat.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/spam.el
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/spam.elc
 %%EMACS_PACKAGESDIR%%/lisp/t-gnus/starttls.el