Buildlink3'ify. Make emacs-w3m support an option. Refactor *a lot*.

3 files changed, 119 insertions, 184 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 0110f5d8657..b96d801140e 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/04/01 08:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/10/29 13:06:05 uebayasi Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,19 +10,6 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	Mail/news management system with IMAP4rev1 support for Emacs
 
-.include "../../mk/emacs.mk"
-
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
-# apel and bbdb are included in xemacs-packages
-.if ${EMACS_FLAVOR} == "emacs"
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
-.endif
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
-DEPENDS+=	emacs-w3m>=1.4:../../www/emacs-w3m
-
-EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214
-
 BUILD_TARGET=	all info
 INSTALL_TARGET=	install install-info
 MAKE_FLAGS+=	INFODIR=${EMACS_INFOPREFIX:Q}
@@ -31,13 +18,10 @@ MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 MAKE_FLAGS+=	PIXMAPDIR=${PREFIX:Q}/share/wl
 INFO_FILES=	# PLIST
 
-
 DOCDIR=			${PREFIX}/share/doc/wl
 EXAMPLESDIR=		${PREFIX}/share/examples/wl
 INSTALLATION_DIRS=	${DOCDIR} ${EXAMPLESDIR} ${EMACS_INFOPREFIX}
 
-.include "../../security/openssl/buildlink3.mk"
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR:Q}/en
 	${INSTALL_DATA_DIR} ${DOCDIR:Q}/ja
