11 files changed, 24 insertions, 12 deletions

diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index 9d605986fad0..dfde1e8c3504 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Wanderlust (for emacs)
-# Version required:	1.0.2
+# Version required:	1.0.x
 # Date created:		7 Apr 1999
 # Whom: 		MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/06/23 19:54:50 sada Exp $
 #
 
-DISTNAME=	wl-1.0.2
-PKGNAME=	wanderlust-${EMACS_PORT}-1.0.2
+DISTNAME=	wl-1.0.3
+PKGNAME=	wanderlust-${EMACS_PORT}-1.0.3
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/wanderlust/stable/ \
@@ -29,12 +29,13 @@ EMACS_CMD=	${EMACS_NAME}-${EMACS_VER}
 .if !defined(HAVE_COMMON_PORT)
 HAVE_COMMON_PORT=	no
 .endif
-BUILD_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-RUN_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
+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}
 .endif
 # depends on semi
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el:${PORTSDIR}/editors/semi-${EMACS_PORT}-current
@@ -52,7 +53,7 @@ ALL_TARGET=	all info
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER_LIBDIR=${EMACS_VER_LIBDIR}
 
 DOCSDIR=	${PREFIX}/share/doc/wanderlust
-DOCS=		00README 00README.ja ChangeLog
+DOCS=		00README 00README.ja ChangeLog ChangeLog.ja
 SAMPLESDIR=	${PREFIX}/share/examples/wanderlust
 SAMPLES=	sample.addresses sample.dot.wl sample.folders
 
diff --git a/mail/wanderlust-emacs/distinfo b/mail/wanderlust-emacs/distinfo
index 47323de2bc1c..9345ba48e1a9 100644
--- a/mail/wanderlust-emacs/distinfo
+++ b/mail/wanderlust-emacs/distinfo
@@ -1 +1 @@
-MD5 (wl-1.0.2.tar.gz) = e6a72d0fc2897bd0d5cee77aea718f51
+MD5 (wl-1.0.3.tar.gz) = b11bb7e555620fe9a961413a392be053
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
index 4767e99acef2..dd99472f0afe 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
@@ -1,3 +1,5 @@
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
 (setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wanderlust" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
index 286db2f85f62..c2d84c0ce793 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
@@ -1,2 +1,4 @@
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
 (setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wanderlust" load-path))
 (provide 'wanderlust-startup)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
index e2adc7f66a17..e9b2851823c0 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
@@ -1,3 +1,5 @@
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
 (setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wanderlust" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
index 3b7f9bc86571..c63e3b5db19b 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
@@ -1,3 +1,6 @@
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
+(load "browse-url")
 (setq load-path (cons "%%PREFIX%%/%%EMACS_VER_LIBDIR%%/site-lisp/emu" load-path))
 (setq wl-icon-dir "%%PREFIX%%/%%EMACS_LIBDIR%%/etc/wanderlust")
 (setq wl-summary-weekday-name-lang "en")
diff --git a/mail/wanderlust-emacs/pkg-message b/mail/wanderlust-emacs/pkg-message
index 1baaa759a696..b3b9eb8d77a8 100644
--- a/mail/wanderlust-emacs/pkg-message
+++ b/mail/wanderlust-emacs/pkg-message
@@ -4,8 +4,6 @@
 *                                                             *
 * (require 'wanderlust-startup)                               *
 * (load "mime-setup")                                         *
-* (autoload 'wl "wl" "Wanderlust" t)                          *
-* (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)  *
 *                                                             *
 * And if you use APOP authentication, Wanderlust requires     *
 * md5.el. md5.el is contained in Emacs/W3 package. Please get *
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs b/mail/wanderlust-emacs/pkg-plist.emacs
index 2b60b73d7023..29902c14629f 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs
+++ b/mail/wanderlust-emacs/pkg-plist.emacs
@@ -1,6 +1,7 @@
 share/doc/wanderlust/00README
 share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
+share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs20 b/mail/wanderlust-emacs/pkg-plist.emacs20
index 926a68653dbe..b693eb90d736 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs20
+++ b/mail/wanderlust-emacs/pkg-plist.emacs20
@@ -5,6 +5,7 @@ info/wl-ja.info
 share/doc/wanderlust/00README
 share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
+share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
diff --git a/mail/wanderlust-emacs/pkg-plist.mule b/mail/wanderlust-emacs/pkg-plist.mule
index 926a68653dbe..b693eb90d736 100644
--- a/mail/wanderlust-emacs/pkg-plist.mule
+++ b/mail/wanderlust-emacs/pkg-plist.mule
@@ -5,6 +5,7 @@ info/wl-ja.info
 share/doc/wanderlust/00README
 share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
+share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
 %%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
diff --git a/mail/wanderlust-emacs/pkg-plist.xemacs20 b/mail/wanderlust-emacs/pkg-plist.xemacs20
index 6f36e052c9b8..16f2af5fbee8 100644
--- a/mail/wanderlust-emacs/pkg-plist.xemacs20
+++ b/mail/wanderlust-emacs/pkg-plist.xemacs20
@@ -96,6 +96,7 @@
 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