(mail/wl-git) Fix build, pkglint -F

wl-git/Makefile

@@ -28,8 +28,8 @@ INFO_FILES=	YES
 SUBST_CLASSES+=			icon_directory
 SUBST_STAGE.icon_directory=	pre-configure
 SUBST_MESSAGE.icon_directory=	Fixing wl-icon-directory default value (defvar)
-SUBST_FILES.icon_directory=	${WRKSRC}/wl/wl-vars.el
-SUBST_SED.icon_directory=	-e 's|%%PREFIX%%|${PREFIX}|'
+SUBST_FILES.icon_directory=	wl/wl-vars.el
+SUBST_VARS.icon_directory+=	PREFIX
 
 DOCDIR=			${PREFIX}/share/doc/wl
 EXAMPLESDIR=		${PREFIX}/share/examples/wl
@@ -39,10 +39,10 @@ INSTALLATION_DIRS=	${DOCDIR}/en ${DOCDIR}/ja \
 
 EMACS_BUILDLINK=	# empty
 
-GIT_REPOSITORIES=       master
-GIT_REPO.master=        git://github.com/wanderlust/wanderlust.git
-GIT_MODULE.master=      wanderlust
-_GIT_FLAGS?=            --depth 1
+GIT_REPOSITORIES=	master
+GIT_REPO.master=	git://github.com/wanderlust/wanderlust.git
+GIT_MODULE.master=	wanderlust
+_GIT_FLAGS?=		--depth 1
 
 
 post-install:

wl-git/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/10/04 14:52:41 makoto Exp $
+@comment $NetBSD$
 info/wl-ja.info
 info/wl.info
 share/doc/wl/en/BUGS
@@ -7,163 +7,157 @@ share/doc/wl/en/README.md
 share/doc/wl/ja/BUGS.ja
 share/doc/wl/ja/NEWS.ja
 share/doc/wl/ja/README.ja
