7 files changed, 80 insertions, 6 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index ef75fc1caa11..ed5348d1db68 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -20,7 +20,7 @@ MAINTAINER?=	shige@FreeBSD.org
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.14.3
+FLIM_VER=	${FLIM_TRUNK}.4
 FLIM_TRUNK=	1.14
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
diff --git a/editors/flim/distinfo b/editors/flim/distinfo
index 4434fdac3b69..87a56089ecc2 100644
--- a/editors/flim/distinfo
+++ b/editors/flim/distinfo
@@ -1 +1 @@
-MD5 (flim-1.14.3.tar.gz) = 5931a530506e944f0605aeb022b5b97c
+MD5 (flim-1.14.4.tar.gz) = a17e9a10c610c89e226be04cfc641d6d
diff --git a/editors/flim/files/patch-ac b/editors/flim/files/patch-ac
index 71f45d4ecb8f..f10d0122c9b3 100644
--- a/editors/flim/files/patch-ac
+++ b/editors/flim/files/patch-ac
@@ -1,5 +1,5 @@
---- mime-en.texi.orig	Wed Jan 27 23:12:41 1999
-+++ mime-en.texi	Tue Mar  9 06:10:11 1999
+--- mime-en.texi.orig	Fri Feb 15 14:12:42 2002
++++ mime-en.texi	Mon Aug 12 19:29:19 2002
 @@ -2,6 +2,10 @@
  @c Generated automatically from mime-en.sgml by sinfo 3.7.
  @setfilename mime-en.info
@@ -11,3 +11,28 @@
  @titlepage
  @title FLIM 1.12 Reference Manual about MIME Features
  @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
+@@ -1545,13 +1549,13 @@
+ @example
+ (0) cvs login
+ 
+-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
++    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root login
+ 
+     CVS password: [CR] # NULL string
+ 
+ (1) checkout
+ 
+-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout
++    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root checkout
+ 	checkout [-r TAG] flim
+ @end example
+ 
+@@ -1560,7 +1564,7 @@
+ 
+ @itemize @bullet
+ @item
+- <cvs@cvs.m17n.org>
++ <cvs@@cvs.m17n.org>
+ @end itemize
+ 
+ @noindent
diff --git a/editors/flim/files/patch-ad b/editors/flim/files/patch-ad
index 3ea7ff6154ee..0b1aefdcda3a 100644
--- a/editors/flim/files/patch-ad
+++ b/editors/flim/files/patch-ad
@@ -1,5 +1,5 @@
---- mime-ja.texi.orig	Wed Jan 27 23:12:42 1999
-+++ mime-ja.texi	Tue Mar  9 06:11:05 1999
+--- mime-ja.texi.orig	Fri Feb 15 14:12:42 2002
++++ mime-ja.texi	Mon Aug 12 19:32:16 2002
 @@ -2,6 +2,10 @@
  @c Generated automatically from mime-ja.sgml by sinfo 3.7.
  @setfilename mime-ja.info
@@ -11,3 +11,28 @@
  @titlepage
  @title FLIM 1.12 MIME $B5!G=@bL@=q(B
  @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp>
+@@ -1541,13 +1545,13 @@
+ @example
+ (0) cvs login
+ 
+-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
++    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root login
+ 
+     CVS password: [CR] # NULL string
+ 
+ (1) checkout
+ 
+-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout
++    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root checkout
+ 	checkout [-r TAG] flim
+ @end example
+ 
+@@ -1556,7 +1560,7 @@
+ 
+ @itemize @bullet
+ @item
+- <cvs@cvs.m17n.org>
++ <cvs@@cvs.m17n.org>
+ @end itemize
+ 
+ @noindent
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index 38cbcebb817a..0aa0d5bb5aa7 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -16,6 +16,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
@@ -48,12 +50,18 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index 532f66edaab5..a9e8ac6fd99d 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -16,6 +16,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
@@ -46,12 +48,18 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
diff --git a/editors/flim/pkg-plist.xemacs21-mule b/editors/flim/pkg-plist.xemacs21-mule
index c818f8059e8e..0772a170becd 100644
--- a/editors/flim/pkg-plist.xemacs21-mule
+++ b/editors/flim/pkg-plist.xemacs21-mule
@@ -26,6 +26,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/lunit.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/md4.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/md4.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/md5.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/md5.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-ccl.el
@@ -58,12 +60,18 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/mmexternal.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/ntlm.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/ntlm.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/qmtp.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/qmtp.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl-cram.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl-cram.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl-digest.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl-digest.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-ntlm.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-ntlm.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-scram.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-scram.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/sasl.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/std11.el