From owner-ports-jp@jp.freebsd.org  Fri Aug 27 07:59:00 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id HAA99105;
	Fri, 27 Aug 1999 07:59:00 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from narcissus.pel.sys.hiroshima-u.ac.jp (narcissus.pel.sys.hiroshima-u.ac.jp [133.41.37.161])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id HAA99100
	for <ports-jp@jp.freebsd.org>; Fri, 27 Aug 1999 07:58:59 +0900 (JST)
	(envelope-from nobutaka@narcissus.pel.sys.hiroshima-u.ac.jp)
Received: from narcissus.pel.sys.hiroshima-u.ac.jp (localhost [127.0.0.1])
	by narcissus.pel.sys.hiroshima-u.ac.jp (8.9.3/8.9.3) with ESMTP id HAA80206
	for <ports-jp@jp.freebsd.org>; Fri, 27 Aug 1999 07:58:47 +0900 (JST)
	(envelope-from nobutaka@narcissus.pel.sys.hiroshima-u.ac.jp)
Date: Fri, 27 Aug 1999 07:58:45 +0900
Message-ID: <14277.50853.116707.26482Z@narcissus.pel.sys.hiroshima-u.ac.jp>
From: MANTANI Nobutaka <nobutaka@nobutaka.com>
To: ports-jp@jp.freebsd.org
In-Reply-To: In your message of "Thu, 26 Aug 1999 12:19:36 +0900"
	<19990826121936Z.kiri@pis.toba-cmt.ac.jp>
References: <19990825160321Q.kiri@pis.toba-cmt.ac.jp>
	<19990826121936Z.kiri@pis.toba-cmt.ac.jp>
User-Agent: Wanderlust/2.1.3 (Sukiyaki) SEMI/1.13.5 (=?ISO-8859-4?Q?Meih?=
 =?ISO-8859-4?Q?=F2?=) FLIM/1.13.1 (Tawaramoto) Emacs/20.4 (i386--freebsd)
 MULE/4.0 (HANANOEN)
MIME-Version: 1.0 (generated by SEMI 1.13.5 -
 =?ISO-8859-4?Q?=22Meih=F2=22?=)
Content-Type: multipart/mixed;
 boundary="Multipart_Fri_Aug_27_07:58:44_1999-1"
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7342
Subject: [ports-jp 7342] Re: About wanderlust dependencies.
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: nobutaka@nobutaka.com

--Multipart_Fri_Aug_27_07:58:44_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

$Bh_C+$G$9!#(B

