- Integrate mail/wanderlust-devel into mail/wanderlust.

- Update to the snapshot on 2018/03/17.

13 files changed, 64 insertions, 138 deletions

diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index f9e00d31b984..88e21e213893 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -2,37 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	wanderlust
-PORTVERSION=	2.14.0
-PORTREVISION=	19
+PORTVERSION=	2.15.9.b.${SNAPDATE}
 CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		http://www.jpl.org/elips/wl/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-DISTNAME=	wl-${DISTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Mail and news system for Emacs
 
-LICENSE=	GPLv2+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
-		emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR}
-RUN_DEPENDS=	semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
-		emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR}
+BUILD_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
+		x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR}
+RUN_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR}
 
 USES=		emacs
 EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # www/emacs-w3m fails to configure
+USE_GITHUB=	yes
+GH_TAGNAME=	f0c8c4e
 
 NO_ARCH=	yes
-CONFLICTS=	wanderlust-devel
+SNAPDATE=	20180317
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD} \
 		FLAGS="-batch -q -no-site-file" \
 		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} \
 		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
 		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons
-ALL_TARGET=	all info
-INSTALL_TARGET=	install install-info
 
 INFO=		wl wl-ja
 PORTDATA=	ja.Emacs
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 8aacbbafc532..df999993289d 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wl-2.14.0.tar.gz) = 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f
-SIZE (wl-2.14.0.tar.gz) = 1101505
+TIMESTAMP = 1521635995
+SHA256 (wanderlust-wanderlust-2.15.9.b.20180317-f0c8c4e_GH0.tar.gz) = 120b6a400d25d0f3b90ed6b10a32fbb2285c0fd80f4c06d8eee414c421dbfb78
+SIZE (wanderlust-wanderlust-2.15.9.b.20180317-f0c8c4e_GH0.tar.gz) = 1205062
diff --git a/mail/wanderlust/files/_pkg.el b/mail/wanderlust/files/_pkg.el
deleted file mode 100644
index 0b9ea2f42b1f..000000000000
--- a/mail/wanderlust/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'wl
-                 :version 2.12
-                 :type 'regular)
diff --git a/mail/wanderlust/files/extra-patch-WL-MK b/mail/wanderlust/files/extra-patch-WL-MK
deleted file mode 100644
index 900a39e7ce4d..000000000000
--- a/mail/wanderlust/files/extra-patch-WL-MK
+++ /dev/null
@@ -1,13 +0,0 @@
---- WL-MK.orig	Sun Nov 27 22:32:36 2005
-+++ WL-MK	Sun Nov 27 22:33:20 2005
-@@ -115,8 +115,8 @@
-     (load "./WL-ELS" nil nil t)
-     ;; product.el version check
-     (require 'product)
--    (if (not (fboundp 'product-version-as-string))
--	(error "Please install new APEL.  See INSTALL or INSTALL.ja"))
-+;    (if (not (fboundp 'product-version-as-string))
-+;	(error "Please install new APEL.  See INSTALL or INSTALL.ja"))
-     ;; smtp.el version check.
-     (require 'smtp)
-     (if (not (fboundp 'smtp-send-buffer))
diff --git a/mail/wanderlust/files/patch-Makefile b/mail/wanderlust/files/patch-Makefile
index 8584bf73d3f0..5435eab8971c 100644
--- a/mail/wanderlust/files/patch-Makefile
+++ b/mail/wanderlust/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2005-01-23 10:10:44 UTC
+--- Makefile.orig	2017-06-28 06:06:07 UTC
 +++ Makefile
 @@ -91,7 +91,7 @@ install-package:
  		$(PACKAGEDIR) $(PIXMAPDIR)
@@ -9,3 +9,15 @@
  
  install-info:
  	$(EMACS) $(FLAGS) -l WL-MK -f install-wl-info $(INFODIR)
+@@ -109,9 +109,9 @@ mostlyclean-dvi:
+ clean-dvi: mostlyclean-dvi
+ 	rm -f doc/*.dvi
+ 
+-all: elc
++all: elc info
+ 
+-install: install-elc
++install: install-elc install-info
+ 
+ uninstall: uninstall-elc
+ 
diff --git a/mail/wanderlust/files/patch-WL-MK b/mail/wanderlust/files/patch-WL-MK
new file mode 100644
index 000000000000..f6ae6ddf306e
--- /dev/null
+++ b/mail/wanderlust/files/patch-WL-MK
@@ -0,0 +1,20 @@
+--- WL-MK.orig	2017-06-28 06:06:07 UTC
++++ WL-MK
+@@ -131,7 +131,7 @@
+     (defvar PIXMAPDIR
+       (if (string= pixmap-dir "NONE")
+ 	  (if packagedir
+-	      (expand-file-name "etc/wl/" packagedir)
++	      (expand-file-name "wl/icons/" packagedir)
+ 	    (expand-file-name "wl/icons/" data-directory))
+ 	pixmap-dir)))
+   (if PIXMAPDIR
+@@ -148,7 +148,7 @@
+   (princ (format "LISPDIR is %s\n" LISPDIR))
+   (setq command-line-args-left (cdr command-line-args-left))
+   ;; PIXMAPDIR check.
+-  (config-wl-pixmap-dir)
++  (config-wl-pixmap-dir "%%EMACS_LIBDIR_WITH_VER%%/etc")
+   (princ "\n"))
+ 
+ (defun update-version ()
diff --git a/mail/wanderlust/files/patch-samples_en_dot.wl b/mail/wanderlust/files/patch-samples_en_dot.wl
index 107316f6d4e2..dc2652fa7925 100644
--- a/mail/wanderlust/files/patch-samples_en_dot.wl
+++ b/mail/wanderlust/files/patch-samples_en_dot.wl
@@ -1,6 +1,6 @@
---- samples/en/dot.wl.orig	2004-11-26 03:59:36 UTC
+--- samples/en/dot.wl.orig	2017-06-28 06:06:07 UTC
 +++ samples/en/dot.wl
-@@ -314,7 +314,7 @@
+@@ -327,7 +327,7 @@
  
  	;; for Emacs21
  	((and (not (featurep 'xemacs))
diff --git a/mail/wanderlust/files/patch-samples_ja_dot.wl b/mail/wanderlust/files/patch-samples_ja_dot.wl
index f3c74da58840..2a68eaef78d0 100644
--- a/mail/wanderlust/files/patch-samples_ja_dot.wl
+++ b/mail/wanderlust/files/patch-samples_ja_dot.wl
@@ -1,6 +1,6 @@
---- samples/ja/dot.wl.orig	2004-11-26 03:59:37 UTC
+--- samples/ja/dot.wl.orig	2017-06-28 06:06:07 UTC
 +++ samples/ja/dot.wl
-@@ -320,7 +320,7 @@
+@@ -332,7 +332,7 @@
  
  	;; for Emacs21
  	((and (not (featurep 'xemacs))
diff --git a/mail/wanderlust/files/patch-utils_ptexinfmt.el b/mail/wanderlust/files/patch-utils_ptexinfmt.el
deleted file mode 100644
index 25d938a645c6..000000000000
--- a/mail/wanderlust/files/patch-utils_ptexinfmt.el
+++ /dev/null
@@ -1,80 +0,0 @@
---- utils/ptexinfmt.el.orig	2005-02-24 08:16:41 UTC
-+++ utils/ptexinfmt.el
-@@ -68,50 +68,50 @@ This is last argument in `ptexinfmt-brok
-   "Declare a symbol FACILITY is broken if ASSERTION is nil.
- DOCSTRING will be printed if ASSERTION is nil and
- `ptexinfmt-disable-broken-notice-flag' is nil."
--  (` (let ((facility '(, facility))
--	   (docstring (, docstring))
--	   (assertion (eval '(, assertion))))
-+  `(let ((facility ',facility)
-+	   (docstring ,docstring)
-+	   (assertion (eval ,assertion)))
-        (put facility 'broken (not assertion))
-        (if assertion
- 	   nil
- 	 (put facility 'broken-docstring docstring)
- 	 (if ptexinfmt-disable-broken-notice-flag
- 	     nil
--	   (message "BROKEN FACILITY DETECTED: %s" docstring))))))
-+	   (message "BROKEN FACILITY DETECTED: %s" docstring)))))
- 
- (put 'ptexinfmt-defun-if-broken 'lisp-indent-function 'defun)
- (defmacro ptexinfmt-defun-if-broken (&rest args)
-   "Redefine a function just like `defun' if it is considered broken."
-   (let ((name (list 'quote (car args))))
-     (setq args (cdr args))
--    (` (prog1
--	   (, name)
--	 (if (get (, name) 'broken)
--	     (defalias (, name)
--	       (function (lambda (,@ args)))))))))
-+    `(prog1
-+	   ,name
-+	 (if (get ,name 'broken)
-+	     (defalias ,name
-+	       (function (lambda ,@args)))))))
- 
- (put 'ptexinfmt-defun-if-void 'lisp-indent-function 'defun)
- (defmacro ptexinfmt-defun-if-void (&rest args)
-   "Define a function just like `defun' unless it is already defined."
-   (let ((name (list 'quote (car args))))
-     (setq args (cdr args))
--    (` (prog1
--	   (, name)
--	 (if (fboundp (, name))
-+    `(prog1
-+	   ,name
-+	 (if (fboundp ,name)
- 	     nil
--	   (defalias (, name)
--	     (function (lambda (,@ args)))))))))
-+	   (defalias ,name
-+	     (function (lambda ,@args)))))))
- 
- (put 'ptexinfmt-defvar-if-void 'lisp-indent-function 'defun)
- (defmacro ptexinfmt-defvar-if-void (&rest args)
-   "Define a variable just like `defvar' unless it is already defined."
-   (let ((name (car args)))
-     (setq args (cdr args))
--    (` (prog1
--	   (defvar (, name))
--	 (if (boundp '(, name))
-+    `(prog1
-+	   (defvar ,name)
-+	 (if (boundp ',name)
- 	     nil
--	   (defvar (, name) (,@ args)))))))
-+	   (defvar ,name ,@args)))))
- 
- ;; sort -fd
- (ptexinfmt-broken-facility texinfo-format-printindex
-@@ -509,7 +509,7 @@ For example, @verb\{|@|\} results in @ a
-   (goto-char texinfo-command-start))
- 
- ;; @,{c}	==>	c,	cedilla accent
--(put ', 'texinfo-format 'texinfo-format-cedilla-accent)
-+(put '\, 'texinfo-format 'texinfo-format-cedilla-accent)
- (ptexinfmt-defun-if-void texinfo-format-cedilla-accent ()
-   (insert (texinfo-parse-arg-discard) ",")
-   (goto-char texinfo-command-start))
diff --git a/mail/wanderlust/files/patch-wl_wl-draft.el b/mail/wanderlust/files/patch-wl_wl-draft.el
deleted file mode 100644
index 2be9d7e543b0..000000000000
--- a/mail/wanderlust/files/patch-wl_wl-draft.el
+++ /dev/null
@@ -1,13 +0,0 @@
---- wl/wl-draft.el.orig	2005-03-20 13:10:03 UTC
-+++ wl/wl-draft.el
-@@ -147,10 +147,6 @@ e.g.
- 	     (if (eq wl-smtp-connection-type 'ssl)
- 		 #'open-ssl-stream
- 	       smtp-open-connection-function))
--	    (smtp-end-of-line
--	     (if (eq wl-smtp-connection-type 'ssl)
--		 "\n"
--	       smtp-end-of-line))
- 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
-        (setq smtp-sasl-user-name wl-smtp-posting-user
- 	     smtp-sasl-properties (when wl-smtp-authenticate-realm
diff --git a/mail/wanderlust/pkg-descr b/mail/wanderlust/pkg-descr
index 33d18a3b061c..a16a99c0595d 100644
--- a/mail/wanderlust/pkg-descr
+++ b/mail/wanderlust/pkg-descr
@@ -18,4 +18,4 @@ The features of Wanderlust are as follows:
  * Compression Folder.
  * Automatic expiration of old messages.
 
-WWW: http://www.gohome.org/wl/
+WWW: https://github.com/wanderlust/wanderlust
diff --git a/mail/wanderlust/pkg-message b/mail/wanderlust/pkg-message
index 96f14e077749..add3dd434ba1 100644
--- a/mail/wanderlust/pkg-message
+++ b/mail/wanderlust/pkg-message
@@ -1,9 +1,10 @@
 ************************************************************
-* Before using Wanderlust, you must include the line below *
-* in one of your Emacs initialization files.               *
+* Before using Wanderlust, you must set following elisp    *
+* to your own .emacs file.                                 *
 *                                                          *
 * (require 'wanderlust-startup)                            *
 *                                                          *
 * Sample configuration files are installed into            *
-* ${PREFIX}/share/examples/wanderlust.                     *
+* ${PREFIX}/share/examples/wanderlust.  Please copy to     *
+* your home directory and edit them.                       *
 ************************************************************
diff --git a/mail/wanderlust/pkg-plist b/mail/wanderlust/pkg-plist
index 1e72c055e58e..35d9b61dbde1 100644
--- a/mail/wanderlust/pkg-plist
+++ b/mail/wanderlust/pkg-plist
@@ -122,16 +122,20 @@
 %%EMACS_SITE_LISPDIR%%/wl/elmo-multi.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-net.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-net.elc
-%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.el
-%%EMACS_SITE_LISPDIR%%/wl/elmo-nmz.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-nntp.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-null.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-null.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-passwd.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-pipe.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-pop3.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-rss.elc
+%%EMACS_SITE_LISPDIR%%/wl/elmo-search.el
+%%EMACS_SITE_LISPDIR%%/wl/elmo-search.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.el
 %%EMACS_SITE_LISPDIR%%/wl/elmo-sendlog.elc
 %%EMACS_SITE_LISPDIR%%/wl/elmo-shimbun.el
@@ -178,8 +182,6 @@
 %%EMACS_SITE_LISPDIR%%/wl/slp.elc
 %%EMACS_SITE_LISPDIR%%/wl/ssl.el
 %%EMACS_SITE_LISPDIR%%/wl/ssl.elc
-%%EMACS_SITE_LISPDIR%%/wl/utf7.el
-%%EMACS_SITE_LISPDIR%%/wl/utf7.elc
 %%EMACS_SITE_LISPDIR%%/wl/wl-acap.el
 %%EMACS_SITE_LISPDIR%%/wl/wl-acap.elc
 %%EMACS_SITE_LISPDIR%%/wl/wl-action.el
@@ -215,6 +217,8 @@
 %%EMACS_SITE_LISPDIR%%/wl/wl-mime.el
 %%EMACS_SITE_LISPDIR%%/wl/wl-mime.elc
 %%EMACS_SITE_LISPDIR%%/wl/wl-news.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-qs.el
+%%EMACS_SITE_LISPDIR%%/wl/wl-qs.elc
 %%EMACS_SITE_LISPDIR%%/wl/wl-refile.el
 %%EMACS_SITE_LISPDIR%%/wl/wl-refile.elc
 %%EMACS_SITE_LISPDIR%%/wl/wl-score.el