Update to 1.14.5 (Demachiyanagi).

Changes from 1.14.4:

	* smtp.el (smtp-send-buffer): Error if `smtp-server' is nil.
	* FLIM-ELS (flim-version-specific-modules): Don't install mailcap.el.
	* FLIM-MK (install-flim): Avoid creating empty directory.
	* mime-parse.el (mime-parse-buffer): Require mmbuffer.
	* luna.el (luna-define-method): Clear method cache of child
	  classes.
	* mime-ja.texi (CVS): Escape @.
	* luna.el (luna-define-method): Fix the bug that method cache is
	  not cleard.
	* mime-en.texi (CVS): Fix Typo. (@ to @@).
	  mime-ja.texi (CVS): Ditto.
	* std11.el: Update Copyright header.
	* std11.el (std11-non-atom-regexp): New constant.
	  (std11-analyze-atom): New implementation to avoid error in current
	  XEmacs UTF-2000 [may be caused by a bug about regexp].
	* smtp.el (smtp-open-connection-function): Add doc.
	  (smtp-end-of-line): Doc fix.
	* smtp.el (smtp-end-of-line): New variable.
	  (smtp-read-response): Use it.
	  (smtp-send-command): Use it.
	  (smtp-send-data): Use it.

4 files changed, 85 insertions, 92 deletions

diff --git a/devel/flim/Makefile b/devel/flim/Makefile
index f61c6195169..c046dbd2eb5 100644
--- a/devel/flim/Makefile
+++ b/devel/flim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2002/10/19 06:56:28 minoura Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/11 15:20:28 uebayasi Exp $
 
-DISTNAME=	flim-1.14.3
+DISTNAME=	flim-1.14.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/
 
@@ -8,18 +8,18 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.m17n.org/FLIM/
 COMMENT=	Emacs lisp library for message representation/encoding
 
-DEPENDS+=	${PKGNAME_PREFIX}apel-10.*:../../devel/apel
+DEPENDS+=	apel>=9.22:../../devel/apel
 
 .include "../../mk/emacs.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
 ALL_TARGET=     elc
 INSTALL_TARGET= install
-PLIST_SRC=      ${PKGDIR}/PLIST.emacs
+#PLIST_SRC=      ${PKGDIR}/PLIST.emacs
 .else   # ${EMACS_FLAVOR} == "xemacs"
 ALL_TARGET=     package
 INSTALL_TARGET= install-package
-PLIST_SRC=      ${PKGDIR}/PLIST.xemacs
+#PLIST_SRC=      ${PKGDIR}/PLIST.xemacs
 MAKEFLAGS+=     PACKAGEDIR=${EMACS_LISPPREX:C|/lisp$||}
 .endif
 
diff --git a/devel/flim/PLIST b/devel/flim/PLIST
index 7510cd8959c..ed079d85662 100644
--- a/devel/flim/PLIST
+++ b/devel/flim/PLIST
@@ -1,71 +1,77 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:28 zuntum Exp $
-share/emacs/20.7/site-lisp/flim/mailcap.el
-share/emacs/20.7/site-lisp/flim/mailcap.elc
-@dirrm share/emacs/20.7/site-lisp/flim
-share/emacs/site-lisp/flim/eword-decode.el
-share/emacs/site-lisp/flim/eword-decode.elc
-share/emacs/site-lisp/flim/eword-encode.el
-share/emacs/site-lisp/flim/eword-encode.elc
-share/emacs/site-lisp/flim/hex-util.el
-share/emacs/site-lisp/flim/hex-util.elc
-share/emacs/site-lisp/flim/hmac-def.el
-share/emacs/site-lisp/flim/hmac-def.elc
-share/emacs/site-lisp/flim/hmac-md5.el
-share/emacs/site-lisp/flim/hmac-md5.elc
-share/emacs/site-lisp/flim/hmac-sha1.el
-share/emacs/site-lisp/flim/hmac-sha1.elc
-share/emacs/site-lisp/flim/luna.el
-share/emacs/site-lisp/flim/luna.elc
-share/emacs/site-lisp/flim/lunit.el
-share/emacs/site-lisp/flim/lunit.elc
-share/emacs/site-lisp/flim/md5-el.el
-share/emacs/site-lisp/flim/md5-el.elc
-share/emacs/site-lisp/flim/md5.el
-share/emacs/site-lisp/flim/md5.elc
-share/emacs/site-lisp/flim/mel-b-ccl.el
-share/emacs/site-lisp/flim/mel-b-ccl.elc
-share/emacs/site-lisp/flim/mel-g.el
-share/emacs/site-lisp/flim/mel-g.elc
-share/emacs/site-lisp/flim/mel-q-ccl.el
-share/emacs/site-lisp/flim/mel-q-ccl.elc
-share/emacs/site-lisp/flim/mel-q.el
-share/emacs/site-lisp/flim/mel-q.elc
-share/emacs/site-lisp/flim/mel-u.el
-share/emacs/site-lisp/flim/mel-u.elc
-share/emacs/site-lisp/flim/mel.el
-share/emacs/site-lisp/flim/mel.elc
-share/emacs/site-lisp/flim/mime-conf.el
-share/emacs/site-lisp/flim/mime-conf.elc
-share/emacs/site-lisp/flim/mime-def.el
-share/emacs/site-lisp/flim/mime-def.elc
-share/emacs/site-lisp/flim/mime-parse.el
-share/emacs/site-lisp/flim/mime-parse.elc
-share/emacs/site-lisp/flim/mime.el
-share/emacs/site-lisp/flim/mime.elc
-share/emacs/site-lisp/flim/mmbuffer.el
-share/emacs/site-lisp/flim/mmbuffer.elc
-share/emacs/site-lisp/flim/mmcooked.el
-share/emacs/site-lisp/flim/mmcooked.elc
-share/emacs/site-lisp/flim/mmexternal.el
-share/emacs/site-lisp/flim/mmexternal.elc
-share/emacs/site-lisp/flim/mmgeneric.el
-share/emacs/site-lisp/flim/mmgeneric.elc
-share/emacs/site-lisp/flim/qmtp.el
-share/emacs/site-lisp/flim/qmtp.elc
-share/emacs/site-lisp/flim/sasl-cram.el
-share/emacs/site-lisp/flim/sasl-cram.elc
-share/emacs/site-lisp/flim/sasl-digest.el
-share/emacs/site-lisp/flim/sasl-digest.elc
-share/emacs/site-lisp/flim/sasl.el
-share/emacs/site-lisp/flim/sasl.elc
-share/emacs/site-lisp/flim/sha1-el.el
-share/emacs/site-lisp/flim/sha1-el.elc
-share/emacs/site-lisp/flim/sha1.el
-share/emacs/site-lisp/flim/sha1.elc
-share/emacs/site-lisp/flim/smtp.el
-share/emacs/site-lisp/flim/smtp.elc
-share/emacs/site-lisp/flim/smtpmail.el
-share/emacs/site-lisp/flim/smtpmail.elc
-share/emacs/site-lisp/flim/std11.el
-share/emacs/site-lisp/flim/std11.elc
-@dirrm share/emacs/site-lisp/flim
+@comment $NetBSD: PLIST,v 1.2 2003/01/11 15:20:28 uebayasi Exp $
+${EMACS_LISPPREFIX}/flim/eword-decode.el
+${EMACS_LISPPREFIX}/flim/eword-decode.elc
+${EMACS_LISPPREFIX}/flim/eword-encode.el
+${EMACS_LISPPREFIX}/flim/eword-encode.elc
+${EMACS_LISPPREFIX}/flim/hex-util.el
+${EMACS_LISPPREFIX}/flim/hex-util.elc
+${EMACS_LISPPREFIX}/flim/hmac-def.el
+${EMACS_LISPPREFIX}/flim/hmac-def.elc
+${EMACS_LISPPREFIX}/flim/hmac-md5.el
+${EMACS_LISPPREFIX}/flim/hmac-md5.elc
+${EMACS_LISPPREFIX}/flim/hmac-sha1.el
+${EMACS_LISPPREFIX}/flim/hmac-sha1.elc
+${EMACS_LISPPREFIX}/flim/luna.el
+${EMACS_LISPPREFIX}/flim/luna.elc
+${EMACS_LISPPREFIX}/flim/lunit.el
+${EMACS_LISPPREFIX}/flim/lunit.elc
+${EMACS_LISPPREFIX}/flim/md4.el
+${EMACS_LISPPREFIX}/flim/md4.elc
+@comment See emacs.mk for FOR_emacs20.
+${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.el
+${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.elc
+${EMACS_LISPPREFIX}/flim/md5.el
+${EMACS_LISPPREFIX}/flim/md5.elc
+${EMACS_LISPPREFIX}/flim/mel-b-ccl.el
+${EMACS_LISPPREFIX}/flim/mel-b-ccl.elc
+${EMACS_LISPPREFIX}/flim/mel-g.el
+${EMACS_LISPPREFIX}/flim/mel-g.elc
+${EMACS_LISPPREFIX}/flim/mel-q-ccl.el
+${EMACS_LISPPREFIX}/flim/mel-q-ccl.elc
+${EMACS_LISPPREFIX}/flim/mel-q.el
+${EMACS_LISPPREFIX}/flim/mel-q.elc
+${EMACS_LISPPREFIX}/flim/mel-u.el
+${EMACS_LISPPREFIX}/flim/mel-u.elc
+${EMACS_LISPPREFIX}/flim/mel.el
+${EMACS_LISPPREFIX}/flim/mel.elc
+${EMACS_LISPPREFIX}/flim/mime-conf.el
+${EMACS_LISPPREFIX}/flim/mime-conf.elc
+${EMACS_LISPPREFIX}/flim/mime-def.el
+${EMACS_LISPPREFIX}/flim/mime-def.elc
+${EMACS_LISPPREFIX}/flim/mime-parse.el
+${EMACS_LISPPREFIX}/flim/mime-parse.elc
+${EMACS_LISPPREFIX}/flim/mime.el
+${EMACS_LISPPREFIX}/flim/mime.elc
+${EMACS_LISPPREFIX}/flim/mmbuffer.el
+${EMACS_LISPPREFIX}/flim/mmbuffer.elc
+${EMACS_LISPPREFIX}/flim/mmcooked.el
+${EMACS_LISPPREFIX}/flim/mmcooked.elc
+${EMACS_LISPPREFIX}/flim/mmexternal.el
+${EMACS_LISPPREFIX}/flim/mmexternal.elc
+${EMACS_LISPPREFIX}/flim/mmgeneric.el
+${EMACS_LISPPREFIX}/flim/mmgeneric.elc
+${EMACS_LISPPREFIX}/flim/ntlm.el
+${EMACS_LISPPREFIX}/flim/ntlm.elc
+${EMACS_LISPPREFIX}/flim/qmtp.el
+${EMACS_LISPPREFIX}/flim/qmtp.elc
+${EMACS_LISPPREFIX}/flim/sasl-cram.el
+${EMACS_LISPPREFIX}/flim/sasl-cram.elc
+${EMACS_LISPPREFIX}/flim/sasl-digest.el
+${EMACS_LISPPREFIX}/flim/sasl-digest.elc
+${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
+${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
+${EMACS_LISPPREFIX}/flim/sasl-scram.el
+${EMACS_LISPPREFIX}/flim/sasl-scram.elc
+${EMACS_LISPPREFIX}/flim/sasl.el
+${EMACS_LISPPREFIX}/flim/sasl.elc
+${EMACS_LISPPREFIX}/flim/sha1-el.el
+${EMACS_LISPPREFIX}/flim/sha1-el.elc
+${EMACS_LISPPREFIX}/flim/sha1.el
+${EMACS_LISPPREFIX}/flim/sha1.elc
+${EMACS_LISPPREFIX}/flim/smtp.el
+${EMACS_LISPPREFIX}/flim/smtp.elc
+${EMACS_LISPPREFIX}/flim/smtpmail.el
+${EMACS_LISPPREFIX}/flim/smtpmail.elc
+${EMACS_LISPPREFIX}/flim/std11.el
+${EMACS_LISPPREFIX}/flim/std11.elc
+@dirrm ${EMACS_LISPPREFIX}/flim
diff --git a/devel/flim/distinfo b/devel/flim/distinfo
index e33355e79ed..1ae70e4d9f8 100644
--- a/devel/flim/distinfo
+++ b/devel/flim/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/07/06 02:00:11 jun Exp $
+$NetBSD: distinfo,v 1.4 2003/01/11 15:20:28 uebayasi Exp $
 
-SHA1 (flim-1.14.3.tar.gz) = 50f7bebd0235ffcee194742a3b36ec3111464a8c
-Size (flim-1.14.3.tar.gz) = 165844 bytes
-SHA1 (patch-aa) = b671f6517905f588f4b05d6ca62e51a5d88e55bc
+SHA1 (flim-1.14.5.tar.gz) = b5a1a8fe382e2a225441fee2f5e583bdb89b775b
+Size (flim-1.14.5.tar.gz) = 178075 bytes
diff --git a/devel/flim/patches/patch-aa b/devel/flim/patches/patch-aa
deleted file mode 100644
index ea9f008d1b5..00000000000
--- a/devel/flim/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/20 09:09:06 jun Exp $
---- Makefile	2001/02/16 00:51:42	1.1
-+++ Makefile	2001/02/16 00:52:30
-@@ -29,6 +29,8 @@
- ARC_DIR = $(ARC_DIR_PREFIX)/flim/flim-$(API)
- SEMI_ARC_DIR = $(ARC_DIR_PREFIX)/semi/semi-1.14-for-flim-$(API)
- 
-+all: elc
-+
- elc:
- 	$(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR) \
- 		$(VERSION_SPECIFIC_LISPDIR)