$B6M;3$5$s$N%Q%C%A$+$i=j!9JQ99$7$F?7$7$$(B xemacs-mule $B$H(B xemacs21 $B$NN>J}$K(B
$BBP1~$G$-$k$h$&$K$7$F$_$^$7$?!#(BRUN_DEPENDS $B$O$=$N$^$^$K$7$F$$$^$9!#(B
$B$"$H!"(B${EMACS_VER_LIBDIR} $B$O$b$&$I$3$K$b;H$o$l$F$$$J$$$h$&$J$N$G:o$C$F$$$^$9!#(B
$B:#8e(B ${EMACS_VER_LIBDIR} $B$r;H$&I,MW$,$"$k;~$OJ!Eg$5$s$N(B ports $B$K9g$o$;$F(B
${EMACS_LIBDIR_WITH_VER} $B$r;H$*$&$H;W$$$^$9!#(B


--
$Bh_C+(B $BD*?r(B [MANTANI Nobutaka] nobutaka@nobutaka.com
                             mantani@pel.sys.hiroshima-u.ac.jp
                             http://www.nobutaka.com/

--Multipart_Fri_Aug_27_07:58:44_1999-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: attachment; filename="wanderlust-emacs-1.0.3-19990827.diff"
Content-Disposition: attachment; filename="wanderlust-emacs-1.0.3-19990827.diff"
Content-Transfer-Encoding: 7bit

diff -urN wanderlust-emacs.old/Makefile wanderlust-emacs/Makefile
--- wanderlust-emacs.old/Makefile	Thu Aug 26 01:28:02 1999
+++ wanderlust-emacs/Makefile	Fri Aug 27 05:55:24 1999
@@ -17,7 +17,6 @@
 MAINTAINER=	nobutaka@nobutaka.com
 
 .if !defined (IS_SLAVE)
-# for emacs19
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
@@ -29,28 +28,33 @@
 .if !defined(HAVE_COMMON_PORT)
 HAVE_COMMON_PORT=	no
 .endif
+
+BUILD_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .if (${HAVE_COMMON_PORT} == "yes")
 # depends on common port
-BUILD_DEPENDS=	${PKG_DBDIR}/${EMACS_PORT}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${PKG_DBDIR}/${EMACS_PORT}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
-BUILD_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
+RUN_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 # depends on semi
+.if (${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs-mule")
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_PKGDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+RUN_DEPENDS+=	${PREFIX}/${EMACS_PKGDIR}/lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.else
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
+.endif
 
-.if (${EMACS_PORT} == "xemacs-mule")
-DIRSECTION=	"Local Packages:"
-ALL_TARGET=	all info
+.if (${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs-mule")
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
 .endif
-.if (${EMACS_PORT} == "emacs20" || ${EMACS_PORT} == "mule")
+.if (${EMACS_PORT} == "emacs20" || ${EMACS_PORT} == "mule" || ${EMACS_PORT} == "xemacs-mule")
 DIRSECTION=	"The Emacs editor and associated tools"
-ALL_TARGET=	all info
+ALL_TARGET+=	info
 .endif
 
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER_LIBDIR=${EMACS_VER_LIBDIR}
+PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_PKGDIR=${EMACS_PKGDIR}
 
 DOCSDIR=	${PREFIX}/share/doc/wanderlust
 DOCS=		00README 00README.ja ChangeLog ChangeLog.ja
@@ -58,26 +62,28 @@
 SAMPLES=	sample.addresses sample.dot.wl sample.folders
 
 PLIST=		${PKGDIR}/PLIST.${EMACS_PORT}
-MAKE_ARGS=	EMACS=${EMACS_CMD} ELISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
+MAKE_ARGS=	EMACS=${EMACS_CMD} PACKAGEDIR=${PREFIX}/${EMACS_PKGDIR} \
+		ELISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust \
+		FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
+
+EMACS_PKGDIR=	${EMACS_LIBDIR}/site-packages
+PKGMANDIR=	${PREFIX}/${EMACS_PKGDIR}/man/wl
 
 post-configure:
 	@${SED} \
 		-e "s,%%PREFIX%%,${PREFIX},g" \
 		-e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \
-		-e "s,%%EMACS_VER_LIBDIR%%,${EMACS_VER_LIBDIR},g" \
+		-e "s,%%EMACS_PKGDIR%%,${EMACS_PKGDIR},g" \
 		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
 
 pre-install:
+.if (${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs-mule")
+	@${MKDIR} ${PREFIX}/${EMACS_PKGDIR}
+.else
 	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
+.endif
 
 post-install:
-.if (${EMACS_PORT} == "xemacs-mule")
-	@if [ ! -f ${PREFIX}/${EMACS_LIBDIR}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/${EMACS_VER_LIBDIR}/info/dir; \
-	fi
-	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.info ${PREFIX}/${EMACS_VER_LIBDIR}/info
-	@install-info --section=${DIRSECTION} ${PREFIX}/${EMACS_VER_LIBDIR}/info/wl-ja.info ${PREFIX}/${EMACS_VER_LIBDIR}/info/dir
-.endif
 .if (${EMACS_PORT} == "emacs20" || ${EMACS_PORT} == "mule")
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
@@ -85,23 +91,36 @@
 	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.info ${PREFIX}/info
 	@install-info --section=${DIRSECTION} ${PREFIX}/info/wl-ja.info ${PREFIX}/info/dir
 .endif
+.if (${EMACS_PORT} == "xemacs-mule")
+	@${MKDIR} ${PREFIX}/${EMACS_PKGDIR}/info
+	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.info ${PREFIX}/${EMACS_PKGDIR}/info
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@for i in ${DOCS} ; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR} ; \
 	done
+.if (${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs-mule")
+	@${MKDIR} ${PKGMANDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.texi ${PKGMANDIR}
+.else
 	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.texi ${DOCSDIR}
 .endif
-.if (${EMACS_NAME} == "xemacs")
+.endif
+.if (${EMACS_PORT} == "xemacs20")
 	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wanderlust
 	@for i in *.xpm ; do \
 		${INSTALL_DATA} ${WRKSRC}/etc/$$i ${PREFIX}/${EMACS_LIBDIR}/etc/wanderlust ; \
 	done
 .endif
+.if (${EMACS_PORT} == "xemacs21" || ${EMACS_PORT} == "xemacs-mule")
+	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_PKGDIR}/lisp/wl
+.else
 	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp
 	@${INSTALL_DATA} ${WRKSRC}/utils/bbdb-wl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
 	@${INSTALL_DATA} ${WRKSRC}/utils/im-wl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
 	@${INSTALL_DATA} ${WRKSRC}/utils/wl-user-agent.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
+.endif
 	@${MKDIR} ${SAMPLESDIR}
 	@for i in ${SAMPLES} ; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${SAMPLESDIR} ; \
diff -urN wanderlust-emacs.old/files/wanderlust-startup.xemacs-mule.el.tmpl wanderlust-emacs/files/wanderlust-startup.xemacs-mule.el.tmpl
--- wanderlust-emacs.old/files/wanderlust-startup.xemacs-mule.el.tmpl	Tue Aug 17 16:08:58 1999
+++ wanderlust-emacs/files/wanderlust-startup.xemacs-mule.el.tmpl	Thu Aug 26 23:51:02 1999
@@ -2,5 +2,4 @@
 (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
 (load "browse-url")
 (load "mime-setup")
-(setq wl-icon-dir "%%PREFIX%%/%%EMACS_LIBDIR%%/etc/wanderlust")
 (provide 'wanderlust-startup)
diff -urN wanderlust-emacs.old/files/wanderlust-startup.xemacs21.el.tmpl wanderlust-emacs/files/wanderlust-startup.xemacs21.el.tmpl
--- wanderlust-emacs.old/files/wanderlust-startup.xemacs21.el.tmpl	Thu Jan  1 09:00:00 1970
+++ wanderlust-emacs/files/wanderlust-startup.xemacs21.el.tmpl	Fri Aug 27 00:48:15 1999
@@ -0,0 +1,10 @@
+(load "browse-url")
+(load "mime-setup")
+(setq wl-summary-weekday-name-lang "en")
+(setq wl-thread-indent-level 2)
+(setq wl-thread-have-younger-brother-str "+")
+(setq wl-thread-youngest-child-str       "+")
+(setq wl-thread-vertical-str             "|")
+(setq wl-thread-horizontal-str           "-")
+(setq wl-thread-space-str                " ")
+(provide 'wanderlust-startup)
diff -urN wanderlust-emacs.old/patches/patch-ac wanderlust-emacs/patches/patch-ac
--- wanderlust-emacs.old/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ wanderlust-emacs/patches/patch-ac	Fri Aug 27 04:07:48 1999
@@ -0,0 +1,19 @@
+--- WL-MK.orig	Fri Aug 27 04:05:43 1999
++++ WL-MK	Fri Aug 27 04:07:06 1999
+@@ -359,11 +359,11 @@
+     (wl-install (wl-elcs ELMO-MODULES-XMAS) ELISPDIR)
+     (cd "..")
+     ;; 
+-    (if (not (file-exists-p (expand-file-name (car WL-INFOS) DOCDIR)))
+-	(wl-texinfo-format))
+-    (cd DOCDIR)
+-    (wl-install WL-INFOS INFODIR)
+-    (cd "..")
++    ;(if (not (file-exists-p (expand-file-name (car WL-INFOS) DOCDIR)))
++    ;	(wl-texinfo-format))
++    ;(cd DOCDIR)
++    ;(wl-install WL-INFOS INFODIR)
++    ;(cd "..")
+     ))
+ 
+ 
diff -urN wanderlust-emacs.old/pkg/PLIST.xemacs-mule wanderlust-emacs/pkg/PLIST.xemacs-mule
--- wanderlust-emacs.old/pkg/PLIST.xemacs-mule	Sun Aug 15 21:22:22 1999
+++ wanderlust-emacs/pkg/PLIST.xemacs-mule	Thu Aug 26 23:59:35 1999
@@ -1,111 +1,109 @@
-%%EMACS_LIBDIR%%/etc/wanderlust/archive.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/closed.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/draft.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/elmo.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/filter.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/imap.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/internal.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/local.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/localnews.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/multi.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/news.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/opened.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/pop.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/queue.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/trash-e.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/trash.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-insert-signature-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-kill-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-yank-original-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-check-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-empty-trash-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-next-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-prev-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-select-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-sync-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-zoom-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-logo.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-extract-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-next-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-play-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-prev-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-quit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-delete-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-forward-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-mark-as-important-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-next-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-next-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-prev-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-prev-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-reply-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-reply-with-citation-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-sync-force-update-up.xpm
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-database.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/im-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-dnd.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-user-agent.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-xmas.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-@unexec install-info --delete %D/%%EMACS_VER_LIBDIR%%/info/wl-ja.info %D/%%EMACS_VER_LIBDIR%%/info/dir
-%%EMACS_VER_LIBDIR%%/info/wl-ja.info
-@exec [ -f %D/%%EMACS_VER_LIBDIR%%/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/%%EMACS_VER_LIBDIR%%/info/dir
-@exec install-info %D/%%EMACS_VER_LIBDIR%%/info/wl-ja.info %D/%%EMACS_VER_LIBDIR%%/info/dir
+%%EMACS_PKGDIR%%/etc/wl/archive.xpm
+%%EMACS_PKGDIR%%/etc/wl/closed.xpm
+%%EMACS_PKGDIR%%/etc/wl/draft.xpm
+%%EMACS_PKGDIR%%/etc/wl/elmo.xpm
+%%EMACS_PKGDIR%%/etc/wl/filter.xpm
+%%EMACS_PKGDIR%%/etc/wl/imap.xpm
+%%EMACS_PKGDIR%%/etc/wl/internal.xpm
+%%EMACS_PKGDIR%%/etc/wl/local.xpm
+%%EMACS_PKGDIR%%/etc/wl/localnews.xpm
+%%EMACS_PKGDIR%%/etc/wl/multi.xpm
+%%EMACS_PKGDIR%%/etc/wl/news.xpm
+%%EMACS_PKGDIR%%/etc/wl/opened.xpm
+%%EMACS_PKGDIR%%/etc/wl/pop.xpm
+%%EMACS_PKGDIR%%/etc/wl/queue.xpm
+%%EMACS_PKGDIR%%/etc/wl/trash-e.xpm
+%%EMACS_PKGDIR%%/etc/wl/trash.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-kill-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-yank-original-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-exit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-next-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-select-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-logo.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-extract-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-next-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-play-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-prev-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-quit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-delete-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-exit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-forward-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-next-page-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-next-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-prev-page-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-prev-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-reply-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
+%%EMACS_PKGDIR%%/info/wl-ja.info
+%%EMACS_PKGDIR%%/lisp/wl/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/wl/bbdb-wl.elc
+%%EMACS_PKGDIR%%/lisp/wl/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-archive.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-cache.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-database.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-date.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-dop.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-filter.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-imap4.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-internal.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-localdir.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-localnews.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-maildir.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-msgdb.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-multi.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-nntp.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-pop3.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-util.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-vars.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo2.elc
+%%EMACS_PKGDIR%%/lisp/wl/mmelmo-imap4.elc
+%%EMACS_PKGDIR%%/lisp/wl/mmelmo.elc
+%%EMACS_PKGDIR%%/lisp/wl/wanderlust-startup.el
+%%EMACS_PKGDIR%%/lisp/wl/wl-address.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-demo.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-dnd.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-draft.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-expire.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-fldmgr.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-folder.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-highlight.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-message.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-mime.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-refile.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-summary.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-template.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-thread.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-util.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-vars.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-xmas.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl.elc
+%%EMACS_PKGDIR%%/man/wl/wl-ja.texi
 share/doc/wanderlust/00README
 share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
-share/doc/wanderlust/wl-ja.texi
 share/examples/wanderlust/sample.addresses
 share/examples/wanderlust/sample.dot.wl
 share/examples/wanderlust/sample.folders
-@dirrm %%EMACS_LIBDIR%%/etc/wanderlust
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wanderlust
+@dirrm %%EMACS_PKGDIR%%/etc/wl
+@dirrm %%EMACS_PKGDIR%%/lisp/wl
+@dirrm %%EMACS_PKGDIR%%/man/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust
diff -urN wanderlust-emacs.old/pkg/PLIST.xemacs21 wanderlust-emacs/pkg/PLIST.xemacs21
--- wanderlust-emacs.old/pkg/PLIST.xemacs21	Thu Jan  1 09:00:00 1970
+++ wanderlust-emacs/pkg/PLIST.xemacs21	Fri Aug 27 05:59:23 1999
@@ -0,0 +1,108 @@
+%%EMACS_PKGDIR%%/etc/wl/archive.xpm
+%%EMACS_PKGDIR%%/etc/wl/closed.xpm
+%%EMACS_PKGDIR%%/etc/wl/draft.xpm
+%%EMACS_PKGDIR%%/etc/wl/elmo.xpm
+%%EMACS_PKGDIR%%/etc/wl/filter.xpm
+%%EMACS_PKGDIR%%/etc/wl/imap.xpm
+%%EMACS_PKGDIR%%/etc/wl/internal.xpm
+%%EMACS_PKGDIR%%/etc/wl/local.xpm
+%%EMACS_PKGDIR%%/etc/wl/localnews.xpm
+%%EMACS_PKGDIR%%/etc/wl/multi.xpm
+%%EMACS_PKGDIR%%/etc/wl/news.xpm
+%%EMACS_PKGDIR%%/etc/wl/opened.xpm
+%%EMACS_PKGDIR%%/etc/wl/pop.xpm
+%%EMACS_PKGDIR%%/etc/wl/queue.xpm
+%%EMACS_PKGDIR%%/etc/wl/trash-e.xpm
+%%EMACS_PKGDIR%%/etc/wl/trash.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-kill-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-draft-yank-original-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-exit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-next-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-select-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-logo.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-extract-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-next-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-play-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-prev-content-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-quit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-message-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-delete-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-exit-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-forward-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-next-page-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-next-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-prev-page-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-prev-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-read-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-reply-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
+%%EMACS_PKGDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
+%%EMACS_PKGDIR%%/lisp/wl/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/wl/bbdb-wl.elc
+%%EMACS_PKGDIR%%/lisp/wl/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-archive.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-cache.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-database.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-date.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-dop.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-filter.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-imap4.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-internal.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-localdir.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-localnews.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-maildir.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-msgdb.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-multi.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-nntp.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-pop3.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-util.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo-vars.elc
+%%EMACS_PKGDIR%%/lisp/wl/elmo2.elc
+%%EMACS_PKGDIR%%/lisp/wl/mmelmo-imap4.elc
+%%EMACS_PKGDIR%%/lisp/wl/mmelmo.elc
+%%EMACS_PKGDIR%%/lisp/wl/wanderlust-startup.el
+%%EMACS_PKGDIR%%/lisp/wl/wl-address.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-demo.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-dnd.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-draft.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-expire.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-fldmgr.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-folder.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-highlight.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-message.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-mime.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-refile.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-summary.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-template.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-thread.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-util.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-vars.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl-xmas.elc
+%%EMACS_PKGDIR%%/lisp/wl/wl.elc
+%%EMACS_PKGDIR%%/man/wl/wl-ja.texi
+share/doc/wanderlust/00README
+share/doc/wanderlust/00README.ja
+share/doc/wanderlust/ChangeLog
+share/doc/wanderlust/ChangeLog.ja
+share/examples/wanderlust/sample.addresses
+share/examples/wanderlust/sample.dot.wl
+share/examples/wanderlust/sample.folders
+@dirrm %%EMACS_PKGDIR%%/etc/wl
+@dirrm %%EMACS_PKGDIR%%/lisp/wl
+@dirrm %%EMACS_PKGDIR%%/man/wl
+@dirrm share/doc/wanderlust
+@dirrm share/examples/wanderlust

--Multipart_Fri_Aug_27_07:58:44_1999-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: attachment; filename="wanderlust-xemacs-mule-1.0.3-19990827.diff"
Content-Disposition: attachment; filename="wanderlust-xemacs-mule-1.0.3-19990827.diff"
Content-Transfer-Encoding: 7bit

diff -urN wanderlust-xemacs-mule.old/Makefile wanderlust-xemacs-mule/Makefile
--- wanderlust-xemacs-mule.old/Makefile	Thu Aug 26 01:28:03 1999
+++ wanderlust-xemacs-mule/Makefile	Fri Aug 27 00:27:46 1999
@@ -12,10 +12,9 @@
 
 EMACS_NAME=		xemacs
 EMACS_PORT=		xemacs-mule
-EMACS_VER=		20.4
-MULE_VER=		20.4
-EMACS_LIBDIR=		lib/xemacs-20.4
-EMACS_VER_LIBDIR=	lib/xemacs-20.4
+EMACS_VER=		21.1.6
+MULE_VER=		21.1.6
+EMACS_LIBDIR=		lib/xemacs
 
 HAVE_COMMON_PORT=	yes
 

--Multipart_Fri_Aug_27_07:58:44_1999-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: attachment; filename="wanderlust-xemacs20-1.0.3-19990827.diff"
Content-Disposition: attachment; filename="wanderlust-xemacs20-1.0.3-19990827.diff"
Content-Transfer-Encoding: 7bit

diff -urN wanderlust-xemacs20.old/Makefile wanderlust-xemacs20/Makefile
--- wanderlust-xemacs20.old/Makefile	Thu Aug 26 01:28:04 1999
+++ wanderlust-xemacs20/Makefile	Fri Aug 27 06:01:24 1999
@@ -14,7 +14,7 @@
 EMACS_PORT=		xemacs20
 EMACS_VER=		20.4
 EMACS_LIBDIR=		lib/xemacs
-EMACS_VER_LIBDIR=	lib/xemacs-20.4
+
 IS_SLAVE=	yes
 
 .include <${MASTERDIR}/Makefile>

--Multipart_Fri_Aug_27_07:58:44_1999-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: attachment; filename="wanderlust-xemacs21-1.0,3-19990827.shar"
Content-Disposition: attachment; filename="wanderlust-xemacs21-1.0,3-19990827.shar"
Content-Transfer-Encoding: 7bit

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	wanderlust-xemacs21
#	wanderlust-xemacs21/Makefile
#
echo c - wanderlust-xemacs21
mkdir -p wanderlust-xemacs21 > /dev/null 2>&1
echo x - wanderlust-xemacs21/Makefile
sed 's/^X//' >wanderlust-xemacs21/Makefile << 'END-of-wanderlust-xemacs21/Makefile'
X# New ports collection makefile for:	Wanderlust (for xemacs21)
X# Version required:	1.0.x
X# Date created:		7 Apr 1999
X# Whom: 		MANTANI Nobutaka <nobutaka@nobutaka.com>
X#
X# $FreeBSD$
X#
X
XMAINTAINER=	nobutaka@nobutaka.com
X
XMASTERDIR=	${.CURDIR}/../../mail/wanderlust-emacs
X
XEMACS_NAME=		xemacs
XEMACS_PORT=		xemacs21
XEMACS_VER=		21.1-p2
XEMACS_LIBDIR=		lib/xemacs
X
XIS_SLAVE=		yes
X
X.include <${MASTERDIR}/Makefile>
END-of-wanderlust-xemacs21/Makefile
exit


--Multipart_Fri_Aug_27_07:58:44_1999-1--
