* Switch to a static PLIST instead of a dynamic one.

* List the info files directly in the PLIST.
* Install info files into EMACS_INFOPREFIX, which correctly honors
  PKGINFODIR when using emacs.

6 files changed, 271 insertions, 143 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 573dfb2f737..d6eda6dcebd 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/21 10:28:43 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/08 19:02:18 jlam Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,33 +15,24 @@ DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
+
 # XXX please someone adjust paths and PLIST for XEmacs...
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 
+BUILD_TARGET=	all info
+INSTALL_TARGET=	install install-info
+MAKE_FLAGS+=	INFODIR=${EMACS_INFOPREFIX:Q}
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	PIXMAPDIR=${PREFIX:Q}/share/wl
-INSTALL_TARGET=	install install-info
-INFO_FILES=	wl.info wl-ja.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/emacs.mk"
 
-DOCDIR=		${PREFIX}/share/doc/wl
-EXAMPLESDIR=	${PREFIX}/share/examples/wl
-
-PLIST_SRC=	${WRKDIR}/PLIST
+DOCDIR=			${PREFIX}/share/doc/wl
+EXAMPLESDIR=		${PREFIX}/share/examples/wl
+INSTALLATION_DIRS=	${DOCDIR} ${EXAMPLESDIR} ${EMACS_INFOPREFIX}
 
