Index: head/editors/flim/pkg-plist.xemacs21-mule
===================================================================
--- head/editors/flim/pkg-plist.xemacs21-mule	(revision 426048)
+++ head/editors/flim/pkg-plist.xemacs21-mule	(nonexistent)
@@ -1,88 +0,0 @@
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.flim
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/flim/ChangeLog
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/flim/NEWS
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/flim/README.en
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
-%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/hex-util.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/hex-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-def.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/luna.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/luna.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/lunit.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/lunit.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
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-ccl.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-el.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q-ccl.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q-ccl.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-conf.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-conf.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmexternal.el
-%%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
-%%EMACS_PACKAGESDIR%%/lisp/flim/std11.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/sha1-el.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/sha1-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtp.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtp.elc
-%%EMACS_PACKAGESDIR%%/info/mime-en.info
-%%EMACS_PACKAGESDIR%%/info/mime-ja.info
-%%EMACS_PACKAGESDIR%%/man/flim/mime-en.texi
-%%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
-share/flim/%%FLIM_COOKIE%%

Property changes on: head/editors/flim/pkg-plist.xemacs21-mule
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/flim/Makefile
===================================================================
--- head/editors/flim/Makefile	(revision 426048)
+++ head/editors/flim/Makefile	(revision 426049)
@@ -1,216 +1,195 @@
 # Created by: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
 PORTREVISION=	14
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/flim/flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	Message representation or encoding elisp library for emacs
+MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	Message representation or encoding elisp library for emacs
 
 LICENSE=	GPLv2
 
 PORTCLASS?=	master
 
 USES=		cpe makeinfo
 NO_ARCH=	yes
 
 CPE_VENDOR=	gnu
 
 # distfile version
 FLIM_VER=	${FLIM_TRUNK}.9
 FLIM_TRUNK=	1.14
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 # flim lispdir
 FLIM_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 PORTCLASS?=	master
 USE_EMACS=	yes
 
 EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
 
 # target name for make build
 ALL_TARGET?=	elc
 # environments
 PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 		LISPDIR="${STAGEDIR}${FLIM_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${FLIM_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
-.if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
-DEPPORT_SUFFIX=
-.else
-DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
-.endif
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
 PLIST=		${PKGDIR}/pkg-plist.emacs21
-.endif
-# depends on apel (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages
-MAKE_ARGS+=	PACKAGEDIR="${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}"
-.else
-# depends on apel (case of gnu emacsen etc...)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
-.endif
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
+# depends on apel
+BUILD_DEPENDS+=	apel-${EMACS_PORT_NAME}>0:editors/apel
+RUN_DEPENDS+=	apel-${EMACS_PORT_NAME}>0:editors/apel
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 .if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST)
 INFO=		mime-en
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 INFO+=		mime-ja
 .endif
 .endif
 
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 pre-build: pkg-el-copy
 .endif
 
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 post-build: info-build-by-emacs
 .else
 post-build: info-build
 .endif
 
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 pre-install: mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 pre-install: pkg-el-install
 .endif
 
 POST_INSTALL_TARGET=	pkgcookie-install
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 POST_INSTALL_TARGET+=	info-package-install manifest-install
 .else
 POST_INSTALL_TARGET+=	info-install
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 POST_INSTALL_TARGET+=	doc-install
 .endif
 
 post-install: ${POST_INSTALL_TARGET}
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}/ ; \
 	done)
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
 
 pkgcookie-install:
 # install package-cookie
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/flim
 	@${TOUCH} ${STAGEDIR}${LOCALBASE}/share/flim/${FLIM_COOKIE}
 
 .include <bsd.port.post.mk>