@@ -51,4 +35,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
 	${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
 
+.include "../../mk/emacs.mk"
+
+.include "options.mk"
+
+.include "../../devel/apel/buildlink3.mk"
+.include "../../devel/semi/buildlink3.mk"
+.include "../../misc/bbdb/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index 6f2432012db..82f39d0fbf8 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/03/23 02:43:22 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/10/29 13:06:05 uebayasi Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
@@ -55,8 +55,8 @@ ${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-shimbun.el
-${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
+${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
+${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
 ${EMACS_LISPPREFIX}/wl/elmo-signal.el
 ${EMACS_LISPPREFIX}/wl/elmo-signal.elc
 ${EMACS_LISPPREFIX}/wl/elmo-spam.el
@@ -123,6 +123,12 @@ ${EMACS_LISPPREFIX}/wl/wl-draft.el
 ${EMACS_LISPPREFIX}/wl/wl-draft.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.elc
 ${EMACS_LISPPREFIX}/wl/wl-expire.el
@@ -140,7 +146,9 @@ ${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
+@comment XXX wl-news.el isn't compiled for emacs22...
+${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-news.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-news.elc
 ${EMACS_LISPPREFIX}/wl/wl-refile.el
 ${EMACS_LISPPREFIX}/wl/wl-refile.elc
 ${EMACS_LISPPREFIX}/wl/wl-score.el
@@ -173,169 +181,90 @@ 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.img
-${FOR_emacs21}share/wl/wl-alpha-logo.xbm
-${FOR_emacs21}share/wl/wl-alpha-logo.xpm
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.img
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xbm
-${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-logo.img
-${FOR_emacs21}share/wl/wl-beta-logo.xbm
-${FOR_emacs21}share/wl/wl-beta-logo.xpm
-${FOR_emacs21}share/wl/wl-beta-xmas-logo.img
-${FOR_emacs21}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
-${FOR_emacs21}share/wl/wl-stable-logo.img
-${FOR_emacs21}share/wl/wl-stable-logo.xbm
-${FOR_emacs21}share/wl/wl-stable-logo.xpm
-${FOR_emacs21}share/wl/wl-stable-xmas-logo.img
-${FOR_emacs21}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
-${FOR_xemacs214}share/wl/access.xpm
-${FOR_xemacs214}share/wl/archive.xpm
-${FOR_xemacs214}share/wl/closed.xpm
-${FOR_xemacs214}share/wl/draft.xpm
-${FOR_xemacs214}share/wl/elmo.xpm
-${FOR_xemacs214}share/wl/file.xpm
-${FOR_xemacs214}share/wl/filter.xpm
-${FOR_xemacs214}share/wl/imap.xpm
-${FOR_xemacs214}share/wl/internal.xpm
-${FOR_xemacs214}share/wl/letter.xpm
-${FOR_xemacs214}share/wl/local.xpm
-${FOR_xemacs214}share/wl/localnews.xpm
-${FOR_xemacs214}share/wl/maildir.xpm
-${FOR_xemacs214}share/wl/multi.xpm
-${FOR_xemacs214}share/wl/news.xpm
-${FOR_xemacs214}share/wl/nmz.xpm
-${FOR_xemacs214}share/wl/no-letter.xpm
-${FOR_xemacs214}share/wl/opened.xpm
-${FOR_xemacs214}share/wl/pipe.xpm
-${FOR_xemacs214}share/wl/plugged.xpm
-${FOR_xemacs214}share/wl/pop.xpm
-${FOR_xemacs214}share/wl/queue.xpm
-${FOR_xemacs214}share/wl/shimbun.xpm
-${FOR_xemacs214}share/wl/trash-e.xpm
-${FOR_xemacs214}share/wl/trash.xpm
-${FOR_xemacs214}share/wl/unplugged.xpm
-${FOR_xemacs214}share/wl/wl-alpha-logo.xbm
-${FOR_xemacs214}share/wl/wl-alpha-logo.xpm
-${FOR_xemacs214}share/wl/wl-alpha-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-alpha-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-beta-logo.xbm
-${FOR_xemacs214}share/wl/wl-beta-logo.xpm
-${FOR_xemacs214}share/wl/wl-beta-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-beta-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-draft-insert-signature-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-kill-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-save-and-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-send-from-toolbar-down.xpm
-${FOR_xemacs214}share/wl/wl-draft-send-from-toolbar-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-up.xpm
-${FOR_xemacs214}share/wl/wl-draft-yank-original-up.xpm
-${FOR_xemacs214}share/wl/wl-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-check-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-empty-trash-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-goto-draft-folder-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-jump-to-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-next-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-prev-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-read-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-select-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-sync-current-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-folder-zoom-entity-up.xpm
-${FOR_xemacs214}share/wl/wl-message-extract-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-next-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-play-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-prev-content-up.xpm
-${FOR_xemacs214}share/wl/wl-message-quit-up.xpm
-${FOR_xemacs214}share/wl/wl-message-read-up.xpm
-${FOR_xemacs214}share/wl/wl-stable-logo.xbm
-${FOR_xemacs214}share/wl/wl-stable-logo.xpm
-${FOR_xemacs214}share/wl/wl-stable-xmas-logo.xbm
-${FOR_xemacs214}share/wl/wl-stable-xmas-logo.xpm
-${FOR_xemacs214}share/wl/wl-summary-delete-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-dispose-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-exit-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-forward-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-jump-to-current-message-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-next-page-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-next-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-prev-page-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-prev-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-read-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-reply-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-reply-with-citation-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-set-flags-up.xpm
-${FOR_xemacs214}share/wl/wl-summary-sync-force-update-up.xpm
-${FOR_xemacs214}share/wl/wl-write-current-folder-up.xpm
-@dirrm share/wl
+${FOR_emacs_x}share/wl/access.xpm
+${FOR_emacs_x}share/wl/archive.xpm
+${FOR_emacs_x}share/wl/closed.xpm
+${FOR_emacs_x}share/wl/draft.xpm
+${FOR_emacs_x}share/wl/elmo.xpm
+${FOR_emacs_x}share/wl/file.xpm
+${FOR_emacs_x}share/wl/filter.xpm
+${FOR_emacs_x}share/wl/imap.xpm
+${FOR_emacs_x}share/wl/internal.xpm
+${FOR_emacs_x}share/wl/letter.xpm
+${FOR_emacs_x}share/wl/local.xpm
+${FOR_emacs_x}share/wl/localnews.xpm
+${FOR_emacs_x}share/wl/maildir.xpm
+${FOR_emacs_x}share/wl/multi.xpm
+${FOR_emacs_x}share/wl/news.xpm
+${FOR_emacs_x}share/wl/nmz.xpm
+${FOR_emacs_x}share/wl/no-letter.xpm
+${FOR_emacs_x}share/wl/opened.xpm
+${FOR_emacs_x}share/wl/pipe.xpm
+${FOR_emacs_x}share/wl/plugged.xpm
+${FOR_emacs_x}share/wl/pop.xpm
+${FOR_emacs_x}share/wl/queue.xpm
+${FOR_emacs_x}${FOR_emacs_w3m}share/wl/shimbun.xpm
+${FOR_emacs_x}share/wl/trash-e.xpm
+${FOR_emacs_x}share/wl/trash.xpm
+${FOR_emacs_x}share/wl/unplugged.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-alpha-logo.img
+${FOR_emacs_x}share/wl/wl-alpha-logo.xbm
+${FOR_emacs_x}share/wl/wl-alpha-logo.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-alpha-xmas-logo.img
+${FOR_emacs_x}share/wl/wl-alpha-xmas-logo.xbm
+${FOR_emacs_x}share/wl/wl-alpha-xmas-logo.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-beta-logo.img
+${FOR_emacs_x}share/wl/wl-beta-logo.xbm
+${FOR_emacs_x}share/wl/wl-beta-logo.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-beta-xmas-logo.img
+${FOR_emacs_x}share/wl/wl-beta-xmas-logo.xbm
+${FOR_emacs_x}share/wl/wl-beta-xmas-logo.xpm
+${FOR_emacs_x}share/wl/wl-draft-insert-signature-up.xpm
+${FOR_emacs_x}share/wl/wl-draft-kill-up.xpm
+${FOR_emacs_x}share/wl/wl-draft-save-and-exit-up.xpm
+${FOR_emacs_x}share/wl/wl-draft-send-from-toolbar-down.xpm
+${FOR_emacs_x}share/wl/wl-draft-send-from-toolbar-up.xpm
+${FOR_emacs_x}share/wl/wl-draft-up.xpm
+${FOR_emacs_x}share/wl/wl-draft-yank-original-up.xpm
+${FOR_emacs_x}share/wl/wl-exit-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-check-current-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-empty-trash-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-goto-draft-folder-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-jump-to-current-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-next-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-prev-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-read-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-select-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-sync-current-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-folder-zoom-entity-up.xpm
+${FOR_emacs_x}share/wl/wl-message-extract-content-up.xpm
+${FOR_emacs_x}share/wl/wl-message-next-content-up.xpm
+${FOR_emacs_x}share/wl/wl-message-play-content-up.xpm
+${FOR_emacs_x}share/wl/wl-message-prev-content-up.xpm
+${FOR_emacs_x}share/wl/wl-message-quit-up.xpm
+${FOR_emacs_x}share/wl/wl-message-read-up.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-stable-logo.img
+${FOR_emacs_x}share/wl/wl-stable-logo.xbm
+${FOR_emacs_x}share/wl/wl-stable-logo.xpm
+${FOR_emacs_x}${FOR_emacs}share/wl/wl-stable-xmas-logo.img
+${FOR_emacs_x}share/wl/wl-stable-xmas-logo.xbm
+${FOR_emacs_x}share/wl/wl-stable-xmas-logo.xpm
+${FOR_emacs_x}share/wl/wl-summary-delete-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-dispose-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-exit-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-forward-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-jump-to-current-message-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-next-page-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-next-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-prev-page-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-prev-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-read-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-reply-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-reply-with-citation-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-set-flags-up.xpm
+${FOR_emacs_x}share/wl/wl-summary-sync-force-update-up.xpm
+${FOR_emacs_x}share/wl/wl-write-current-folder-up.xpm
 @dirrm share/wl
 @dirrm share/examples/wl/ja
 @dirrm share/examples/wl/en
diff --git a/mail/wl/options.mk b/mail/wl/options.mk
new file mode 100644
index 00000000000..62494bb8b07
--- /dev/null
+++ b/mail/wl/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2007/10/29 13:06:05 uebayasi Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wl
+PKG_SUPPORTED_OPTIONS=	emacs-w3m
+PKG_SUGGESTED_OPTIONS=	emacs-w3m
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Memacs-w3m)
+.include "../../www/emacs-w3m/buildlink3.mk"
+PLIST_SUBST+=	FOR_emacs_w3m=""
+.else
+PLIST_SUBST+=	FOR_emacs_w3m="@comment "
+.endif