-post-build:
-	@set -e; \
-	{ \
-		${CAT} ${PKGDIR:Q}/PLIST.header; \
-		${FIND} ${WRKSRC:Q} -name '*.elc' -print | \
-		while read f; do \
-			g=`basename "$$f"`; \
-			${ECHO} '$${EMACS_LISPPREFIX}/wl/'$${g%.elc}.el; \
-			${ECHO} '$${EMACS_LISPPREFIX}/wl/'$$g; \
-		done | ${SORT}; \
-		${CAT} ${PKGDIR:Q}/PLIST.footer; \
-	} > ${PLIST_SRC}
+.include "../../security/openssl/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR:Q}/en
@@ -56,5 +47,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
 	@${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
new file mode 100644
index 00000000000..8d76b653ac6
--- /dev/null
+++ b/mail/wl/PLIST
@@ -0,0 +1,260 @@
+@comment $NetBSD: PLIST,v 1.6 2006/04/08 19:02:18 jlam Exp $
+${EMACS_INFOPREFIX}/wl-ja.info
+${EMACS_INFOPREFIX}/wl.info
+${EMACS_LISPPREFIX}/wl/acap.el
+${EMACS_LISPPREFIX}/wl/acap.elc
+${EMACS_LISPPREFIX}/wl/bbdb-wl.el
+${EMACS_LISPPREFIX}/wl/bbdb-wl.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-nmz.el
+${EMACS_LISPPREFIX}/wl/elmo-nmz.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-pipe.el
+${EMACS_LISPPREFIX}/wl/elmo-pipe.elc
+${EMACS_LISPPREFIX}/wl/elmo-pop3.el
+${EMACS_LISPPREFIX}/wl/elmo-pop3.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/rfc2368.el
+${EMACS_LISPPREFIX}/wl/rfc2368.elc
+${EMACS_LISPPREFIX}/wl/slp.el
+${EMACS_LISPPREFIX}/wl/slp.elc
+${EMACS_LISPPREFIX}/wl/ssl.el
+${EMACS_LISPPREFIX}/wl/ssl.elc
+${EMACS_LISPPREFIX}/wl/utf7.el
+${EMACS_LISPPREFIX}/wl/utf7.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-news.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/doc/wl/en/BUGS
+share/doc/wl/en/NEWS
+share/doc/wl/en/README
+share/doc/wl/ja/BUGS.ja
+share/doc/wl/ja/NEWS.ja
+share/doc/wl/ja/README.ja
+share/examples/wl/en/dot.addresses
+share/examples/wl/en/dot.folders
+share/examples/wl/en/dot.wl
+share/examples/wl/ja/dot.addresses
+share/examples/wl/ja/dot.folders
+share/examples/wl/ja/dot.wl
+${FOR_emacs21}share/wl/access.xpm
+${FOR_emacs21}share/wl/archive.xpm
+${FOR_emacs21}share/wl/closed.xpm
+${FOR_emacs21}share/wl/draft.xpm
+${FOR_emacs21}share/wl/elmo.xpm
+${FOR_emacs21}share/wl/file.xpm
+${FOR_emacs21}share/wl/filter.xpm
+${FOR_emacs21}share/wl/imap.xpm
+${FOR_emacs21}share/wl/internal.xpm
+${FOR_emacs21}share/wl/letter.xpm
+${FOR_emacs21}share/wl/local.xpm
+${FOR_emacs21}share/wl/localnews.xpm
+${FOR_emacs21}share/wl/maildir.xpm
+${FOR_emacs21}share/wl/multi.xpm
+${FOR_emacs21}share/wl/news.xpm
+${FOR_emacs21}share/wl/nmz.xpm
+${FOR_emacs21}share/wl/no-letter.xpm
+${FOR_emacs21}share/wl/opened.xpm
+${FOR_emacs21}share/wl/pipe.xpm
+${FOR_emacs21}share/wl/plugged.xpm
+${FOR_emacs21}share/wl/pop.xpm
+${FOR_emacs21}share/wl/queue.xpm
+${FOR_emacs21}share/wl/shimbun.xpm
+${FOR_emacs21}share/wl/trash-e.xpm
+${FOR_emacs21}share/wl/trash.xpm
+${FOR_emacs21}share/wl/unplugged.xpm
+share/wl/wl-alpha-logo.img
+share/wl/wl-alpha-logo.xbm
+${FOR_emacs21}share/wl/wl-alpha-logo.xpm
+share/wl/wl-alpha-xmas-logo.img
+share/wl/wl-alpha-xmas-logo.xbm
+${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xpm
+share/wl/wl-beta-logo.img
+share/wl/wl-beta-logo.xbm
+${FOR_emacs21}share/wl/wl-beta-logo.xpm
+share/wl/wl-beta-xmas-logo.img
+share/wl/wl-beta-xmas-logo.xbm
+${FOR_emacs21}share/wl/wl-beta-xmas-logo.xpm
+${FOR_emacs21}share/wl/wl-draft-insert-signature-up.xpm
+${FOR_emacs21}share/wl/wl-draft-kill-up.xpm
+${FOR_emacs21}share/wl/wl-draft-save-and-exit-up.xpm
+${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-down.xpm
+${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-up.xpm
+${FOR_emacs21}share/wl/wl-draft-up.xpm
+${FOR_emacs21}share/wl/wl-draft-yank-original-up.xpm
+${FOR_emacs21}share/wl/wl-exit-up.xpm
+${FOR_emacs21}share/wl/wl-folder-check-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-empty-trash-up.xpm
+${FOR_emacs21}share/wl/wl-folder-goto-draft-folder-up.xpm
+${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
+${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-next-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-prev-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-read-up.xpm
+${FOR_emacs21}share/wl/wl-folder-select-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-sync-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-zoom-entity-up.xpm
+${FOR_emacs21}share/wl/wl-message-extract-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-next-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-play-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-prev-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-quit-up.xpm
+${FOR_emacs21}share/wl/wl-message-read-up.xpm
+share/wl/wl-stable-logo.img
+share/wl/wl-stable-logo.xbm
+${FOR_emacs21}share/wl/wl-stable-logo.xpm
+share/wl/wl-stable-xmas-logo.img
+share/wl/wl-stable-xmas-logo.xbm
+${FOR_emacs21}share/wl/wl-stable-xmas-logo.xpm
+${FOR_emacs21}share/wl/wl-summary-delete-up.xpm
+${FOR_emacs21}share/wl/wl-summary-dispose-up.xpm
+${FOR_emacs21}share/wl/wl-summary-exit-up.xpm
+${FOR_emacs21}share/wl/wl-summary-forward-up.xpm
+${FOR_emacs21}share/wl/wl-summary-jump-to-current-message-up.xpm
+${FOR_emacs21}share/wl/wl-summary-next-page-up.xpm
+${FOR_emacs21}share/wl/wl-summary-next-up.xpm
+${FOR_emacs21}share/wl/wl-summary-prev-page-up.xpm
+${FOR_emacs21}share/wl/wl-summary-prev-up.xpm
+${FOR_emacs21}share/wl/wl-summary-read-up.xpm
+${FOR_emacs21}share/wl/wl-summary-reply-up.xpm
+${FOR_emacs21}share/wl/wl-summary-reply-with-citation-up.xpm
+${FOR_emacs21}share/wl/wl-summary-set-flags-up.xpm
+${FOR_emacs21}share/wl/wl-summary-sync-force-update-up.xpm
+${FOR_emacs21}share/wl/wl-write-current-folder-up.xpm
+@dirrm share/wl
+@dirrm share/wl
+@dirrm share/examples/wl/ja
+@dirrm share/examples/wl/en
+@dirrm share/examples/wl
+@dirrm share/doc/wl/ja
+@dirrm share/doc/wl/en
+@dirrm share/doc/wl
+@dirrm ${EMACS_LISPPREFIX}/wl
diff --git a/mail/wl/PLIST.footer b/mail/wl/PLIST.footer
deleted file mode 100644
index 9ea6c03ae77..00000000000
--- a/mail/wl/PLIST.footer
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.footer,v 1.1 2003/01/28 02:56:23 uebayasi Exp $
-@dirrm ${EMACS_LISPPREFIX}/wl
-@dirrm share/examples/wl/ja
-@dirrm share/examples/wl/en
-@dirrm share/examples/wl
-@dirrm share/wl
-@dirrm share/doc/wl/ja
-@dirrm share/doc/wl/en
-@dirrm share/doc/wl
diff --git a/mail/wl/PLIST.header b/mail/wl/PLIST.header
deleted file mode 100644
index e0461bc7e7c..00000000000
--- a/mail/wl/PLIST.header
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD: PLIST.header,v 1.6 2006/02/21 10:15:35 rillig Exp $
-share/doc/wl/en/BUGS
-share/doc/wl/en/NEWS
-share/doc/wl/en/README
-share/doc/wl/ja/BUGS.ja
-share/doc/wl/ja/NEWS.ja
-share/doc/wl/ja/README.ja
-share/examples/wl/en/dot.addresses
-share/examples/wl/en/dot.folders
-share/examples/wl/en/dot.wl
-share/examples/wl/ja/dot.addresses
-share/examples/wl/ja/dot.folders
-share/examples/wl/ja/dot.wl
-${FOR_emacs21}share/wl/access.xpm
-${FOR_emacs21}share/wl/archive.xpm
-${FOR_emacs21}share/wl/closed.xpm
-${FOR_emacs21}share/wl/draft.xpm
-${FOR_emacs21}share/wl/elmo.xpm
-${FOR_emacs21}share/wl/file.xpm
-${FOR_emacs21}share/wl/filter.xpm
-${FOR_emacs21}share/wl/imap.xpm
-${FOR_emacs21}share/wl/internal.xpm
-${FOR_emacs21}share/wl/letter.xpm
-${FOR_emacs21}share/wl/local.xpm
-${FOR_emacs21}share/wl/localnews.xpm
-${FOR_emacs21}share/wl/maildir.xpm
-${FOR_emacs21}share/wl/multi.xpm
-${FOR_emacs21}share/wl/news.xpm
-${FOR_emacs21}share/wl/nmz.xpm
-${FOR_emacs21}share/wl/no-letter.xpm
-${FOR_emacs21}share/wl/opened.xpm
-${FOR_emacs21}share/wl/pipe.xpm
-${FOR_emacs21}share/wl/plugged.xpm
-${FOR_emacs21}share/wl/pop.xpm
-${FOR_emacs21}share/wl/queue.xpm
-${FOR_emacs21}share/wl/shimbun.xpm
-${FOR_emacs21}share/wl/trash-e.xpm
-${FOR_emacs21}share/wl/trash.xpm
-${FOR_emacs21}share/wl/unplugged.xpm
-${FOR_emacs21}share/wl/wl-alpha-logo.xpm
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-draft-insert-signature-up.xpm
-${FOR_emacs21}share/wl/wl-draft-kill-up.xpm
-${FOR_emacs21}share/wl/wl-draft-save-and-exit-up.xpm
-${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-down.xpm
-${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-up.xpm
-${FOR_emacs21}share/wl/wl-draft-up.xpm
-${FOR_emacs21}share/wl/wl-draft-yank-original-up.xpm
-${FOR_emacs21}share/wl/wl-exit-up.xpm
-${FOR_emacs21}share/wl/wl-folder-check-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-empty-trash-up.xpm
-${FOR_emacs21}share/wl/wl-folder-goto-draft-folder-up.xpm
-${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-next-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-prev-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-read-up.xpm
-${FOR_emacs21}share/wl/wl-folder-select-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-sync-current-entity-up.xpm
-${FOR_emacs21}share/wl/wl-folder-zoom-entity-up.xpm
-${FOR_emacs21}share/wl/wl-message-extract-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-next-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-play-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-prev-content-up.xpm
-${FOR_emacs21}share/wl/wl-message-quit-up.xpm
-${FOR_emacs21}share/wl/wl-message-read-up.xpm
-${FOR_emacs21}share/wl/wl-stable-logo.xpm
-${FOR_emacs21}share/wl/wl-stable-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-summary-delete-up.xpm
-${FOR_emacs21}share/wl/wl-summary-dispose-up.xpm
-${FOR_emacs21}share/wl/wl-summary-exit-up.xpm
-${FOR_emacs21}share/wl/wl-summary-forward-up.xpm
-${FOR_emacs21}share/wl/wl-summary-jump-to-current-message-up.xpm
-${FOR_emacs21}share/wl/wl-summary-next-page-up.xpm
-${FOR_emacs21}share/wl/wl-summary-next-up.xpm
-${FOR_emacs21}share/wl/wl-summary-prev-page-up.xpm
-${FOR_emacs21}share/wl/wl-summary-prev-up.xpm
-${FOR_emacs21}share/wl/wl-summary-read-up.xpm
-${FOR_emacs21}share/wl/wl-summary-reply-up.xpm
-${FOR_emacs21}share/wl/wl-summary-reply-with-citation-up.xpm
-${FOR_emacs21}share/wl/wl-summary-set-flags-up.xpm
-${FOR_emacs21}share/wl/wl-summary-sync-force-update-up.xpm
-${FOR_emacs21}share/wl/wl-write-current-folder-up.xpm
-share/wl/wl-alpha-logo.img
-share/wl/wl-alpha-logo.xbm
-share/wl/wl-alpha-xmas-logo.img
-share/wl/wl-alpha-xmas-logo.xbm
-share/wl/wl-beta-logo.img
-share/wl/wl-beta-logo.xbm
-share/wl/wl-beta-xmas-logo.img
-share/wl/wl-beta-xmas-logo.xbm
-share/wl/wl-stable-logo.img
-share/wl/wl-stable-logo.xbm
-share/wl/wl-stable-xmas-logo.img
-share/wl/wl-stable-xmas-logo.xbm
diff --git a/mail/wl/distinfo b/mail/wl/distinfo
index 98cf60d55b4..1a7596e2723 100644
--- a/mail/wl/distinfo
+++ b/mail/wl/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/04/11 18:06:00 hira Exp $
+$NetBSD: distinfo,v 1.13 2006/04/08 19:02:18 jlam Exp $
 
 SHA1 (wl-2.14.0.tar.gz) = 75b93013444cb27ca540462afbaefdce0e157b3f
 RMD160 (wl-2.14.0.tar.gz) = 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b
 Size (wl-2.14.0.tar.gz) = 1101505 bytes
 SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
-SHA1 (patch-ac) = c30b711db7b73a2d2bd7d6025bc394ecf7c35aad
diff --git a/mail/wl/patches/patch-ac b/mail/wl/patches/patch-ac
deleted file mode 100644
index a98abb687e5..00000000000
--- a/mail/wl/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/07/24 08:17:19 taca Exp $
-
---- Makefile.orig	Wed Oct 25 22:15:49 2000
-+++ Makefile
-@@ -13,8 +13,8 @@
- LISPDIR = NONE
- #LISPDIR = /usr/local/lib/mule/site-lisp
- 
--INFODIR = NONE
--#INFODIR = /usr/local/share/info
-+#INFODIR = NONE
-+INFODIR = ${PREFIX}/info
- 
- # For XEmacs package.
- PACKAGEDIR = NONE