-share/emacs/site-lisp/wl/acap.el
-share/emacs/site-lisp/wl/acap.elc
-share/emacs/site-lisp/wl/bbdb-wl.el
-share/emacs/site-lisp/wl/bbdb-wl.elc
-share/emacs/site-lisp/wl/elmo-access.el
-share/emacs/site-lisp/wl/elmo-access.elc
-share/emacs/site-lisp/wl/elmo-archive.el
-share/emacs/site-lisp/wl/elmo-archive.elc
-share/emacs/site-lisp/wl/elmo-cache.el
-share/emacs/site-lisp/wl/elmo-cache.elc
-share/emacs/site-lisp/wl/elmo-date.el
-share/emacs/site-lisp/wl/elmo-date.elc
-share/emacs/site-lisp/wl/elmo-dop.el
-share/emacs/site-lisp/wl/elmo-dop.elc
-share/emacs/site-lisp/wl/elmo-file.el
-share/emacs/site-lisp/wl/elmo-file.elc
-share/emacs/site-lisp/wl/elmo-filter.el
-share/emacs/site-lisp/wl/elmo-filter.elc
-share/emacs/site-lisp/wl/elmo-flag.el
-share/emacs/site-lisp/wl/elmo-flag.elc
-share/emacs/site-lisp/wl/elmo-imap4.el
-share/emacs/site-lisp/wl/elmo-imap4.elc
-share/emacs/site-lisp/wl/elmo-internal.el
-share/emacs/site-lisp/wl/elmo-internal.elc
-share/emacs/site-lisp/wl/elmo-localdir.el
-share/emacs/site-lisp/wl/elmo-localdir.elc
-share/emacs/site-lisp/wl/elmo-localnews.el
-share/emacs/site-lisp/wl/elmo-localnews.elc
-share/emacs/site-lisp/wl/elmo-maildir.el
-share/emacs/site-lisp/wl/elmo-maildir.elc
-share/emacs/site-lisp/wl/elmo-map.el
-share/emacs/site-lisp/wl/elmo-map.elc
-share/emacs/site-lisp/wl/elmo-mime.el
-share/emacs/site-lisp/wl/elmo-mime.elc
-share/emacs/site-lisp/wl/elmo-msgdb.el
-share/emacs/site-lisp/wl/elmo-msgdb.elc
-share/emacs/site-lisp/wl/elmo-multi.el
-share/emacs/site-lisp/wl/elmo-multi.elc
-share/emacs/site-lisp/wl/elmo-net.el
-share/emacs/site-lisp/wl/elmo-net.elc
-share/emacs/site-lisp/wl/elmo-nntp.el
-share/emacs/site-lisp/wl/elmo-nntp.elc
-share/emacs/site-lisp/wl/elmo-null.el
-share/emacs/site-lisp/wl/elmo-null.elc
-share/emacs/site-lisp/wl/elmo-passwd.el
-share/emacs/site-lisp/wl/elmo-passwd.elc
-share/emacs/site-lisp/wl/elmo-pipe.el
-share/emacs/site-lisp/wl/elmo-pipe.elc
-share/emacs/site-lisp/wl/elmo-pop3.el
-share/emacs/site-lisp/wl/elmo-pop3.elc
-share/emacs/site-lisp/wl/elmo-rss.el
-share/emacs/site-lisp/wl/elmo-rss.elc
-share/emacs/site-lisp/wl/elmo-search.el
-share/emacs/site-lisp/wl/elmo-search.elc
-share/emacs/site-lisp/wl/elmo-sendlog.el
-share/emacs/site-lisp/wl/elmo-sendlog.elc
-${PLIST.emacs-w3m-current}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
-${PLIST.emacs-w3m-current}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
-share/emacs/site-lisp/wl/elmo-signal.el
-share/emacs/site-lisp/wl/elmo-signal.elc
-share/emacs/site-lisp/wl/elmo-spam.el
-share/emacs/site-lisp/wl/elmo-spam.elc
-share/emacs/site-lisp/wl/elmo-split.el
-share/emacs/site-lisp/wl/elmo-split.elc
-share/emacs/site-lisp/wl/elmo-util.el
-share/emacs/site-lisp/wl/elmo-util.elc
-share/emacs/site-lisp/wl/elmo-vars.el
-share/emacs/site-lisp/wl/elmo-vars.elc
-share/emacs/site-lisp/wl/elmo-version.el
-share/emacs/site-lisp/wl/elmo-version.elc
-share/emacs/site-lisp/wl/elmo.el
-share/emacs/site-lisp/wl/elmo.elc
-share/emacs/site-lisp/wl/elsp-bogofilter.el
-share/emacs/site-lisp/wl/elsp-bogofilter.elc
-share/emacs/site-lisp/wl/elsp-bsfilter.el
-share/emacs/site-lisp/wl/elsp-bsfilter.elc
-share/emacs/site-lisp/wl/elsp-sa.el
-share/emacs/site-lisp/wl/elsp-sa.elc
-share/emacs/site-lisp/wl/elsp-spamoracle.el
-share/emacs/site-lisp/wl/elsp-spamoracle.elc
-share/emacs/site-lisp/wl/im-wl.el
-share/emacs/site-lisp/wl/im-wl.elc
-share/emacs/site-lisp/wl/mmimap.el
-share/emacs/site-lisp/wl/mmimap.elc
-share/emacs/site-lisp/wl/modb-entity.el
-share/emacs/site-lisp/wl/modb-entity.elc
-share/emacs/site-lisp/wl/modb-legacy.el
-share/emacs/site-lisp/wl/modb-legacy.elc
-share/emacs/site-lisp/wl/modb-standard.el
-share/emacs/site-lisp/wl/modb-standard.elc
-share/emacs/site-lisp/wl/modb.el
-share/emacs/site-lisp/wl/modb.elc
-share/emacs/site-lisp/wl/pldap.el
-share/emacs/site-lisp/wl/pldap.elc
-share/emacs/site-lisp/wl/rfc2368.el
-share/emacs/site-lisp/wl/rfc2368.elc
-share/emacs/site-lisp/wl/slp.el
-share/emacs/site-lisp/wl/slp.elc
-share/emacs/site-lisp/wl/ssl.el
-share/emacs/site-lisp/wl/ssl.elc
-share/emacs/site-lisp/wl/wl-acap.el
-share/emacs/site-lisp/wl/wl-acap.elc
-share/emacs/site-lisp/wl/wl-action.el
-share/emacs/site-lisp/wl/wl-action.elc
-share/emacs/site-lisp/wl/wl-addrbook.el
-share/emacs/site-lisp/wl/wl-addrbook.elc
-share/emacs/site-lisp/wl/wl-address.el
-share/emacs/site-lisp/wl/wl-address.elc
-share/emacs/site-lisp/wl/wl-addrmgr.el
-share/emacs/site-lisp/wl/wl-addrmgr.elc
-share/emacs/site-lisp/wl/wl-batch.el
-share/emacs/site-lisp/wl/wl-batch.elc
-share/emacs/site-lisp/wl/wl-complete.el
-share/emacs/site-lisp/wl/wl-complete.elc
-share/emacs/site-lisp/wl/wl-demo.el
-share/emacs/site-lisp/wl/wl-demo.elc
-share/emacs/site-lisp/wl/wl-draft.el
-share/emacs/site-lisp/wl/wl-draft.elc
-share/emacs/site-lisp/wl/wl-e21.el
-share/emacs/site-lisp/wl/wl-e21.elc
-share/emacs/site-lisp/wl/wl-expire.el
-share/emacs/site-lisp/wl/wl-expire.elc
-share/emacs/site-lisp/wl/wl-fldmgr.el
-share/emacs/site-lisp/wl/wl-fldmgr.elc
-share/emacs/site-lisp/wl/wl-folder.el
-share/emacs/site-lisp/wl/wl-folder.elc
-share/emacs/site-lisp/wl/wl-highlight.el
-share/emacs/site-lisp/wl/wl-highlight.elc
-share/emacs/site-lisp/wl/wl-mailto.el
-share/emacs/site-lisp/wl/wl-mailto.elc
-share/emacs/site-lisp/wl/wl-message.el
-share/emacs/site-lisp/wl/wl-message.elc
-share/emacs/site-lisp/wl/wl-mime.el
-share/emacs/site-lisp/wl/wl-mime.elc
-share/emacs/site-lisp/wl/wl-news.el
-share/emacs/site-lisp/wl/wl-qs.el
-share/emacs/site-lisp/wl/wl-qs.elc
-share/emacs/site-lisp/wl/wl-refile.el
-share/emacs/site-lisp/wl/wl-refile.elc
-share/emacs/site-lisp/wl/wl-score.el
-share/emacs/site-lisp/wl/wl-score.elc
-share/emacs/site-lisp/wl/wl-spam.el
-share/emacs/site-lisp/wl/wl-spam.elc
-share/emacs/site-lisp/wl/wl-summary.el
-share/emacs/site-lisp/wl/wl-summary.elc
-share/emacs/site-lisp/wl/wl-template.el
-share/emacs/site-lisp/wl/wl-template.elc
-share/emacs/site-lisp/wl/wl-thread.el
-share/emacs/site-lisp/wl/wl-thread.elc
-share/emacs/site-lisp/wl/wl-util.el
-share/emacs/site-lisp/wl/wl-util.elc
-share/emacs/site-lisp/wl/wl-vars.el
-share/emacs/site-lisp/wl/wl-vars.elc
-share/emacs/site-lisp/wl/wl-version.el
-share/emacs/site-lisp/wl/wl-version.elc
-share/emacs/site-lisp/wl/wl.el
-share/emacs/site-lisp/wl/wl.elc
+${EMACS_LISPPREFIX}/wl/acap.el
+${EMACS_LISPPREFIX}/wl/acap.elc
+${EMACS_LISPPREFIX}/wl/elmo-access.el
+${EMACS_LISPPREFIX}/wl/elmo-access.elc
+${EMACS_LISPPREFIX}/wl/elmo-archive.el
+${EMACS_LISPPREFIX}/wl/elmo-archive.elc
+${EMACS_LISPPREFIX}/wl/elmo-cache.el
+${EMACS_LISPPREFIX}/wl/elmo-cache.elc
+${EMACS_LISPPREFIX}/wl/elmo-date.el
+${EMACS_LISPPREFIX}/wl/elmo-date.elc
+${EMACS_LISPPREFIX}/wl/elmo-dop.el
+${EMACS_LISPPREFIX}/wl/elmo-dop.elc
+${EMACS_LISPPREFIX}/wl/elmo-file.el
+${EMACS_LISPPREFIX}/wl/elmo-file.elc
+${EMACS_LISPPREFIX}/wl/elmo-filter.el
+${EMACS_LISPPREFIX}/wl/elmo-filter.elc
+${EMACS_LISPPREFIX}/wl/elmo-flag.el
+${EMACS_LISPPREFIX}/wl/elmo-flag.elc
+${EMACS_LISPPREFIX}/wl/elmo-imap4.el
+${EMACS_LISPPREFIX}/wl/elmo-imap4.elc
+${EMACS_LISPPREFIX}/wl/elmo-internal.el
+${EMACS_LISPPREFIX}/wl/elmo-internal.elc
+${EMACS_LISPPREFIX}/wl/elmo-localdir.el
+${EMACS_LISPPREFIX}/wl/elmo-localdir.elc
+${EMACS_LISPPREFIX}/wl/elmo-localnews.el
+${EMACS_LISPPREFIX}/wl/elmo-localnews.elc
+${EMACS_LISPPREFIX}/wl/elmo-maildir.el
+${EMACS_LISPPREFIX}/wl/elmo-maildir.elc
+${EMACS_LISPPREFIX}/wl/elmo-map.el
+${EMACS_LISPPREFIX}/wl/elmo-map.elc
+${EMACS_LISPPREFIX}/wl/elmo-mime.el
+${EMACS_LISPPREFIX}/wl/elmo-mime.elc
+${EMACS_LISPPREFIX}/wl/elmo-msgdb.el
+${EMACS_LISPPREFIX}/wl/elmo-msgdb.elc
+${EMACS_LISPPREFIX}/wl/elmo-multi.el
+${EMACS_LISPPREFIX}/wl/elmo-multi.elc
+${EMACS_LISPPREFIX}/wl/elmo-net.el
+${EMACS_LISPPREFIX}/wl/elmo-net.elc
+${EMACS_LISPPREFIX}/wl/elmo-nntp.el
+${EMACS_LISPPREFIX}/wl/elmo-nntp.elc
+${EMACS_LISPPREFIX}/wl/elmo-null.el
+${EMACS_LISPPREFIX}/wl/elmo-null.elc
+${EMACS_LISPPREFIX}/wl/elmo-passwd.el
+${EMACS_LISPPREFIX}/wl/elmo-passwd.elc
+${EMACS_LISPPREFIX}/wl/elmo-pipe.el
+${EMACS_LISPPREFIX}/wl/elmo-pipe.elc
+${EMACS_LISPPREFIX}/wl/elmo-pop3.el
+${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
+${EMACS_LISPPREFIX}/wl/elmo-rss.el
+${EMACS_LISPPREFIX}/wl/elmo-rss.elc
+${EMACS_LISPPREFIX}/wl/elmo-search.el
+${EMACS_LISPPREFIX}/wl/elmo-search.elc
+${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
+${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc
+${EMACS_LISPPREFIX}/wl/elmo-signal.el
+${EMACS_LISPPREFIX}/wl/elmo-signal.elc
+${EMACS_LISPPREFIX}/wl/elmo-spam.el
+${EMACS_LISPPREFIX}/wl/elmo-spam.elc
+${EMACS_LISPPREFIX}/wl/elmo-split.el
+${EMACS_LISPPREFIX}/wl/elmo-split.elc
+${EMACS_LISPPREFIX}/wl/elmo-util.el
+${EMACS_LISPPREFIX}/wl/elmo-util.elc
+${EMACS_LISPPREFIX}/wl/elmo-vars.el
+${EMACS_LISPPREFIX}/wl/elmo-vars.elc
+${EMACS_LISPPREFIX}/wl/elmo-version.el
+${EMACS_LISPPREFIX}/wl/elmo-version.elc
+${EMACS_LISPPREFIX}/wl/elmo.el
+${EMACS_LISPPREFIX}/wl/elmo.elc
+${EMACS_LISPPREFIX}/wl/elsp-bogofilter.el
+${EMACS_LISPPREFIX}/wl/elsp-bogofilter.elc
+${EMACS_LISPPREFIX}/wl/elsp-bsfilter.el
+${EMACS_LISPPREFIX}/wl/elsp-bsfilter.elc
+${EMACS_LISPPREFIX}/wl/elsp-sa.el
+${EMACS_LISPPREFIX}/wl/elsp-sa.elc
+${EMACS_LISPPREFIX}/wl/elsp-spamoracle.el
+${EMACS_LISPPREFIX}/wl/elsp-spamoracle.elc
+${EMACS_LISPPREFIX}/wl/im-wl.el
+${EMACS_LISPPREFIX}/wl/im-wl.elc
+${EMACS_LISPPREFIX}/wl/mmimap.el
+${EMACS_LISPPREFIX}/wl/mmimap.elc
+${EMACS_LISPPREFIX}/wl/modb-entity.el
+${EMACS_LISPPREFIX}/wl/modb-entity.elc
+${EMACS_LISPPREFIX}/wl/modb-legacy.el
+${EMACS_LISPPREFIX}/wl/modb-legacy.elc
+${EMACS_LISPPREFIX}/wl/modb-standard.el
+${EMACS_LISPPREFIX}/wl/modb-standard.elc
+${EMACS_LISPPREFIX}/wl/modb.el
+${EMACS_LISPPREFIX}/wl/modb.elc
+${EMACS_LISPPREFIX}/wl/pldap.el
+${EMACS_LISPPREFIX}/wl/pldap.elc
+${EMACS_LISPPREFIX}/wl/slp.el
+${EMACS_LISPPREFIX}/wl/slp.elc
+${EMACS_LISPPREFIX}/wl/ssl.el
+${EMACS_LISPPREFIX}/wl/ssl.elc
+${EMACS_LISPPREFIX}/wl/wl-acap.el
+${EMACS_LISPPREFIX}/wl/wl-acap.elc
+${EMACS_LISPPREFIX}/wl/wl-action.el
+${EMACS_LISPPREFIX}/wl/wl-action.elc
+${EMACS_LISPPREFIX}/wl/wl-addrbook.el
+${EMACS_LISPPREFIX}/wl/wl-addrbook.elc
+${EMACS_LISPPREFIX}/wl/wl-address.el
+${EMACS_LISPPREFIX}/wl/wl-address.elc
+${EMACS_LISPPREFIX}/wl/wl-addrmgr.el
+${EMACS_LISPPREFIX}/wl/wl-addrmgr.elc
+${EMACS_LISPPREFIX}/wl/wl-batch.el
+${EMACS_LISPPREFIX}/wl/wl-batch.elc
+${EMACS_LISPPREFIX}/wl/wl-complete.el
+${EMACS_LISPPREFIX}/wl/wl-complete.elc
+${EMACS_LISPPREFIX}/wl/wl-demo.el
+${EMACS_LISPPREFIX}/wl/wl-demo.elc
+${EMACS_LISPPREFIX}/wl/wl-draft.el
+${EMACS_LISPPREFIX}/wl/wl-draft.elc
+${EMACS_LISPPREFIX}/wl/wl-e21.el
+${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${EMACS_LISPPREFIX}/wl/wl-expire.el
+${EMACS_LISPPREFIX}/wl/wl-expire.elc
+${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
+${EMACS_LISPPREFIX}/wl/wl-fldmgr.elc
+${EMACS_LISPPREFIX}/wl/wl-folder.el
+${EMACS_LISPPREFIX}/wl/wl-folder.elc
+${EMACS_LISPPREFIX}/wl/wl-highlight.el
+${EMACS_LISPPREFIX}/wl/wl-highlight.elc
+${EMACS_LISPPREFIX}/wl/wl-mailto.el
+${EMACS_LISPPREFIX}/wl/wl-mailto.elc
+${EMACS_LISPPREFIX}/wl/wl-message.el
+${EMACS_LISPPREFIX}/wl/wl-message.elc
+${EMACS_LISPPREFIX}/wl/wl-mime.el
+${EMACS_LISPPREFIX}/wl/wl-mime.elc
+${EMACS_LISPPREFIX}/wl/wl-news.el
+${EMACS_LISPPREFIX}/wl/wl-qs.el
+${EMACS_LISPPREFIX}/wl/wl-qs.elc
+${EMACS_LISPPREFIX}/wl/wl-refile.el
+${EMACS_LISPPREFIX}/wl/wl-refile.elc
+${EMACS_LISPPREFIX}/wl/wl-score.el
+${EMACS_LISPPREFIX}/wl/wl-score.elc
+${EMACS_LISPPREFIX}/wl/wl-spam.el
+${EMACS_LISPPREFIX}/wl/wl-spam.elc
+${EMACS_LISPPREFIX}/wl/wl-summary.el
+${EMACS_LISPPREFIX}/wl/wl-summary.elc
+${EMACS_LISPPREFIX}/wl/wl-template.el
+${EMACS_LISPPREFIX}/wl/wl-template.elc
+${EMACS_LISPPREFIX}/wl/wl-thread.el
+${EMACS_LISPPREFIX}/wl/wl-thread.elc
+${EMACS_LISPPREFIX}/wl/wl-util.el
+${EMACS_LISPPREFIX}/wl/wl-util.elc
+${EMACS_LISPPREFIX}/wl/wl-vars.el
+${EMACS_LISPPREFIX}/wl/wl-vars.elc
+${EMACS_LISPPREFIX}/wl/wl-version.el
+${EMACS_LISPPREFIX}/wl/wl-version.elc
+${EMACS_LISPPREFIX}/wl/wl.el
+${EMACS_LISPPREFIX}/wl/wl.elc
 share/examples/wl/en/dot.addresses
 share/examples/wl/en/dot.folders
 share/examples/wl/en/dot.wl
@@ -254,4 +248,3 @@ share/wl/wl-summary-reply-with-citation-up.xpm
 share/wl/wl-summary-set-flags-up.xpm
 share/wl/wl-summary-sync-force-update-up.xpm
 share/wl/wl-write-current-folder-up.xpm
-@comment $NetBSD: PLIST,v 1.7 2013/10/04 14:52:41 makoto Exp $

wl-git/distinfo

@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.10 2015/01/29 07:15:12 jgoamakf Exp $
 
 SHA1 (patch-aa) = 5c27e70a747e4ace03991e7d361c83aa844d4d13
-SHA1 (patch-ab) = 94d52fa4a3adef42d89bc32e1ea5252483ad6637
+SHA1 (patch-ab) = 0061393ef4ce0183b62f487b9669c11704c1662b
+SHA1 (patch-wl_wl-folder.el) = f2b147f1e650e2241396e25dcb505dd18497c6e9
 SHA1 (patch-wl_wl-summary_el) = 940a7632c6e417cde24e2a0ca84f33f7e4ad5eaf

wl-git/patches/patch-ab

@@ -5,19 +5,14 @@ and the icons won't be displayed such setup.
 
 --- wl/wl-vars.el.orig	2020-10-16 12:33:17.000000000 +0000
 +++ wl/wl-vars.el
-@@ -162,9 +162,13 @@ Supersede `wl-user-mail-address-list'."
-   :type 'directory
+@@ -163,8 +163,8 @@ Supersede `wl-user-mail-address-list'."
    :group 'wl)
  
-+
  (defcustom wl-icon-directory
 -  (or (let ((icons (expand-file-name "wl/icons/"
 -				     data-directory)))
-+
-+								+                                                            
-+				    
 +  (or (let ((icons (expand-file-name "share/wl"
-+                                       "%%PREFIX%%")))
++				     "@PREFIX@")))
  	(if (file-directory-p icons)
              icons))
        (if load-file-name