Index: head/editors/flim/files/patch-FLIM-CFG
===================================================================
--- head/editors/flim/files/patch-FLIM-CFG	(revision 426048)
+++ head/editors/flim/files/patch-FLIM-CFG	(revision 426049)
@@ -1,11 +1,11 @@
---- FLIM-CFG.orig	Tue Sep 15 15:26:08 1998
-+++ FLIM-CFG	Sun May  9 01:33:26 1999
+--- FLIM-CFG.orig	2006-12-20 17:40:42 UTC
++++ FLIM-CFG
 @@ -8,6 +8,8 @@
  
  (add-to-list 'load-path
  	     (expand-file-name "../../site-lisp/apel" data-directory))
 +(add-to-list 'load-path
 +	     (expand-file-name "../site-lisp/emu" data-directory))
  
  (if (boundp 'LISPDIR)
      (progn
Index: head/editors/flim/files/patch-eword-encode.el
===================================================================
--- head/editors/flim/files/patch-eword-encode.el	(revision 426048)
+++ head/editors/flim/files/patch-eword-encode.el	(revision 426049)
@@ -1,79 +1,78 @@
 Index: eword-encode.el
 ===================================================================
---- eword-encode.el	(revision 2)
-+++ eword-encode.el	(working copy)
-@@ -162,15 +162,15 @@
+--- eword-encode.el.orig	2007-09-06 07:48:50 UTC
++++ eword-encode.el
+@@ -162,15 +162,15 @@ MODE is allows `text', `comment', `phras
  ;;;
  
  (defmacro make-ew-rword (text charset encoding type)
 -  (` (list (, text)(, charset)(, encoding)(, type))))
 +  `(list ,text ,charset ,encoding ,type))
  (defmacro ew-rword-text (rword)
 -  (` (car (, rword))))
 +  `(car ,rword))
  (defmacro ew-rword-charset (rword)
 -  (` (car (cdr (, rword)))))
 +  `(car (cdr ,rword)))
  (defmacro ew-rword-encoding (rword)
 -  (` (car (cdr (cdr (, rword))))))
 +  `(car (cdr (cdr ,rword))))
  (defmacro ew-rword-type (rword)
 -  (` (car (cdr (cdr (cdr (, rword)))))))
 +  `(car (cdr (cdr (cdr ,rword)))))
  
  (defun ew-find-charset-rule (charsets)
    (if charsets
-@@ -184,31 +184,31 @@
+@@ -184,30 +184,30 @@ MODE is allows `text', `comment', `phras
  ;; which is not depended on the Mule model.  We should redesign
  ;; `eword-encode-split-string' to avoid to depend on the Mule model.
  (if (featurep 'utf-2000)
 -;; for CHISE Architecture
 -(defun tm-eword::words-to-ruled-words (wl &optional mode)
 -  (let (mcs)
 +    ;; for CHISE Architecture
 +    (defun tm-eword::words-to-ruled-words (wl &optional mode)
 +      (let (mcs)
 +	(mapcar (function
 +		 (lambda (word)
 +		   (setq mcs (detect-mime-charset-string (cdr word)))
 +		   (make-ew-rword
 +		    (cdr word)
 +		    mcs
 +		    (cdr (or (assq mcs mime-header-charset-encoding-alist)
 +			     (cons mcs mime-header-default-charset-encoding)))
 +		    mode)
 +		   ))
 +		wl)))
 +
 +  ;; for legacy Mule
 +  (defun tm-eword::words-to-ruled-words (wl &optional mode)
      (mapcar (function
  	     (lambda (word)
 -	       (setq mcs (detect-mime-charset-string (cdr word)))
 -	       (make-ew-rword
 -		(cdr word)
 -		mcs
 -		(cdr (or (assq mcs mime-header-charset-encoding-alist)
 -			 (cons mcs mime-header-default-charset-encoding)))
 -		mode)
 -	       ))
 -	    wl)))
-+	       (let ((ret (ew-find-charset-rule (car word))))
-+		 (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode)
-+		 )))
-+	    wl))
-+  )
- 
+-
 -;; for legacy Mule
 -(defun tm-eword::words-to-ruled-words (wl &optional mode)
 -  (mapcar (function
 -	   (lambda (word)
 -	     (let ((ret (ew-find-charset-rule (car word))))
 -	       (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode)
 -	       )))
 -	  wl))
 -)
--
++	       (let ((ret (ew-find-charset-rule (car word))))
++		 (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode)
++		 )))
++	    wl))
++  )
+ 
  (defun ew-space-process (seq)
    (let (prev a ac b c cc)
-     (while seq
Index: head/editors/flim/files/patch-hex-util.el
===================================================================
--- head/editors/flim/files/patch-hex-util.el	(revision 426048)
+++ head/editors/flim/files/patch-hex-util.el	(revision 426049)
@@ -1,26 +1,26 @@
 Index: hex-util.el
 ===================================================================
---- hex-util.el	(revision 2)
-+++ hex-util.el	(working copy)
+--- hex-util.el.orig	2007-09-05 23:39:48 UTC
++++ hex-util.el
 @@ -28,14 +28,14 @@
  
  (eval-when-compile
    (defmacro hex-char-to-num (chr)
 -    (` (let ((chr (, chr)))
 -	 (cond
 -	  ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10))
 -	  ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10))
 -	  ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0))
 -	  (t (error "Invalid hexadecimal digit `%c'" chr))))))
 +    `(let ((chr ,chr))
 +       (cond
 +	((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10))
 +	((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10))
 +	((and (<= ?0 chr)(<= chr ?9)) (- chr ?0))
 +	(t (error "Invalid hexadecimal digit `%c'" chr)))))
    (defmacro num-to-hex-char (num)
 -    (` (aref "0123456789abcdef" (, num)))))
 +    `(aref "0123456789abcdef" ,num)))
  
  (defun decode-hex-string (string)
    "Decode hexadecimal STRING to octet string."
Index: head/editors/flim/files/patch-hmac-def.el
===================================================================
--- head/editors/flim/files/patch-hmac-def.el	(revision 426048)
+++ head/editors/flim/files/patch-hmac-def.el	(revision 426049)
@@ -1,89 +1,89 @@
---- hmac-def.el.orig	2007-09-06 08:39:48.000000000 +0900
-+++ hmac-def.el	2012-08-23 00:42:35.000000000 +0900
-@@ -39,46 +39,46 @@
+--- hmac-def.el.orig	2007-09-05 23:39:48 UTC
++++ hmac-def.el
+@@ -39,46 +39,46 @@ a string and return a digest of it (in b
  B is a byte-length of a block size of H. (B=64 for both SHA1 and MD5.)
  L is a byte-length of hash outputs. (L=16 for MD5, L=20 for SHA1.)
  If BIT is non-nil, truncate output to specified bits."
 -  (` (defun (, name) (text key)
 -       (, (concat "Compute "
 -		  (upcase (symbol-name name))
 -		  " over TEXT with KEY."))
 -       (let ((key-xor-ipad (make-string (, B) ?\x36))
 -	     (key-xor-opad (make-string (, B) ?\x5C))
 -	     (len (length key))
 -	     (pos 0))
 -	 (unwind-protect
 -	     (progn
 -	       ;; if `key' is longer than the block size, apply hash function
 -	       ;; to `key' and use the result as a real `key'.
 -	       (if (> len (, B))
 -		   (setq key ((, H) key)
 -			 len (, L)))
 -	       (while (< pos len)
 -		 (aset key-xor-ipad pos (logxor (aref key pos) ?\x36))
 -		 (aset key-xor-opad pos (logxor (aref key pos) ?\x5C))
 -		 (setq pos (1+ pos)))
 -	       (setq key-xor-ipad (unwind-protect
 -				      (concat key-xor-ipad text)
 -				    (fillarray key-xor-ipad 0))
 -		     key-xor-ipad (unwind-protect
 -				      ((, H) key-xor-ipad)
 -				    (fillarray key-xor-ipad 0))
 -		     key-xor-opad (unwind-protect
 -				      (concat key-xor-opad key-xor-ipad)
 -				    (fillarray key-xor-opad 0))
 -		     key-xor-opad (unwind-protect
 -				      ((, H) key-xor-opad)
 -				    (fillarray key-xor-opad 0)))
 -	       ;; now `key-xor-opad' contains
 -	       ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)).
 -	       (, (if (and bit (< (/ bit 8) L))
 -		      (` (substring key-xor-opad 0 (, (/ bit 8))))
 -		    ;; return a copy of `key-xor-opad'.
 -		    (` (concat key-xor-opad)))))
 -	   ;; cleanup.
 -	   (fillarray key-xor-ipad 0)
 -	   (fillarray key-xor-opad 0))))))
 +  `(defun ,name (text key)
 +     ,(concat "Compute "
 +              (upcase (symbol-name name))
 +              " over TEXT with KEY.")
 +     (let ((key-xor-ipad (make-string ,B ?\x36))
 +           (key-xor-opad (make-string ,B ?\x5C))
 +           (len (length key))
 +           (pos 0))
 +       (unwind-protect
 +           (progn
 +             ;; if `key' is longer than the block size, apply hash function
 +             ;; to `key' and use the result as a real `key'.
 +             (if (> len ,B)
 +                 (setq key (,H key)
 +                       len ,L))
 +             (while (< pos len)
 +               (aset key-xor-ipad pos (logxor (aref key pos) ?\x36))
 +               (aset key-xor-opad pos (logxor (aref key pos) ?\x5C))
 +               (setq pos (1+ pos)))
 +             (setq key-xor-ipad (unwind-protect
 +                                    (concat key-xor-ipad text)
 +                                  (fillarray key-xor-ipad 0))
 +                   key-xor-ipad (unwind-protect
 +                                    (,H key-xor-ipad)
 +                                  (fillarray key-xor-ipad 0))
 +                   key-xor-opad (unwind-protect
 +                                    (concat key-xor-opad key-xor-ipad)
 +                                  (fillarray key-xor-opad 0))
 +                   key-xor-opad (unwind-protect
 +                                    (,H key-xor-opad)
 +                                  (fillarray key-xor-opad 0)))
 +             ;; now `key-xor-opad' contains
 +             ;; H(KEY XOR opad, H(KEY XOR ipad, TEXT)).
 +             ,(if (and bit (< (/ bit 8) L))
 +                  `(substring key-xor-opad 0 ,(/ bit 8))
 +                ;; return a copy of `key-xor-opad'.
 +                `(concat key-xor-opad)))
 +         ;; cleanup.
 +         (fillarray key-xor-ipad 0)
 +         (fillarray key-xor-opad 0)))))
  
  (provide 'hmac-def)
  
Index: head/editors/flim/files/patch-md4.el
===================================================================
--- head/editors/flim/files/patch-md4.el	(revision 426048)
+++ head/editors/flim/files/patch-md4.el	(revision 426049)
@@ -1,42 +1,42 @@
 Index: md4.el
 ===================================================================
---- md4.el	(revision 2)
-+++ md4.el	(working copy)
-@@ -78,21 +78,20 @@
+--- md4.el.orig	2007-09-05 23:39:48 UTC
++++ md4.el
+@@ -78,21 +78,20 @@ bytes long.  N is required to handle str
        (setq m (md4-copy64 (substring buf 64)))
        (md4-64 m)))
  
 -    (concat (md4-pack-int32 (aref md4-buffer 0))
 -	    (md4-pack-int32 (aref md4-buffer 1))
 -	    (md4-pack-int32 (aref md4-buffer 2))
 -	    (md4-pack-int32 (aref md4-buffer 3))))
 +  (concat (md4-pack-int32 (aref md4-buffer 0))
 +	  (md4-pack-int32 (aref md4-buffer 1))
 +	  (md4-pack-int32 (aref md4-buffer 2))
 +	  (md4-pack-int32 (aref md4-buffer 3))))
  
  (defsubst md4-F (x y z) (logior (logand x y) (logand (lognot x) z)))
  (defsubst md4-G (x y z) (logior (logand x y) (logand x z) (logand y z)))
  (defsubst md4-H (x y z) (logxor x y z))
  
  (defmacro md4-make-step (name func)
 -  (`
 -   (defun (, name) (a b c d xk s ac)
 +  `(defun ,name (a b c d xk s ac)
       (let*
 -         ((h1 (+ (car a) ((, func) (car b) (car c) (car d)) (car xk) (car ac)))
 -          (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac)))
 +         ((h1 (+ (car a) (,func (car b) (car c) (car d)) (car xk) (car ac)))
 +          (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr xk) (cdr ac)))
            (h2 (logand 65535 (+ h1 (lsh l1 -16))))
            (l2 (logand 65535 l1))
  	  ;; cyclic shift of 32 bits integer
-@@ -102,7 +101,7 @@
+@@ -102,7 +101,7 @@ bytes long.  N is required to handle str
            (l3 (logand 65535 (if (> s 15)
                                  (+ (lsh l2 (- s 32)) (lsh h2 (- s 16)))
                                (+ (lsh l2 s) (lsh h2 (- s 16)))))))
 -       (cons h3 l3)))))
 +       (cons h3 l3))))
  
  (md4-make-step md4-round1 md4-F)
  (md4-make-step md4-round2 md4-G)
