Add support for XEmacs.

2 files changed, 110 insertions, 23 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index d6eda6dcebd..50b2523f2e0 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/04/08 19:02:18 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/22 17:26:59 rpaulo Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/
 
@@ -10,23 +10,26 @@ 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"
 
+# 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_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
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214
 
 BUILD_TARGET=	all info
 INSTALL_TARGET=	install install-info
 MAKE_FLAGS+=	INFODIR=${EMACS_INFOPREFIX:Q}
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
+MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 MAKE_FLAGS+=	PIXMAPDIR=${PREFIX:Q}/share/wl
 INFO_FILES=	# PLIST
 
-.include "../../mk/emacs.mk"
 
 DOCDIR=			${PREFIX}/share/doc/wl
 EXAMPLESDIR=		${PREFIX}/share/examples/wl
@@ -44,7 +47,7 @@ post-install:
 	done
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/en
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/ja
-	@${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
-	@${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
+	${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
+	${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index 8d76b653ac6..4674c93a36d 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/08 19:02:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/07/22 17:26:59 rpaulo Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
@@ -12,6 +12,8 @@ ${EMACS_LISPPREFIX}/wl/elmo-archive.elc
 ${EMACS_LISPPREFIX}/wl/elmo-cache.el
 ${EMACS_LISPPREFIX}/wl/elmo-cache.elc
 ${EMACS_LISPPREFIX}/wl/elmo-date.el
+${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/elmo-database.el
+${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/elmo-database.elc
 ${EMACS_LISPPREFIX}/wl/elmo-date.elc
 ${EMACS_LISPPREFIX}/wl/elmo-dop.el
 ${EMACS_LISPPREFIX}/wl/elmo-dop.elc
@@ -113,10 +115,14 @@ ${EMACS_LISPPREFIX}/wl/wl-complete.el
 ${EMACS_LISPPREFIX}/wl/wl-complete.elc
 ${EMACS_LISPPREFIX}/wl/wl-demo.el
 ${EMACS_LISPPREFIX}/wl/wl-demo.elc
+${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.el
+${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.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
+${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs21}${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
 ${EMACS_LISPPREFIX}/wl/wl-expire.elc
 ${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
@@ -191,17 +197,17 @@ ${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.img
+${FOR_emacs21}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.img
+${FOR_emacs21}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.img
+${FOR_emacs21}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.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
@@ -228,11 +234,11 @@ ${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.img
+${FOR_emacs21}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.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
@@ -249,6 +255,84 @@ ${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
 @dirrm share/wl
 @dirrm share/examples/wl/ja