1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Fix old-style backquotes issue.

Remove unused pkg-plist.emacs20.

PR:		ports/170960
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
This commit is contained in:
MANTANI Nobutaka 2012-08-25 12:04:09 +00:00
parent e7045e4591
commit 5450833dd5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=303132
6 changed files with 163 additions and 143 deletions

View File

@ -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/

View File

@ -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

View File

@ -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."

View File

@ -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)

View File

@ -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).

View File

@ -1,89 +0,0 @@
%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.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
%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
%%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
%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
%%PORTDOCS%%%%FLIMDOCDIR%%/ChangeLog
%%PORTDOCS%%%%FLIMDOCDIR%%/NEWS
%%PORTDOCS%%%%FLIMDOCDIR%%/README.en
%%PORTDOCS%%%%FLIMDOCDIR%%/README.ja
%%PORTDOCS%%%%FLIMDOCDIR%%/VERSION
%%PORTDOCS%%@dirrm %%FLIMDOCDIR%%
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
info/mime-ja.info
@exec install-info %D/info/mime-ja.info %D/info/dir
share/flim/%%FLIM_COOKIE%%
@unexec /bin/rmdir %D/share/flim || true