svn commit: r303132 - in head/editors/flim: . files
MANTANI Nobutaka
nobutaka at FreeBSD.org
Sat Aug 25 12:04:10 UTC 2012
Author: nobutaka
Date: Sat Aug 25 12:04:09 2012
New Revision: 303132
URL: http://svn.freebsd.org/changeset/ports/303132
Log:
Fix old-style backquotes issue.
Remove unused pkg-plist.emacs20.
PR: ports/170960
Submitted by: Yasuhiro KIMURA <yasu at utahime.org>
Added:
head/editors/flim/files/patch-hex-util.el (contents, props changed)
Deleted:
head/editors/flim/pkg-plist.emacs20
Modified:
head/editors/flim/Makefile
head/editors/flim/files/patch-eword-encode.el
head/editors/flim/files/patch-md4.el
head/editors/flim/files/patch-sha1-el.el
Modified: head/editors/flim/Makefile
==============================================================================
--- head/editors/flim/Makefile Sat Aug 25 12:02:28 2012 (r303131)
+++ head/editors/flim/Makefile Sat Aug 25 12:04:09 2012 (r303132)
@@ -7,7 +7,7 @@
PORTNAME= flim
PORTVERSION= ${FLIM_VER}
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= editors elisp
MASTER_SITES= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/
Modified: head/editors/flim/files/patch-eword-encode.el
==============================================================================
--- head/editors/flim/files/patch-eword-encode.el Sat Aug 25 12:02:28 2012 (r303131)
+++ head/editors/flim/files/patch-eword-encode.el Sat Aug 25 12:04:09 2012 (r303132)
@@ -1,5 +1,7 @@
---- eword-encode.el.orig 2007-09-06 16:48:50.000000000 +0900
-+++ eword-encode.el 2012-08-23 00:42:35.000000000 +0900
+Index: eword-encode.el
+===================================================================
+--- eword-encode.el (revision 2)
++++ eword-encode.el (working copy)
@@ -162,15 +162,15 @@
;;;
@@ -21,3 +23,57 @@
(defun ew-find-charset-rule (charsets)
(if charsets
+@@ -184,31 +184,31 @@
+ ;; 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))
+-)
+-
+ (defun ew-space-process (seq)
+ (let (prev a ac b c cc)
+ (while seq
Added: head/editors/flim/files/patch-hex-util.el
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/flim/files/patch-hex-util.el Sat Aug 25 12:04:09 2012 (r303132)
@@ -0,0 +1,26 @@
+Index: hex-util.el
+===================================================================
+--- hex-util.el (revision 2)
++++ hex-util.el (working copy)
+@@ -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."
Modified: head/editors/flim/files/patch-md4.el
==============================================================================
--- head/editors/flim/files/patch-md4.el Sat Aug 25 12:02:28 2012 (r303131)
+++ head/editors/flim/files/patch-md4.el Sat Aug 25 12:04:09 2012 (r303132)
@@ -1,6 +1,22 @@
---- md4.el.orig 2007-09-06 08:39:48.000000000 +0900
-+++ md4.el 2012-08-23 00:42:35.000000000 +0900
-@@ -88,11 +88,10 @@
+Index: md4.el
+===================================================================
+--- md4.el (revision 2)
++++ md4.el (working copy)
+@@ -78,21 +78,20 @@
+ (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)
Modified: head/editors/flim/files/patch-sha1-el.el
==============================================================================
--- head/editors/flim/files/patch-sha1-el.el Sat Aug 25 12:02:28 2012 (r303131)
+++ head/editors/flim/files/patch-sha1-el.el Sat Aug 25 12:04:09 2012 (r303132)
@@ -1,7 +1,15 @@
---- sha1-el.el.orig 2007-09-06 08:39:48.000000000 +0900
-+++ sha1-el.el 2012-08-23 00:42:35.000000000 +0900
-@@ -129,9 +129,9 @@
- ;;; (logand (lognot (, B)) (, D)))))
+Index: sha1-el.el
+===================================================================
+--- sha1-el.el (revision 2)
++++ sha1-el.el (working copy)
+@@ -125,91 +125,91 @@
+
+ ;;; 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))))))
@@ -11,15 +19,18 @@
+ `(logxor ,B ,C ,D))
;;; original definition of sha1-F2.
;;; (defmacro sha1-F2 (B C D)
- ;;; (` (logior (logand (, B) (, C))
-@@ -139,77 +139,77 @@
- ;;; (logand (, 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))))
++ (logand ,D (logior ,B ,C))))
(defmacro sha1-F3 (B C D)
- (` (logxor (, B) (, C) (, D))))
+ `(logxor ,B ,C ,D))
@@ -32,11 +43,11 @@
- (setq S1W-low (+ (/ W-high (, (/ 65536 2)))
- (% (* W-low 2) 65536))))))
+ `(let ((W-high ,W-high)
-+ (W-low ,W-low))
++ (W-low ,W-low))
+ (setq S1W-high (+ (% (* W-high 2) 65536)
-+ (/ W-low ,(/ 65536 2))))
++ (/ W-low ,(/ 65536 2))))
+ (setq S1W-low (+ (/ W-high ,(/ 65536 2))
-+ (% (* W-low 2) 65536)))))
++ (% (* W-low 2) 65536)))))
(defmacro sha1-S5 (A-high A-low)
- (` (progn
- (setq S5A-high (+ (% (* (, A-high) 32) 65536)
@@ -45,9 +56,9 @@
- (% (* (, 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)))))
++ (/ ,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)
@@ -56,9 +67,9 @@
- (* (% (, B-high) 4) (, (/ 65536 4))))))))
+ `(progn
+ (setq S30B-high (+ (/ ,B-high 4)
-+ (* (% ,B-low 4) ,(/ 65536 4))))
++ (* (% ,B-low 4) ,(/ 65536 4))))
+ (setq S30B-low (+ (/ ,B-low 4)
-+ (* (% ,B-high 4) ,(/ 65536 4))))))
++ (* (% ,B-high 4) ,(/ 65536 4))))))
(defmacro sha1-OP (round)
- (` (progn
@@ -96,33 +107,33 @@
+ (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)))
++ 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))))
++ 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
@@ -139,16 +150,16 @@
- 65536)))))
+ `(progn
+ (setq ,(intern (format "sha1-%s-low" H))
-+ (+ ,(intern (format "sha1-%s-low" H))
-+ ,(intern (format "sha1-%s-low" X))))
++ (+ ,(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))
++ (% ,(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))))
++ (% (+ ,(intern (format "sha1-%s-high" H))
++ ,(intern (format "sha1-%s-high" X))
++ carry)
++ 65536))))
)
- ;;; buffers (H0 H1 H2 H3 H4).
+ ;;; buffers (H0 H1 H2 H3 H4).
\ No newline at end of file
More information about the svn-ports-all
mailing list