18 files changed, 208 insertions, 116 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 00f6ca37ab4d..63d9bef43e93 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim-current for emacs
+# New ports collection makefile for:	flim-1.14.x for emacs20
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -8,28 +8,28 @@
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.14/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.14/
 MAINTAINER?=	shige@FreeBSD.org
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.13.2
+FLIM_VER=	1.14.3
+FLIM_TRUNK=	1.14
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
-# for emacs
-EMACS_PORT_NAME=	emacs
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+# for emacs20
+EMACS_PORT_NAME=	emacs20
 .endif
 
 # target name for make build
diff --git a/editors/flim/distinfo b/editors/flim/distinfo
index c5c1ac37bdf0..4434fdac3b69 100644
--- a/editors/flim/distinfo
+++ b/editors/flim/distinfo
@@ -1 +1 @@
-MD5 (flim-1.13.2.tar.gz) = 3a7341529167bd1de0b510150c48d41e
+MD5 (flim-1.14.3.tar.gz) = 5931a530506e944f0605aeb022b5b97c
diff --git a/editors/flim/files/flim-setupel.el.in b/editors/flim/files/flim-setupel.el.in
deleted file mode 100644
index 0f1bf4144e76..000000000000
--- a/editors/flim/files/flim-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)flim-setupel.el -- flim emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
- ) load-path))
-(provide 'flim-setupel)
diff --git a/editors/flim/pkg-comment b/editors/flim/pkg-comment
index 04c6e5a8a792..8517efff787a 100644
--- a/editors/flim/pkg-comment
+++ b/editors/flim/pkg-comment
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim/pkg-comment.emacs20 b/editors/flim/pkg-comment.emacs20
index 04c6e5a8a792..8517efff787a 100644
--- a/editors/flim/pkg-comment.emacs20
+++ b/editors/flim/pkg-comment.emacs20
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim/pkg-comment.emacs21 b/editors/flim/pkg-comment.emacs21
index 04c6e5a8a792..8517efff787a 100644
--- a/editors/flim/pkg-comment.emacs21
+++ b/editors/flim/pkg-comment.emacs21
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim/pkg-descr b/editors/flim/pkg-descr
index 8893698ed661..fc37a0963c9b 100644
--- a/editors/flim/pkg-descr
+++ b/editors/flim/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+FLIM, message representation or encoding emacs lisp library for emacs20.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -8,12 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/	--- FLIM
+	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/emacs/site-lisp/flim/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-descr.emacs20 b/editors/flim/pkg-descr.emacs20
index 8893698ed661..fc37a0963c9b 100644
--- a/editors/flim/pkg-descr.emacs20
+++ b/editors/flim/pkg-descr.emacs20
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+FLIM, message representation or encoding emacs lisp library for emacs20.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -8,12 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/	--- FLIM
+	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/emacs/site-lisp/flim/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-descr.emacs21 b/editors/flim/pkg-descr.emacs21
index 8893698ed661..fc37a0963c9b 100644
--- a/editors/flim/pkg-descr.emacs21
+++ b/editors/flim/pkg-descr.emacs21
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+FLIM, message representation or encoding emacs lisp library for emacs20.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -8,12 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/	--- FLIM
+	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/emacs/site-lisp/flim/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index 8013b178f99f..d257a58aaa84 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -2,20 +2,36 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.el
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
@@ -26,16 +42,32 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index 8013b178f99f..d257a58aaa84 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -2,20 +2,36 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.el
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
@@ -26,16 +42,32 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index 8013b178f99f..d257a58aaa84 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -2,20 +2,36 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.el
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
@@ -26,16 +42,32 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile
index 00f6ca37ab4d..63d9bef43e93 100644
--- a/editors/flim114-emacs20/Makefile
+++ b/editors/flim114-emacs20/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim-current for emacs
+# New ports collection makefile for:	flim-1.14.x for emacs20
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -8,28 +8,28 @@
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.14/ \
+		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.14/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.14/
 MAINTAINER?=	shige@FreeBSD.org
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.13.2
+FLIM_VER=	1.14.3
+FLIM_TRUNK=	1.14
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
-# for emacs
-EMACS_PORT_NAME=	emacs
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+# for emacs20
+EMACS_PORT_NAME=	emacs20
 .endif
 
 # target name for make build
diff --git a/editors/flim114-emacs20/distinfo b/editors/flim114-emacs20/distinfo
index c5c1ac37bdf0..4434fdac3b69 100644
--- a/editors/flim114-emacs20/distinfo
+++ b/editors/flim114-emacs20/distinfo
@@ -1 +1 @@
-MD5 (flim-1.13.2.tar.gz) = 3a7341529167bd1de0b510150c48d41e
+MD5 (flim-1.14.3.tar.gz) = 5931a530506e944f0605aeb022b5b97c
diff --git a/editors/flim114-emacs20/files/flim-setupel.el.in b/editors/flim114-emacs20/files/flim-setupel.el.in
deleted file mode 100644
index 0f1bf4144e76..000000000000
--- a/editors/flim114-emacs20/files/flim-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)flim-setupel.el -- flim emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
- ) load-path))
-(provide 'flim-setupel)
diff --git a/editors/flim114-emacs20/pkg-comment b/editors/flim114-emacs20/pkg-comment
index 04c6e5a8a792..8517efff787a 100644
--- a/editors/flim114-emacs20/pkg-comment
+++ b/editors/flim114-emacs20/pkg-comment
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim114-emacs20/pkg-descr b/editors/flim114-emacs20/pkg-descr
index 8893698ed661..fc37a0963c9b 100644
--- a/editors/flim114-emacs20/pkg-descr
+++ b/editors/flim114-emacs20/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+FLIM, message representation or encoding emacs lisp library for emacs20.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -8,12 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/	--- FLIM
+	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/emacs/site-lisp/flim/
 
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim114-emacs20/pkg-plist b/editors/flim114-emacs20/pkg-plist
index 8013b178f99f..d257a58aaa84 100644
--- a/editors/flim114-emacs20/pkg-plist
+++ b/editors/flim114-emacs20/pkg-plist
@@ -2,20 +2,36 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
 %%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.el
 %%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
+%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
+%%EMACS_LIBDIR%%/site-lisp/flim/md5.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
@@ -26,16 +42,32 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
+%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
+%%EMACS_LIBDIR%%/site-lisp/flim/sha1.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
+%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en