Index: head/editors/flim/files/patch-md5-el.el
===================================================================
--- head/editors/flim/files/patch-md5-el.el	(revision 426048)
+++ head/editors/flim/files/patch-md5-el.el	(revision 426049)
@@ -1,26 +1,26 @@
---- md5-el.el.orig	2000-11-06 22:03:19.000000000 +0900
-+++ md5-el.el	2012-08-23 00:42:35.000000000 +0900
-@@ -169,11 +169,10 @@
+--- md5-el.el.orig	2000-11-06 13:03:19 UTC
++++ md5-el.el
+@@ -169,11 +169,10 @@ Returns a vector of 16 bytes containing 
  (defsubst md5-I (x y z) (logxor y (logior x (logand 65535 (lognot z)))))
  
  (defmacro md5-make-step (name func)
 -  (`
 -   (defun (, name) (a b c d x s ac)
 +  `(defun ,name (a b c d x s ac)
       (let*
 -         ((m1 (+ (car a) ((, func) (car b) (car c) (car d)) (car x) (car ac)))
 -          (l1 (+ (cdr a) ((, func) (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac)))
 +         ((m1 (+ (car a) (,func (car b) (car c) (car d)) (car x) (car ac)))
 +          (l1 (+ (cdr a) (,func (cdr b) (cdr c) (cdr d)) (cdr x) (cdr ac)))
            (m2 (logand 65535 (+ m1 (lsh l1 -16))))
            (l2 (logand 65535 l1))
            (m3 (logand 65535 (if (> s 15)
-@@ -182,7 +181,7 @@
+@@ -182,7 +181,7 @@ Returns a vector of 16 bytes containing 
            (l3 (logand 65535 (if (> s 15)
                                  (+ (lsh l2 (- s 32)) (lsh m2 (- s 16)))
                                (+ (lsh l2 s) (lsh m2 (- s 16)))))))
 -       (md5-add (cons m3 l3) b)))))
 +       (md5-add (cons m3 l3) b))))
  
  (md5-make-step md5-FF md5-F)
  (md5-make-step md5-GG md5-G)
Index: head/editors/flim/files/patch-mime-en.texi
===================================================================
--- head/editors/flim/files/patch-mime-en.texi	(revision 426048)
+++ head/editors/flim/files/patch-mime-en.texi	(revision 426049)
@@ -1,15 +1,15 @@
---- ./mime-en.texi.orig	2002-10-08 15:50:05.000000000 +0000
-+++ ./mime-en.texi	2014-06-28 06:58:47.000000000 +0000
+--- mime-en.texi.orig	2002-10-08 15:50:05 UTC
++++ mime-en.texi
 @@ -1,7 +1,11 @@
  \input texinfo.tex
  @c Generated automatically from mime-en.sgml by sinfo 3.7.
  @setfilename mime-en.info
 -@settitle{FLIM 1.14 Reference Manual about MIME Features}
 +@settitle FLIM 1.14 Reference Manual about MIME Features
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
 +* mime-en: (mime-en).		MIME features for GNU Emacs. (English)
 +@end direntry 
  @titlepage
  @title FLIM 1.14 Reference Manual about MIME Features
  @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
Index: head/editors/flim/files/patch-mime-ja.texi
===================================================================
--- head/editors/flim/files/patch-mime-ja.texi	(revision 426048)
+++ head/editors/flim/files/patch-mime-ja.texi	(revision 426049)
@@ -1,15 +1,15 @@
---- ./mime-ja.texi.orig	2002-10-08 15:50:05.000000000 +0000
-+++ ./mime-ja.texi	2014-06-28 06:59:01.000000000 +0000
+--- mime-ja.texi.orig	2002-10-08 15:50:05 UTC
++++ mime-ja.texi
 @@ -1,7 +1,11 @@
  \input texinfo.tex
  @c Generated automatically from mime-ja.sgml by sinfo 3.7.
  @setfilename mime-ja.info
 -@settitle{FLIM 1.14 MIME 機能説明書}
 +@settitle FLIM 1.14 MIME 機能説明書
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
 +* mime-ja: (mime-ja).		MIME features for GNU Emacs. (Japanese)
 +@end direntry 
  @titlepage
  @title FLIM 1.14 MIME 機能説明書
  @author 守岡 知彦 <morioka@@jaist.ac.jp>
Index: head/editors/flim/files/patch-sha1-el.el
===================================================================
--- head/editors/flim/files/patch-sha1-el.el	(revision 426048)
+++ head/editors/flim/files/patch-sha1-el.el	(revision 426049)
@@ -1,165 +1,165 @@
 Index: sha1-el.el
 ===================================================================
---- sha1-el.el	(revision 2)
-+++ sha1-el.el	(working copy)
-@@ -125,91 +125,91 @@
+--- sha1-el.el.orig	2007-09-05 23:39:48 UTC
++++ sha1-el.el
+@@ -125,91 +125,91 @@ If this variable is set to nil, use inte
  
  ;;; original definition of sha1-F0.
  ;;; (defmacro sha1-F0 (B C D)
 -;;;   (` (logior (logand (, B) (, C))
 -;;; 	     (logand (lognot (, B)) (, D)))))
 +;;;   `(logior (logand ,B ,C)
 +;;; 	     (logand (lognot ,B) ,D)))
  ;;; a little optimization from GnuPG/cipher/sha1.c.
    (defmacro sha1-F0 (B C D)
 -    (` (logxor (, D) (logand (, B) (logxor (, C) (, D))))))
 +    `(logxor ,D (logand ,B (logxor ,C ,D))))
    (defmacro sha1-F1 (B C D)
 -    (` (logxor (, B) (, C) (, D))))
 +    `(logxor ,B ,C ,D))
  ;;; original definition of sha1-F2.
  ;;; (defmacro sha1-F2 (B C D)
 -;;;   (` (logior (logand (, B) (, C))
 -;;; 	     (logand (, B) (, D))
 -;;; 	     (logand (, C) (, D)))))
 +;;;   `(logior (logand ,B ,C)
 +;;; 	     (logand ,B ,D)
 +;;; 	     (logand ,C ,D)))
  ;;; a little optimization from GnuPG/cipher/sha1.c.
    (defmacro sha1-F2 (B C D)
 -    (` (logior (logand (, B) (, C))
 -	       (logand (, D) (logior (, B) (, C))))))
 +    `(logior (logand ,B ,C)
 +	     (logand ,D (logior ,B ,C))))
    (defmacro sha1-F3 (B C D)
 -    (` (logxor (, B) (, C) (, D))))
 +    `(logxor ,B ,C ,D))
  
    (defmacro sha1-S1  (W-high W-low)
 -    (` (let ((W-high (, W-high))
 -	     (W-low  (, W-low)))
 -	 (setq S1W-high (+ (% (* W-high 2) 65536)
 -			   (/ W-low (, (/ 65536 2)))))
 -	 (setq S1W-low (+ (/ W-high (, (/ 65536 2)))
 -			  (% (* W-low 2) 65536))))))
 +    `(let ((W-high ,W-high)
 +	   (W-low  ,W-low))
 +       (setq S1W-high (+ (% (* W-high 2) 65536)
 +			 (/ W-low ,(/ 65536 2))))
 +       (setq S1W-low (+ (/ W-high ,(/ 65536 2))
 +			(% (* W-low 2) 65536)))))
    (defmacro sha1-S5  (A-high A-low)
 -    (` (progn
 -	 (setq S5A-high (+ (% (* (, A-high) 32) 65536)
 -			   (/ (, A-low) (, (/ 65536 32)))))
 -	 (setq S5A-low  (+ (/ (, A-high) (, (/ 65536 32)))
 -			   (% (* (, A-low) 32) 65536))))))
 +    `(progn
 +       (setq S5A-high (+ (% (* ,A-high 32) 65536)
 +			 (/ ,A-low ,(/ 65536 32))))
 +       (setq S5A-low  (+ (/ ,A-high , (/ 65536 32))
 +			 (% (* ,A-low 32) 65536)))))
    (defmacro sha1-S30 (B-high B-low)
 -    (` (progn
 -	 (setq S30B-high (+ (/ (, B-high) 4)
 -			    (* (% (, B-low) 4) (, (/ 65536 4)))))
 -	 (setq S30B-low  (+ (/ (, B-low) 4)
 -			    (* (% (, B-high) 4) (, (/ 65536 4))))))))
 +    `(progn
 +       (setq S30B-high (+ (/ ,B-high 4)
 +			  (* (% ,B-low 4) ,(/ 65536 4))))
 +       (setq S30B-low  (+ (/ ,B-low 4)
 +			  (* (% ,B-high 4) ,(/ 65536 4))))))
  
    (defmacro sha1-OP (round)
 -    (` (progn
 -	 (sha1-S5 sha1-A-high sha1-A-low)
 -	 (sha1-S30 sha1-B-high sha1-B-low)
 -	 (setq sha1-A-low (+ ((, (intern (format "sha1-F%d" round)))
 -			      sha1-B-low sha1-C-low sha1-D-low)
 -			     sha1-E-low
 -			     (, (symbol-value
 -				 (intern (format "sha1-K%d-low" round))))
 -			     (aref block-low idx)
 -			     (progn
 -			       (setq sha1-E-low sha1-D-low)
 -			       (setq sha1-D-low sha1-C-low)
 -			       (setq sha1-C-low S30B-low)
 -			       (setq sha1-B-low sha1-A-low)
 -			       S5A-low)))
 -	 (setq carry (/ sha1-A-low 65536))
 -	 (setq sha1-A-low (% sha1-A-low 65536))
 -	 (setq sha1-A-high (% (+ ((, (intern (format "sha1-F%d" round)))
 -				  sha1-B-high sha1-C-high sha1-D-high)
 -				 sha1-E-high
 -				 (, (symbol-value
 -				     (intern (format "sha1-K%d-high" round))))
 -				 (aref block-high idx)
 -				 (progn
 -				   (setq sha1-E-high sha1-D-high)
 -				   (setq sha1-D-high sha1-C-high)
 -				   (setq sha1-C-high S30B-high)
 -				   (setq sha1-B-high sha1-A-high)
 -				   S5A-high)
 -				 carry)
 -			      65536)))))
 +    `(progn
 +       (sha1-S5 sha1-A-high sha1-A-low)
 +       (sha1-S30 sha1-B-high sha1-B-low)
 +       (setq sha1-A-low (+ (,(intern (format "sha1-F%d" round))
 +			    sha1-B-low sha1-C-low sha1-D-low)
 +			   sha1-E-low
 +			   ,(symbol-value
 +			     (intern (format "sha1-K%d-low" round)))
 +			   (aref block-low idx)
 +			   (progn
 +			     (setq sha1-E-low sha1-D-low)
 +			     (setq sha1-D-low sha1-C-low)
 +			     (setq sha1-C-low S30B-low)
 +			     (setq sha1-B-low sha1-A-low)
 +			     S5A-low)))
 +       (setq carry (/ sha1-A-low 65536))
 +       (setq sha1-A-low (% sha1-A-low 65536))
 +       (setq sha1-A-high (% (+ (,(intern (format "sha1-F%d" round))
 +				sha1-B-high sha1-C-high sha1-D-high)
 +			       sha1-E-high
 +			       ,(symbol-value
 +				 (intern (format "sha1-K%d-high" round)))
 +			       (aref block-high idx)
 +			       (progn
 +				 (setq sha1-E-high sha1-D-high)
 +				 (setq sha1-D-high sha1-C-high)
 +				 (setq sha1-C-high S30B-high)
 +				 (setq sha1-B-high sha1-A-high)
 +				 S5A-high)
 +			       carry)
 +			    65536))))
  
    (defmacro sha1-add-to-H (H X)
 -    (` (progn
 -	 (setq (, (intern (format "sha1-%s-low" H)))
 -	       (+ (, (intern (format "sha1-%s-low" H)))
 -		  (, (intern (format "sha1-%s-low" X)))))
 -	 (setq carry (/ (, (intern (format "sha1-%s-low" H))) 65536))
 -	 (setq (, (intern (format "sha1-%s-low" H)))
 -	       (% (, (intern (format "sha1-%s-low" H))) 65536))
 -	 (setq (, (intern (format "sha1-%s-high" H)))
 -	       (% (+ (, (intern (format "sha1-%s-high" H)))
 -		     (, (intern (format "sha1-%s-high" X)))
 -		     carry)
 -		  65536)))))
 +    `(progn
 +       (setq ,(intern (format "sha1-%s-low" H))
 +	     (+ ,(intern (format "sha1-%s-low" H))
 +		,(intern (format "sha1-%s-low" X))))
 +       (setq carry (/ ,(intern (format "sha1-%s-low" H)) 65536))
 +       (setq ,(intern (format "sha1-%s-low" H))
 +	     (% ,(intern (format "sha1-%s-low" H)) 65536))
 +       (setq ,(intern (format "sha1-%s-high" H))
 +	     (% (+ ,(intern (format "sha1-%s-high" H))
 +		   ,(intern (format "sha1-%s-high" X))
 +		   carry)
 +		65536))))
    )
  
  ;;; buffers (H0 H1 H2 H3 H4).