update to 2.4.1.

PR:		25951
Submitted by:	maintainer

7 files changed, 26 insertions, 35 deletions

diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 92adca79d7ad..268bfd8f4401 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
 		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
-		ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/
+		http://www.jpl.org/elips/wl/
+
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	wl-${PORTVERSION}
 
@@ -28,7 +29,7 @@ EMACS_PORT_NAME=	emacs
 .endif
 
 .if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-	${EMACS_PORT_NAME} == "xemacs21-mule")
+     ${EMACS_PORT_NAME} == "xemacs21-mule")
 WITH_MULE=yes
 .else
 WITHOUT_MULE=yes
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 524535e149df..c21fbc5144b1 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-2.4.0.tar.gz) = 5754b06b87aba82d9e8acf3f1721ab76
+MD5 (wl-2.4.1.tar.gz) = 528ee07fd61b05d985cd179d6cc3189d
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
index 24aa2bc49315..23ca97ee4121 100644
--- a/mail/wanderlust/pkg-plist.emacs
+++ b/mail/wanderlust/pkg-plist.emacs
@@ -129,12 +129,10 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index ddec0f6e261c..2ea98a853197 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -133,12 +133,10 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
diff --git a/mail/wanderlust/pkg-plist.mule b/mail/wanderlust/pkg-plist.mule
index d0560a4602c2..34edc28fcd34 100644
--- a/mail/wanderlust/pkg-plist.mule
+++ b/mail/wanderlust/pkg-plist.mule
@@ -130,12 +130,10 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
diff --git a/mail/wanderlust/pkg-plist.xemacs20 b/mail/wanderlust/pkg-plist.xemacs20
index 2e3e53616309..a10143b2358a 100644
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ b/mail/wanderlust/pkg-plist.xemacs20
@@ -182,12 +182,10 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
 %%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
 @unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
 info/wl.info
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index fb3331e495ec..47ca4bf2227e 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -187,12 +187,10 @@
 %%EMACS_PACKAGESDIR%%/lisp/wl/sha1.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/sasl.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/sasl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-cram.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-cram.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-digest.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-digest.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wanderlust-startup.el
 %%EMACS_PACKAGESDIR%%/info/wl-ja.info
 %%EMACS_PACKAGESDIR%%/info/wl.info