Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25178/main/finkinfo/editors
Modified Files:
apel.info apel.patch flim.info flim.patch mule-ucs.info
mule-ucs.patch semi.info semi.patch wl.info wl.patch yc.info
yc.patch
Log Message:
Moved from unstable.
Index: apel.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/apel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apel.patch 2 Oct 2004 10:41:43 -0000 1.1
+++ apel.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,13 @@
diff -Naur apel-10.6.orig/fink/apel-install apel-10.6/fink/apel-install
--- apel-10.6.orig/fink/apel-install Thu Jan 1 09:00:00 1970
-+++ apel-10.6/fink/apel-install Sat Feb 21 06:06:06 2004
-@@ -0,0 +1,145 @@
++++ apel-10.6/fink/apel-install Tue Mar 15 18:29:35 2005
+@@ -0,0 +1,146 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/install/apel
+set -e
+
+FLAVOR=$1
-+VERSION=10.6-3
[EMAIL PROTECTED]@
+PACKAGE="apel"
+
+if [ -z "${FLAVOR}" ]; then
@@ -136,20 +136,21 @@
+rm -rf ${INSTALL_TMPDIR}
+
+if [ "X${COMPILED}" = Xyes ]; then
-+ # recompile flim
-+ pkg=flim
-+ if [ -d @PREFIX@/share/${FLAVOR}/site-lisp/${pkg} ]; then
++ # recompile flim or limit
++ for pkg in flim limit; do
+ if [ -f @PREFIX@/lib/emacsen-common/packages/install/${pkg} ]; then
-+ @PREFIX@/lib/emacsen-common/packages/remove/${pkg} ${FLAVOR}
-+ @PREFIX@/lib/emacsen-common/packages/install/${pkg} ${FLAVOR}
++ if [ -d @PREFIX@/share/${FLAVOR}/site-lisp/flim ]; then
++ @PREFIX@/lib/emacsen-common/packages/remove/${pkg} ${FLAVOR}
++ @PREFIX@/lib/emacsen-common/packages/install/${pkg} ${FLAVOR}
++ fi
+ fi
-+ fi
++ done
+fi
+
+exit 0
diff -Naur apel-10.6.orig/fink/apel-remove apel-10.6/fink/apel-remove
--- apel-10.6.orig/fink/apel-remove Thu Jan 1 09:00:00 1970
-+++ apel-10.6/fink/apel-remove Sat Feb 21 06:06:36 2004
++++ apel-10.6/fink/apel-remove Mon Mar 14 02:13:31 2005
@@ -0,0 +1,24 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/remove/apel
@@ -177,7 +178,7 @@
+exit 0
diff -Naur apel-10.6.orig/fink/apel-startup apel-10.6/fink/apel-startup
--- apel-10.6.orig/fink/apel-startup Thu Jan 1 09:00:00 1970
-+++ apel-10.6/fink/apel-startup Sat Feb 21 06:01:00 2004
++++ apel-10.6/fink/apel-startup Thu Mar 24 15:38:45 2005
@@ -0,0 +1,20 @@
+;;; 20apel.el --- Fink apel startup file -*-mode: emacs-lisp;-*-
+
@@ -192,8 +193,8 @@
+ (setq elc-dir (concat elc-dir "/mule")))
+ (and (file-directory-p (concat elc-dir "/nomule"))
+ (setq elc-dir (concat elc-dir "/nomule")))))
-+ (if (fboundp 'debian-pkg-add-load-path-item)
-+ (debian-pkg-add-load-path-item elc-dir)
++ (if (and nil (fboundp 'fink-pkg-add-load-path-item)) ; fink-pkg-* is not
++ (fink-pkg-add-load-path-item elc-dir) ; correctly working.
+ (setq load-path (cons elc-dir load-path)))
+ ;;
+ ))
Index: yc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/yc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- yc.info 2 Oct 2004 11:19:48 -0000 1.1
+++ yc.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,13 @@
Package: yc
-Version: 4.0.8
-Revision: 6
+Version: 4.0.13
+Revision: 3
Description: Yet another Canna client for Emacsen
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Depends: emacsen
Suggests: canna
Source: http://www.ceres.dti.ne.jp/~knak/%n-%v.tar.gz
-Source-MD5: 067fa53a65409478a01ccff67d9b9fb8
+Source-MD5: 5cc5f04346b806d4157b4b66d7eba69f
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
CompileScript: make icanna
InstallScript: <<
Index: apel.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/apel.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apel.info 2 Oct 2004 10:41:43 -0000 1.1
+++ apel.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,27 +1,29 @@
Package: apel
Version: 10.6
-Revision: 5
+Revision: 9
Depends: emacsen, make
Source: ftp://ftp.jpl.org/pub/elisp/%n/%n-%v.tar.gz
Source2: http://www.gnu.org/licenses/gpl.txt
Source-MD5: a770333c50a4bb79c0923dee78d5e358
Source2-MD5: 393a5ca445f6965873eca0259a17f833
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+<<
CompileScript: echo "Nothing is compiled in this section."
InstallScript: <<
-install -m 755 -d %i/share/%n
+install -m 755 -d %i/share/%n
install -m 644 env.el pces-20.el time*.el %i/share/%n
-rm -f env.el pces-20.el time*.el
+rm -f env.el pces-20.el time*.el
-install -m 755 -d %i/share/emacs/site-lisp/%n
+install -m 755 -d %i/share/emacs/site-lisp/%n
install -m 644 *.el APEL-* EMU-ELS Makefile %i/share/emacs/site-lisp/%n
-install -m 755 -d %i/etc/emacs/site-start.d
+install -m 755 -d %i/etc/emacs/site-start.d
install -m 644 fink/%n-startup %i/etc/emacs/site-start.d/20%n.el
-install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
+install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
-install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
+install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
<<
DocFiles: ChangeLog README* ../gpl.txt
PostInstScript: <<
Index: mule-ucs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/mule-ucs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mule-ucs.patch 2 Oct 2004 11:19:48 -0000 1.1
+++ mule-ucs.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,13 @@
diff -Naur Mule-UCS-current.orig/fink/mule-ucs-install
Mule-UCS-current/fink/mule-ucs-install
--- Mule-UCS-current.orig/fink/mule-ucs-install Thu Jan 1 09:00:00 1970
-+++ Mule-UCS-current/fink/mule-ucs-install Wed Mar 10 14:40:02 2004
-@@ -0,0 +1,103 @@
++++ Mule-UCS-current/fink/mule-ucs-install Mon Mar 14 01:34:13 2005
+@@ -0,0 +1,111 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/install/mule-ucs
+set -e
+
+FLAVOR=$1
-+VERSION=0.84.999+0.20030129
[EMAIL PROTECTED]@
+PACKAGE="mule-ucs"
+
+if [ -z "${FLAVOR}" ]; then
@@ -94,7 +94,15 @@
+ mv ${ELCDIR}/lisp/*.elc ${ELCDIR}/
+fi
+rm -rf ${ELCDIR}/lisp ${ELCDIR}/mucs-comp.el
-+
++( for d in "${ELDIR}/lisp" "${ELDIR}/lisp/big5conv" "${ELDIR}/lisp/jisx0213"
"${ELDIR}/lisp/reldata"; do
++ cd ${d}
++ for f in *.el; do
++ if [ -f ${ELCDIR}/${f}c ]; then
++ ln -sf ${d}/${f} ${ELCDIR}/${f}
++ fi
++ done
++ done
++)
+gzip -9 ${ELCDIR}/CompilationLog
+chmod 644 ${ELCDIR}/CompilationLog.gz
+if [ -f ${ELCDIR}/un-define.elc ]; then
@@ -107,7 +115,7 @@
+exit 0
diff -Naur Mule-UCS-current.orig/fink/mule-ucs-remove
Mule-UCS-current/fink/mule-ucs-remove
--- Mule-UCS-current.orig/fink/mule-ucs-remove Thu Jan 1 09:00:00 1970
-+++ Mule-UCS-current/fink/mule-ucs-remove Wed Mar 10 14:40:31 2004
++++ Mule-UCS-current/fink/mule-ucs-remove Mon Mar 14 01:37:09 2005
@@ -0,0 +1,26 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/remove/mule-ucs
@@ -137,10 +145,14 @@
+exit 0
diff -Naur Mule-UCS-current.orig/fink/mule-ucs-startup
Mule-UCS-current/fink/mule-ucs-startup
--- Mule-UCS-current.orig/fink/mule-ucs-startup Thu Jan 1 09:00:00 1970
-+++ Mule-UCS-current/fink/mule-ucs-startup Wed Mar 10 14:35:24 2004
-@@ -0,0 +1,238 @@
++++ Mule-UCS-current/fink/mule-ucs-startup Thu Mar 24 16:15:48 2005
+@@ -0,0 +1,338 @@
+;;; 40mule-ucs.el --- Fink mule-ucs startup file -*-mode: emacs-lisp;-*-
+
++;; Author: Tatsuya Kinoshita <[EMAIL PROTECTED]>
++;; Created: 12 Nov 2002
++;; Revised: 30 Oct 2004
++
+;; Unlimited permission is granted to use, copy, distribute, and/or modify
+;; this file. There is NO WARRANTY.
+
@@ -150,17 +162,17 @@
+ (symbol-name fink-emacs-flavor)
+ "/site-lisp/mule-ucs"))
+ (case-fold-search t)
-+ env unicode-flag jisx0213-flag)
++ env unicode-flag jisx0213-flag prefer-latin-flag)
+ (cond
+ ((and (file-exists-p (concat path "/un-define.elc"))
+ (featurep 'mule)
+ (boundp 'emacs-major-version)
+ (>= emacs-major-version 20))
-+ (if (fboundp 'debian-pkg-add-load-path-item)
-+ (debian-pkg-add-load-path-item path)
++ (if (and nil (fboundp 'fink-pkg-add-load-path-item)) ; fink-pkg-* is not
++ (fink-pkg-add-load-path-item elc-dir) ; correctly working.
+ (setq load-path (cons path load-path)))
+ ;;
-+ (defun un-define-debian (&optional jisx0213-flag)
++ (defun un-define-debian (&optional jisx0213-flag prefer-latin-flag)
+ "Enable Mule-UCS-Unicode for Debian system."
+ (interactive)
+ (if (featurep 'un-define)
@@ -175,24 +187,38 @@
+ (setq vars (cdr vars)))
+ (setq cand
+ (append
-+ '(ascii
-+ latin-iso8859-1
-+ latin-iso8859-2
-+ latin-iso8859-3
-+ latin-iso8859-4
-+ cyrillic-iso8859-5
-+ ;;arabic-iso8859-6
-+ greek-iso8859-7
-+ hebrew-iso8859-8
-+ latin-iso8859-9
-+ latin-iso8859-14
-+ latin-iso8859-15
-+ ipa)
++ '(ascii)
++ (if prefer-latin-flag
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
+ (cond
+ ((and (stringp locale)
+ (string-match "^ja" locale))
+ (append
+ '(japanese-jisx0208)
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
+ (if jisx0213-flag '(japanese-jisx0213-1
+ japanese-jisx0213-2))
+ '(japanese-jisx0212
@@ -210,8 +236,21 @@
+ ((and (stringp locale)
+ (string-match "^ko" locale))
+ (append
-+ '(korean-ksc5601
-+ japanese-jisx0208)
++ '(korean-ksc5601)
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
++ '(japanese-jisx0208)
+ (if jisx0213-flag '(japanese-jisx0213-1
+ japanese-jisx0213-2))
+ '(japanese-jisx0212
@@ -229,8 +268,21 @@
+ (string-match "^zh.*[._]big5" locale))
+ (append
+ '(chinese-big5-1
-+ chinese-big5-2
-+ chinese-gb2312
++ chinese-big5-2)
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
++ '(chinese-gb2312
+ chinese-cns11643-1
+ chinese-cns11643-2
+ chinese-cns11643-3
@@ -252,8 +304,21 @@
+ chinese-cns11643-4
+ chinese-cns11643-5
+ chinese-cns11643-6
-+ chinese-cns11643-7
-+ chinese-gb2312
++ chinese-cns11643-7)
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
++ '(chinese-gb2312
+ chinese-big5-1
+ chinese-big5-2
+ korean-ksc5601
@@ -264,8 +329,21 @@
+ ((and (stringp locale)
+ (string-match "^zh" locale))
+ (append
-+ '(chinese-gb2312
-+ chinese-cns11643-1
++ '(chinese-gb2312)
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
++ '(chinese-cns11643-1
+ chinese-cns11643-2
+ chinese-cns11643-3
+ chinese-cns11643-4
@@ -281,6 +359,19 @@
+ '(japanese-jisx0212)))
+ (t
+ (append
++ (if (not prefer-latin-flag)
++ '(latin-iso8859-1
++ latin-iso8859-2
++ latin-iso8859-3
++ latin-iso8859-4
++ cyrillic-iso8859-5
++ ;;arabic-iso8859-6
++ greek-iso8859-7
++ hebrew-iso8859-8
++ latin-iso8859-9
++ latin-iso8859-14
++ latin-iso8859-15
++ ipa))
+ '(japanese-jisx0208)
+ (if jisx0213-flag '(japanese-jisx0213-1
+ japanese-jisx0213-2))
@@ -330,11 +421,25 @@
+ (require 'jisx0213)
+ (un-define-change-charset-order))
+ (require 'un-tools))
++ ;; define aliases for utf-16
++ (define-coding-system-alias 'utf-16le 'utf-16-le-no-signature)
++ (define-coding-system-alias 'utf-16be 'utf-16-be-no-signature)
++ (define-coding-system-alias 'utf-16le-with-signature 'utf-16-le)
++ (define-coding-system-alias 'utf-16be-with-signature 'utf-16-be)
+ ;; set coding-category of utf-8 for XEmacs
+ (and (featurep 'xemacs)
++ (fboundp 'coding-system-category)
++ (null (coding-system-category 'utf-8))
+ (fboundp 'coding-system-put)
-+ (fboundp 'set-coding-category-system)
+ (coding-system-put 'utf-8 'category 'utf-8)
++ (coding-system-put 'utf-8-unix 'category 'utf-8)
++ (coding-system-put 'utf-8-dos 'category 'utf-8)
++ (coding-system-put 'utf-8-mac 'category 'utf-8)
++ (coding-system-put 'utf-8-ws 'category 'utf-8)
++ (coding-system-put 'utf-8-ws-unix 'category 'utf-8)
++ (coding-system-put 'utf-8-ws-dos 'category 'utf-8)
++ (coding-system-put 'utf-8-ws-mac 'category 'utf-8)
++ (fboundp 'set-coding-category-system)
+ (set-coding-category-system 'utf-8 'utf-8))
+ ;; set coding-priority to use utf-8 auto-detection
+ (if (and (coding-system-category 'utf-8)
@@ -363,6 +468,9 @@
+ (setq env (or (getenv "DEB_MULEUCS_JISX0213") "off"))
+ (setq jisx0213-flag
+ (not (string-match "^\\(off\\|no\\|false\\|0\\)$" env)))
++ (setq env (or (getenv "DEB_MULEUCS_PREFER_LATIN") "on"))
++ (setq prefer-latin-flag
++ (not (string-match "^\\(off\\|no\\|false\\|0\\)$" env)))
+ (if (and (not (featurep 'xemacs))
+ (>= emacs-major-version 21))
+ (condition-case nil
@@ -372,8 +480,60 @@
+ (unify-8859-on-decoding-mode -1))
+ (error nil)))
+ (if unicode-flag
-+ (un-define-debian jisx0213-flag))
++ (un-define-debian jisx0213-flag prefer-latin-flag))
+ ;;
+ )))
+
+;;; 40mule-ucs.el ends here
+diff -Naur Mule-UCS-current.orig/lisp/jisx0213/x0213-csys.el
Mule-UCS-current/lisp/jisx0213/x0213-csys.el
+--- Mule-UCS-current.orig/lisp/jisx0213/x0213-csys.el Sat Jan 11 14:58:55 2003
++++ Mule-UCS-current/lisp/jisx0213/x0213-csys.el Mon Mar 14 01:10:41 2005
+@@ -555,6 +555,9 @@
+ ;; langauge-info-alist update.
+ ;;
+
++(coding-system-put 'japanese-shift-jisx0213 'coding-category
++ 'coding-category-sjis)
++
+ (set-language-info "Japanese" 'coding-priority
+ (let ((cand
+ '(iso-2022-jp-3-compatible
+@@ -566,15 +569,14 @@
+ (setq cs (car cand)
+ cand (cdr cand))
+ (if (and (coding-system-p cs)
++ (not (eq (coding-system-category cs)
++ 'coding-category-ccl))
+ (not (memq (coding-system-category cs)
+ catlist)))
+ (setq result (cons cs result)
+ catlist (cons (coding-system-category cs)
+ catlist))))
+ (nreverse result)))
+-
+-(coding-system-put 'japanese-shift-jisx0213 'coding-category
+- 'coding-category-sjis)
+
+ (set-language-info "Japanese" 'coding-system
+ '(iso-2022-jp euc-jisx0213 iso-2022-jp-3
+diff -Naur Mule-UCS-current.orig/lisp/reldata/usupple.el
Mule-UCS-current/lisp/reldata/usupple.el
+--- Mule-UCS-current.orig/lisp/reldata/usupple.el Sun Oct 8 23:10:44 2000
++++ Mule-UCS-current/lisp/reldata/usupple.el Mon Mar 14 01:04:04 2005
+@@ -38,7 +38,7 @@
+ (?$B!=(B . "0x2014") ;; EM DASH
+ ([EMAIL PROTECTED](B . "0xFF3C") ;; FULLWIDTH REVERSE SOLIDUS
+ (?$B!o(B . "0x00A5") ;; YEN SIGN
+- (?$(D"7(B . "0xFFE5") ;; FULLWIDTH TILDE
++ (?$(D"7(B . "0xFF5E") ;; FULLWIDTH TILDE
+ ))))
+
+ (defvar unicode-assoc-for-jdk
+@@ -80,7 +80,7 @@
+ (?$B"L(B . "0xFFE2") ;; FULLWIDTH NOT SIGN
+ ;; JIS X 0212 correspondings
+ (?$(D"7(B . "0xFF5E") ;; FULLWIDTH TILDE (usually not used for
decoding)
+- (?$(D"C(B . "0xFF4E") ;; FULLWIDTH BROKEN BAR
++ (?$(D"C(B . "0xFFE4") ;; FULLWIDTH BROKEN BAR
+ ;; JIS X 0201 correspondings
+ ;; ("0x5C" . "0x005C") ;; REVERSE SOLIDUS
+ ;; ("0x7E" . "0x007E") ;; TILDE
Index: flim.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/flim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flim.patch 2 Oct 2004 10:44:23 -0000 1.1
+++ flim.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,13 @@
-diff -Naur flim-1.14.6.orig/fink/flim-install flim-1.14.6/fink/flim-install
---- flim-1.14.6.orig/fink/flim-install Thu Jan 1 09:00:00 1970
-+++ flim-1.14.6/fink/flim-install Sun Feb 22 01:21:11 2004
-@@ -0,0 +1,142 @@
+diff -Naur flim-1.14.7.orig/fink/flim-install flim-1.14.7/fink/flim-install
+--- flim-1.14.7.orig/fink/flim-install Thu Jan 1 09:00:00 1970
++++ flim-1.14.7/fink/flim-install Mon Mar 14 03:11:04 2005
+@@ -0,0 +1,148 @@
+#!/bin/sh
+set -e
+
+FLAVOR=$1
+PACKAGE=flim
-+VERSION=1.14.6-2
[EMAIL PROTECTED]@
+
+if [ "X${FLAVOR}" = "X" ]; then
+ echo Need argument to determin FLAVOR of emacsen
@@ -110,6 +110,12 @@
+ mv ${ELCDIR}/flim/* ${ELCDIR}/
+ echo "rm -rf ${ELCDIR}/flim" >> ${ELCDIR}/CompilationLog 2>&1
+ rm -rf ${ELCDIR}/flim
++ cd ${ELDIR}
++ for f in *.el; do
++ if [ -f ${ELCDIR}/${f}c ]; then
++ ln -sf ${ELDIR}/${f} ${ELCDIR}/${f}
++ fi
++ done
+ )
+ gzip -9 ${ELCDIR}/CompilationLog
+ chmod 644 ${ELCDIR}/CompilationLog.gz
@@ -122,9 +128,9 @@
+ fi
+ if [ "X${FLAVORTEST}" = "Xxemacs" -a -z "${FLAVOR_SUFFIX}" ]; then
+ if [ -e ${ELCDIR_BASE}/mule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}/mule/*.el
${ELCDIR_BASE}/
+ elif [ -e ${ELCDIR_BASE}/nomule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}/nomule/*.el
${ELCDIR_BASE}/
+ fi
+ fi
+ echo " done."
@@ -144,9 +150,9 @@
+fi
+
+exit 0
-diff -Naur flim-1.14.6.orig/fink/flim-remove flim-1.14.6/fink/flim-remove
---- flim-1.14.6.orig/fink/flim-remove Thu Jan 1 09:00:00 1970
-+++ flim-1.14.6/fink/flim-remove Sun Feb 22 01:21:28 2004
+diff -Naur flim-1.14.7.orig/fink/flim-remove flim-1.14.7/fink/flim-remove
+--- flim-1.14.7.orig/fink/flim-remove Thu Jan 1 09:00:00 1970
++++ flim-1.14.7/fink/flim-remove Mon Mar 14 03:08:20 2005
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
@@ -173,9 +179,9 @@
+echo " done."
+
+exit 0
-diff -Naur flim-1.14.6.orig/fink/flim-startup flim-1.14.6/fink/flim-startup
---- flim-1.14.6.orig/fink/flim-startup Thu Jan 1 09:00:00 1970
-+++ flim-1.14.6/fink/flim-startup Sun Feb 22 01:18:38 2004
+diff -Naur flim-1.14.7.orig/fink/flim-startup flim-1.14.7/fink/flim-startup
+--- flim-1.14.7.orig/fink/flim-startup Thu Jan 1 09:00:00 1970
++++ flim-1.14.7/fink/flim-startup Thu Mar 24 16:08:29 2005
@@ -0,0 +1,56 @@
+;;; 50flim.el --- Fink flim startup file -*-mode: emacs-lisp;-*-
+
@@ -190,8 +196,8 @@
+ (setq elc-dir (concat elc-dir "/mule")))
+ (and (file-directory-p (concat elc-dir "/nomule"))
+ (setq elc-dir (concat elc-dir "/nomule")))))
-+ (if (fboundp 'debian-pkg-add-load-path-item)
-+ (debian-pkg-add-load-path-item elc-dir)
++ (if (and nil (fboundp 'fink-pkg-add-load-path-item)) ; fink-pkg-* is not
++ (fink-pkg-add-load-path-item elc-dir) ; correctly working.
+ (setq load-path (cons elc-dir load-path)))
+ (if (featurep 'xemacs)
+ ;; Use XEmacs's mmencode (default values)
Index: yc.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/yc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- yc.patch 2 Oct 2004 11:19:48 -0000 1.1
+++ yc.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Nru yc-4.0.8.orig/fink/yc-install yc-4.0.8/fink/yc-install
---- yc-4.0.8.orig/fink/yc-install Thu Jan 1 09:00:00 1970
-+++ yc-4.0.8/fink/yc-install Sat Mar 13 16:06:09 2004
-@@ -0,0 +1,63 @@
+diff -Nru yc-4.0.13.orig/fink/yc-install yc-4.0.13/fink/yc-install
+--- yc-4.0.13.orig/fink/yc-install Thu Jan 1 09:00:00 1970
++++ yc-4.0.13/fink/yc-install Wed Mar 16 10:57:53 2005
+@@ -0,0 +1,72 @@
+#! /bin/sh -e
+# @PREFIX@/lib/emacsen-common/packages/install/yc
+# [ This particular script hasn't been tested, so be careful. ]
@@ -35,6 +35,9 @@
[EMAIL PROTECTED]@/share/emacs/site-lisp/${PACKAGE}
[EMAIL PROTECTED]@/share/${FLAVOR}/site-lisp/${PACKAGE}
+
[EMAIL PROTECTED]@/etc/${FLAVOR}/site-start.d
++#STARTFILE="${PACKAGE}-init.el";
++
+COMPILE="-batch -q -f batch-byte-compile"
+
+case "${FLAVOR}" in
@@ -56,19 +59,25 @@
+ # Byte compile them
+ (cd ${ELCDIR}
+ ${FLAVOR} ${COMPILE} yc.el > CompilationLog 2>&1
++# ${FLAVOR} ${COMPILE} ${STARTFILE} >> CompilationLog 2>&1
+ rm -f *.el )
+
+ gzip -9 ${ELCDIR}/CompilationLog
+
++# if [ -e ${ELCDIR}/${STARTFILE}c ]; then
++# mv ${ELCDIR}/${STARTFILE}c ${STARTDIR}/50${STARTFILE}c;
++# else
++# ln -f -s ${ELDIR}/${STARTFILE} ${STARTDIR}/50${STARTFILE};
++# fi
+ echo " done."
+ ;;
+esac
+
+exit 0;
-diff -Nru yc-4.0.8.orig/fink/yc-remove yc-4.0.8/fink/yc-remove
---- yc-4.0.8.orig/fink/yc-remove Thu Jan 1 09:00:00 1970
-+++ yc-4.0.8/fink/yc-remove Sat Mar 13 16:06:09 2004
-@@ -0,0 +1,34 @@
+diff -Nru yc-4.0.13.orig/fink/yc-remove yc-4.0.13/fink/yc-remove
+--- yc-4.0.13.orig/fink/yc-remove Thu Jan 1 09:00:00 1970
++++ yc-4.0.13/fink/yc-remove Wed Mar 16 10:57:53 2005
+@@ -0,0 +1,37 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/remove/yc
+# [ This particular script hasn't been tested either, so be careful. ]
@@ -89,6 +98,8 @@
+
[EMAIL PROTECTED]@/share/emacs/site-lisp/${PACKAGE}
[EMAIL PROTECTED]@/share/${FLAVOR}/site-lisp/${PACKAGE}
[EMAIL PROTECTED]@/etc/${FLAVOR}/site-start.d
++#STARTFILE="${PACKAGE}-init.el";
+
+case "${FLAVOR}" in
+ emacs)
@@ -100,99 +111,36 @@
+
+ echo -n "remove/${PACKAGE}: Handling removal of emacsen flavor
${FLAVOR} ..."
+ rm -rf ${ELCDIR}
++# rm -f ${STARTDIR}/50${STARTFILE}*
+ echo " done."
+ ;;
+esac
-diff -Nru yc-4.0.8.orig/fink/yc-startup yc-4.0.8/fink/yc-startup
---- yc-4.0.8.orig/fink/yc-startup Thu Jan 1 09:00:00 1970
-+++ yc-4.0.8/fink/yc-startup Thu Mar 18 16:28:46 2004
-@@ -0,0 +1,19 @@
+diff -Nru yc-4.0.13.orig/fink/yc-startup yc-4.0.13/fink/yc-startup
+--- yc-4.0.13.orig/fink/yc-startup Thu Jan 1 09:00:00 1970
++++ yc-4.0.13/fink/yc-startup Wed Mar 16 10:58:04 2005
+@@ -0,0 +1,25 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Fink yc package
+;;
-+;; We have to add this to the load-path:
-+(setq load-path
-+ (cons
-+ (concat "@PREFIX@/share/" (symbol-name fink-emacs-flavor)
-+ "/site-lisp/yc")
-+ load-path))
++(if (not (file-exists-p "@PREFIX@/share/emacs/site-lisp/yc/yc.el"))
++ (message "Package yc removed but not purged. Skipping setup.")
++ (setq load-path
++ (cons
++ (concat "@PREFIX@/share/" (symbol-name fink-emacs-flavor)
++ "/site-lisp/yc")
++ load-path))
++
++ (global-set-key "\M-\ " 'yc-mode)
++ (setq yc-stop-chars "(){}<>")
++ ;(setq yc-server-host "unix")
++ (setq yc-use-color t)
++ (setq yc-canna-lib-path "@PREFIX@/share/canna")
++ (setq yc-icanna-path "@PREFIX@/lib/yc/icanna")
+
-+(global-set-key "\M-\ " 'yc-mode)
-+(setq yc-stop-chars "(){}<>")
-+;(setq yc-server-host "unix")
-+(setq yc-use-color t)
-+(setq yc-canna-lib-path "@PREFIX@/share/canna")
-+(setq yc-icanna-path "@PREFIX@/lib/yc/icanna")
-+(load "yc")
-+;(global-yc-mode 1)
-diff -Nru yc-4.0.8.orig/yc.el yc-4.0.8/yc.el
---- yc-4.0.8.orig/yc.el Fri Mar 5 00:02:06 2004
-+++ yc-4.0.8/yc.el Tue May 4 00:00:00 2004
-@@ -178,6 +178,12 @@
- $BHs(Bnil$B$N>l9g!"H>3Q$+$JM-8z!#(Bnil$B$N>l9g!"H>3Q$+$JL58z(B"
- :type 'boolean
- :group 'yc)
-+(defcustom yc-connect-server-at-startup nil
-+ "[EMAIL PROTECTED]<[EMAIL PROTECTED](B
-+$BHs(Bnil$B$N>l9g!"[EMAIL
PROTECTED](Bnil$B$N>l9g!":G=i$K4A;zJQ49%-!<[EMAIL PROTECTED](B
-+(fink hack for Emacs >= 2.1.50-20011124)"
-+ :type 'boolean
-+ :group 'yc)
-
- ;; minibuffer $B%-!<%P%$%s%I(B
- (and (boundp 'minibuffer-local-map) minibuffer-local-map
-@@ -1339,15 +1345,21 @@
- (defun yc-read-string-from-file (file)
- (let* ((suffix (file-name-extension file))
- ;; emacs-20.x
-+ ;;(auto-coding-alist
-+ ;; (if suffix
-+ ;; (list (cons (concat "\\." suffix) 'japanese-iso-8bit))
-+ ;; auto-coding-alist))
-+ ;; fink hack for utf-8 environment
- (auto-coding-alist
-- (if suffix
-- (list (cons (concat "\\." suffix) 'japanese-iso-8bit))
-- auto-coding-alist))
-+ (list (cons "" 'japanese-iso-8bit)))
- ;; XEmacs-20.x
-+ ;;(file-coding-system-alist
-+ ;; (if suffix
-+ ;; (list (cons (concat "\\." suffix) 'euc-jp))
-+ ;; file-coding-system-alist))
-+ ;; fink hack for utf-8 environment
- (file-coding-system-alist
-- (if suffix
-- (list (cons (concat "\\." suffix) 'euc-jp))
-- file-coding-system-alist))
-+ (list (cons "" 'euc-jp)))
-
- (buf (get-file-buffer file))
- (flag (not buf))
-@@ -1774,9 +1786,14 @@
- (cond ((eq (car dic) :bushu)
- (setq yc-rc-bushu-dic-list (cons (cadr dic) yc-rc-bushu-dic-list)
- dic (cddr dic)))
-- ((eq (car dic) :user)
-+ ;; TODO: autodef feature
-+ ((or (eq (car dic) :user)
-+ (eq (car dic) :katakana) (eq (car dic) :hiragana))
- (setq yc-rc-user-dic-list (cons (cadr dic) yc-rc-user-dic-list)
- dic (cddr dic)))
-+ ((eq (car dic) :grammar)
-+ (setq yc-rc-dic-list (cons (cadr dic) yc-rc-dic-list)
-+ dic (cddr dic)))
- (t (setq yc-rc-dic-list (cons (car dic) yc-rc-dic-list)
- dic (cdr dic))))))
-
-@@ -4017,7 +4034,8 @@
- (setq default-input-method "japanese-yc"))
-
- (yc-setup)
--(when (yc-server-check)
-+;; fink hack for Emacs >= 21.1.50-20011124
-+(when (and yc-connect-server-at-startup (yc-server-check))
- (yc-init)
- (force-yc-input-mode)
- )
++ ;; comment out the following 3 lines to not to activate yc per default.
++ (setq yc-connect-server-at-startup nil)
++ (load-library "yc")
++ (force-yc-input-mode)
++ ;(global-yc-mode 1) ;; if you want to use global-yc-mode, uncomment this.
++ )
Index: semi.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/semi.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- semi.info 2 Oct 2004 10:45:43 -0000 1.1
+++ semi.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,11 +1,13 @@
Package: semi
Version: 1.14.6
-Revision: 3
-Depends: emacsen, apel (>= 9.22-1), flim (>= 1.14.2-1), make
+Revision: 6
+Depends: emacsen, apel (>= 9.22-1), flim (>= 1.14.2-1) | limit, make
Suggests: gnupg, wl
Source: ftp://ftp.m17n.org/pub/mule/%n/%n-1.14-for-flim-1.14/%n-%v.tar.gz
Source-MD5: 22d735fa218c8c6268cd2c9395cd837b
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+<<
CompileScript: <<
#!/bin/sh
FLAGS="-batch -q -no-site-file -l texinfmt"
@@ -14,18 +16,18 @@
echo 'euc-jp' | emacs $FLAGS mime-ui-ja.texi $PROCESS
<<
InstallScript: <<
-install -m 755 -d %i/share/emacs/site-lisp/%n
+install -m 755 -d %i/share/emacs/site-lisp/%n
install -m 644 *.el SEMI-* Makefile %i/share/emacs/site-lisp/%n
-install -m 755 -d %i/share/info
+install -m 755 -d %i/share/info
install -m 644 *.info %i/share/info
-install -m 755 -d %i/etc/emacs/site-start.d
+install -m 755 -d %i/etc/emacs/site-start.d
install -m 644 fink/%n-startup %i/etc/emacs/site-start.d/51%n.el
-install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
+install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
-install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
+install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
<<
DocFiles: ChangeLog NEWS README* TODO VERSION *.sgml
PostInstScript: <<
Index: semi.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/semi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- semi.patch 2 Oct 2004 10:45:43 -0000 1.1
+++ semi.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,13 @@
diff -Naur semi-1.14.6.orig/fink/semi-install semi-1.14.6/fink/semi-install
--- semi-1.14.6.orig/fink/semi-install Thu Jan 1 09:00:00 1970
-+++ semi-1.14.6/fink/semi-install Sun Feb 22 03:24:33 2004
-@@ -0,0 +1,172 @@
++++ semi-1.14.6/fink/semi-install Mon Mar 14 04:43:21 2005
+@@ -0,0 +1,178 @@
+#!/bin/sh
+set -e
+
+FLAVOR=$1
+PACKAGE=semi
-+VERSION=1.14.6-2
[EMAIL PROTECTED]@
+
+if [ "X${FLAVOR}" = "X" ]; then
+ echo Need argument to determin FLAVOR of emacsen
@@ -131,6 +131,12 @@
+ mv ${ELCDIR}/semi/* ${ELCDIR}/
+ echo "rm -rf ${ELCDIR}/semi" >> ${ELCDIR}/CompilationLog 2>&1
+ rm -rf ${ELCDIR}/semi
++ cd ${ELDIR}
++ for f in *.el; do
++ if [ -f ${ELCDIR}/${f}c ]; then
++ ln -sf ${ELDIR}/${f} ${ELCDIR}/${f}
++ fi
++ done
+ )
+ gzip -9 ${ELCDIR}/CompilationLog
+ chmod 644 ${ELCDIR}/CompilationLog.gz
@@ -143,9 +149,9 @@
+ fi
+ if [ "X${FLAVORTEST}" = "Xxemacs" -a -z "${FLAVOR_SUFFIX}" ]; then
+ if [ -e ${ELCDIR_BASE}/mule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}/mule/*.el
${ELCDIR_BASE}/
+ elif [ -e ${ELCDIR_BASE}/nomule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}/nomule/*.el
${ELCDIR_BASE}/
+ fi
+ fi
+ echo " done."
@@ -176,7 +182,7 @@
+exit 0
diff -Naur semi-1.14.6.orig/fink/semi-remove semi-1.14.6/fink/semi-remove
--- semi-1.14.6.orig/fink/semi-remove Thu Jan 1 09:00:00 1970
-+++ semi-1.14.6/fink/semi-remove Sun Feb 22 03:24:51 2004
++++ semi-1.14.6/fink/semi-remove Mon Mar 14 04:19:27 2005
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
@@ -203,7 +209,7 @@
+exit 0
diff -Naur semi-1.14.6.orig/fink/semi-startup semi-1.14.6/fink/semi-startup
--- semi-1.14.6.orig/fink/semi-startup Thu Jan 1 09:00:00 1970
-+++ semi-1.14.6/fink/semi-startup Sun Feb 22 03:22:06 2004
++++ semi-1.14.6/fink/semi-startup Thu Mar 24 16:18:35 2005
@@ -0,0 +1,39 @@
+;;; 51semi.el --- Fink semi startup file -*-mode: emacs-lisp;-*-
+
@@ -218,8 +224,8 @@
+ (setq elc-dir (concat elc-dir "/mule")))
+ (and (file-directory-p (concat elc-dir "/nomule"))
+ (setq elc-dir (concat elc-dir "/nomule")))))
-+ (if (fboundp 'debian-pkg-add-load-path-item)
-+ (debian-pkg-add-load-path-item elc-dir)
++ (if (and nil (fboundp 'fink-pkg-add-load-path-item)) ; fink-pkg-* is not
++ (fink-pkg-add-load-path-item elc-dir) ; correctly working.
+ (setq load-path (cons elc-dir load-path)))
+ (setq mime-edit-split-message nil)
+ (setq pgg-encrypt-for-me t)
@@ -244,3 +250,181 @@
+ ))
+
+;;; 51semi.el ends here
+diff -Naur semi-1.14.6.orig/mime-edit.el semi-1.14.6/mime-edit.el
+--- semi-1.14.6.orig/mime-edit.el Wed Dec 17 08:36:13 2003
++++ semi-1.14.6/mime-edit.el Thu Aug 12 00:12:56 2004
+@@ -236,6 +236,9 @@
+ ("application"
+ ("octet-stream" ("type" "" "tar" "shar"))
+ ("postscript")
++ ("pdf")
++ ("msword")
++ ("vnd.ms-excel")
+ ("vnd.ms-powerpoint")
+ ("x-kiss" ("x-cnf")))
+ ("image"
+@@ -321,6 +324,11 @@
+ "base64"
+ "attachment" (("filename" . file))
+ )
++ ("\\.xls$" ; MS Excel
++ "application" "vnd.ms-excel" nil
++ "base64"
++ "attachment" (("filename" . file))
++ )
+ ("\\.ppt$" ; MS Power Point
+ "application" "vnd.ms-powerpoint" nil
+ "base64"
+@@ -334,7 +342,12 @@
+ )
+ ("\\.ps$"
+ "application" "postscript" nil
+- "quoted-printable"
++ "base64"
++ "attachment" (("filename" . file))
++ )
++ ("\\.pdf$"
++ "application" "pdf" nil
++ "base64"
+ "attachment" (("filename" . file))
+ )
+
+@@ -725,7 +738,7 @@
+ (concat "MIME-Version:"
+ (mime-encode-field-body
+ (concat " 1.0 (split by " mime-edit-version ")\n")
+- "MIME-Version:"))
++ "MIME-Version"))
+ "MIME version field for message/partial.")
+
+
+@@ -2302,9 +2315,10 @@
+ (narrow-to-region beg (mime-edit-content-end))
+ (goto-char beg)
+ (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
+- ;; Don't use this in the multibyte buffer since it may
+- ;; convert the unibyte string into multibyte.
+- ;;;;(replace-match "\\1\r\n"))))
++ ;; In a certain period, `replace-match' with "\\N"
++ ;; converted 8-bit characters into multibyte string,
++ ;; but it has been fixed at 2004-01-15.
++ ;;(replace-match "\\1\r\n"))))
+ (backward-char 1)
+ (insert "\r")
+ (forward-char 1))))
+diff -Naur semi-1.14.6.orig/mime-image.el semi-1.14.6/mime-image.el
+--- semi-1.14.6.orig/mime-image.el Mon Nov 11 13:39:54 2002
++++ semi-1.14.6/mime-image.el Thu Aug 12 00:12:56 2004
+@@ -7,7 +7,6 @@
+ ;; Dan Rich <[EMAIL PROTECTED]>
+ ;; Daiki Ueno <[EMAIL PROTECTED]>
+ ;; Katsumi Yamaoka <[EMAIL PROTECTED]>
+-;; Maintainer: MORIOKA Tomohiko <[EMAIL PROTECTED]>
+ ;; Created: 1995/12/15
+ ;; Renamed: 1997/2/21 from tm-image.el
+
+@@ -50,12 +49,14 @@
+ (let ((case-fold-search t) width height xbytes right margin)
+ (goto-char (point-min))
+ (or (re-search-forward "_width[\t ]+\\([0-9]+\\)" nil t)
+- (error "!! Illegal xbm file format" (current-buffer)))
++ (error "!! Illegal xbm file format in the buffer: %s"
++ (current-buffer)))
+ (setq width (string-to-int (match-string 1))
+ xbytes (/ (+ width 7) 8))
+ (goto-char (point-min))
+ (or (re-search-forward "_height[\t ]+\\([0-9]+\\)" nil t)
+- (error "!! Illegal xbm file format" (current-buffer)))
++ (error "!! Illegal xbm file format in the buffer: %s"
++ (current-buffer)))
+ (setq height (string-to-int (match-string 1)))
+ (goto-char (point-min))
+ (re-search-forward "0x[0-9a-f][0-9a-f],")
+@@ -188,15 +189,20 @@
+
+ (defun mime-display-image (entity situation)
+ (message "Decoding image...")
+- (let ((format (cdr (assq 'image-format situation)))
+- image)
+- (setq image (mime-image-create (mime-entity-content entity) format 'data))
+- (if (null image)
+- (message "Invalid glyph!")
+- (save-excursion
+- (mime-image-insert image)
+- (insert "\n")
+- (message "Decoding image...done")))))
++ (condition-case err
++ (let ((format (cdr (assq 'image-format situation)))
++ image)
++ (setq image
++ (mime-image-create (mime-entity-content entity)
++ format 'data))
++ (if (null image)
++ (message "Invalid glyph!")
++ (save-excursion
++ (mime-image-insert image)
++ (insert "\n")
++ (message "Decoding image...done"))))
++ (error nil err)))
++
+
+ ;;; @ end
+ ;;;
+diff -Naur semi-1.14.6.orig/mime-view.el semi-1.14.6/mime-view.el
+--- semi-1.14.6.orig/mime-view.el Mon May 12 23:17:48 2003
++++ semi-1.14.6/mime-view.el Thu Aug 12 00:12:56 2004
+@@ -599,24 +599,22 @@
+ )))
+ )
+ (t
+- (let ((media-type (mime-entity-media-type entity))
+- (media-subtype (mime-entity-media-subtype entity))
+- (charset (cdr (assoc "charset" params)))
+- (encoding (mime-entity-encoding entity)))
++ (let* ((charset (cdr (assoc "charset" params)))
++ (encoding (mime-entity-encoding entity))
++ (rest (format " <%s/%s%s%s>"
++ (mime-entity-media-type entity)
++ (mime-entity-media-subtype entity)
++ (if charset
++ (concat "; " charset)
++ "")
++ (if encoding
++ (concat " (" encoding ")")
++ ""))))
+ (concat
+ num " " subject
+- (let ((rest
+- (format " <%s/%s%s%s>"
+- media-type media-subtype
+- (if charset
+- (concat "; " charset)
+- "")
+- (if encoding
+- (concat " (" encoding ")")
+- ""))))
+- (if (>= (+ (current-column)(length rest))(window-width))
+- "\n\t")
+- rest)))
++ (if (>= (+ (current-column)(length rest))(window-width))
++ "\n\t")
++ rest))
+ )))
+ (function mime-preview-play-current-entity))
+ ))
+@@ -941,10 +939,11 @@
+ (car (mime-entity-children entity))))
+ (original-major-mode-cell (assq 'major-mode situation))
+ (default-situation (cdr (assq 'childrens-situation situation))))
+- (if original-major-mode-cell
+- (setq default-situation
+- (cons original-major-mode-cell default-situation)))
+- (mime-display-entity start nil default-situation)))
++ (when start
++ (if original-major-mode-cell
++ (setq default-situation
++ (cons original-major-mode-cell default-situation)))
++ (mime-display-entity start nil default-situation))))
+
+ ;;; @ acting-condition
+ ;;;
Index: wl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/wl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wl.patch 2 Oct 2004 10:47:34 -0000 1.1
+++ wl.patch 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,13 +1,25 @@
-diff -Naur wl-2.10.1.orig/fink/wl-install wl-2.10.1/fink/wl-install
---- wl-2.10.1.orig/fink/wl-install Thu Jan 1 09:00:00 1970
-+++ wl-2.10.1/fink/wl-install Sun Feb 22 06:16:24 2004
-@@ -0,0 +1,218 @@
+diff -Naur wl-2.12.2.orig/WL-CFG wl-2.12.2/WL-CFG
+--- wl-2.12.2.orig/WL-CFG Wed Apr 9 08:18:41 2003
++++ wl-2.12.2/WL-CFG Mon Mar 14 16:32:32 2005
+@@ -9,7 +9,7 @@
+ ; load-path))
+
+ ;; If you want to install utils, uncomment following line.
+-;(setq wl-install-utils t)
++(setq wl-install-utils t)
+
+ ;; Set language for info file ("ja" or "en", both in default).
+ ;; If you only need manual in English, uncomment following line.
+diff -Naur wl-2.12.2.orig/fink/wl-install wl-2.12.2/fink/wl-install
+--- wl-2.12.2.orig/fink/wl-install Thu Jan 1 09:00:00 1970
++++ wl-2.12.2/fink/wl-install Mon Mar 14 15:51:58 2005
+@@ -0,0 +1,230 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/install/wl
+set -e
+
+FLAVOR=$1
-+VERSION=2.10.1-2
[EMAIL PROTECTED]@
+PACKAGE=wl
+
+if [ "X${FLAVOR}" = "X" ]; then
@@ -158,8 +170,8 @@
+ install -m 755 -d ${ELCDIR}/tmp
+ cp -r ${ELDIR}/* ${ELCDIR}/tmp/
+ rm -rf ${ELCDIR}/tmp/etc/icons
-+ ln -s @PREFIX@/share/pixmaps/wl ${ELCDIR}/tmp/etc/icons
-+ (cd ${ELCDIR}/tmp
++ ln -sf @PREFIX@/share/pixmaps/wl ${ELCDIR}/tmp/etc/icons
++ ( cd ${ELCDIR}/tmp
+ cat << EOF > WL-CFG.el
+(setq wl-install-utils t)
+(setq load-path (cons "${APEL_DIR}" load-path))
@@ -180,12 +192,24 @@
+ make EMACS=${EMACSEN} LISPDIR=${ELCDIR} PIXMAPDIR=${ELCDIR}/icons \
+ clean >> ${ELCDIR}/CompilationLog 2>&1
+ cd ${ELCDIR}
++ echo "mv ${ELCDIR}/wl/wl-news.el ${ELCDIR}/wl-news.el" >>
${ELCDIR}/CompilationLog 2>&1
++ mv ${ELCDIR}/wl/wl-news.el ${ELCDIR}/wl-news.el
+ echo "rm -rf ${ELCDIR}/wl/*.el ${ELCDIR}/icons ${ELCDIR}/tmp" >>
${ELCDIR}/CompilationLog 2>&1
+ rm -rf ${ELCDIR}/wl/*.el ${ELCDIR}/icons ${ELCDIR}/tmp
-+ echo "${ELCDIR}/wl/* ${ELCDIR}/" >> ${ELCDIR}/CompilationLog 2>&1
++ echo "mv ${ELCDIR}/wl/* ${ELCDIR}/" >> ${ELCDIR}/CompilationLog 2>&1
+ mv ${ELCDIR}/wl/* ${ELCDIR}/
+ echo "rm -rf ${ELCDIR}/wl" >> ${ELCDIR}/CompilationLog 2>&1
+ rm -rf ${ELCDIR}/wl
++ for d in "${ELDIR}/elmo" "${ELDIR}/utils" "${ELDIR}/wl"; do
++ if [ -d ${d} ]; then
++ cd ${d}
++ for f in *.el; do
++ if [ -f ${ELCDIR}/${f}c ]; then
++ ln -sf ${d}/${f} ${ELCDIR}/${f}
++ fi
++ done
++ fi
++ done
+ )
+ gzip -9 ${ELCDIR}/CompilationLog
+ chmod 644 ${ELCDIR}/CompilationLog.gz
@@ -198,9 +222,9 @@
+ fi
+ if [ "X${FLAVORTEST}" = "Xxemacs" -a -z "${FLAVOR_SUFFIX}" ]; then
+ if [ -e ${ELCDIR_BASE}/mule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/mule/*.elc ${ELCDIR_BASE}/mule/*.el
${ELCDIR_BASE}/
+ elif [ -e ${ELCDIR_BASE}/nomule/compile-stamp ]; then
-+ ln -s ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}
++ ln -sf ${ELCDIR_BASE}/nomule/*.elc ${ELCDIR_BASE}/nomule/*.el
${ELCDIR_BASE}/
+ fi
+ fi
+ echo " done."
@@ -220,9 +244,9 @@
+fi
+
+exit 0
-diff -Naur wl-2.10.1.orig/fink/wl-remove wl-2.10.1/fink/wl-remove
---- wl-2.10.1.orig/fink/wl-remove Thu Jan 1 09:00:00 1970
-+++ wl-2.10.1/fink/wl-remove Sun Feb 22 06:16:47 2004
+diff -Naur wl-2.12.2.orig/fink/wl-remove wl-2.12.2/fink/wl-remove
+--- wl-2.12.2.orig/fink/wl-remove Thu Jan 1 09:00:00 1970
++++ wl-2.12.2/fink/wl-remove Mon Mar 14 05:36:08 2005
@@ -0,0 +1,25 @@
+#!/bin/sh
+# @PREFIX@/lib/emacsen-common/packages/remove/wl
@@ -249,9 +273,9 @@
+echo " done."
+
+exit 0
-diff -Naur wl-2.10.1.orig/fink/wl-startup wl-2.10.1/fink/wl-startup
---- wl-2.10.1.orig/fink/wl-startup Thu Jan 1 09:00:00 1970
-+++ wl-2.10.1/fink/wl-startup Sun Feb 22 06:13:09 2004
+diff -Naur wl-2.12.2.orig/fink/wl-startup wl-2.12.2/fink/wl-startup
+--- wl-2.12.2.orig/fink/wl-startup Thu Jan 1 09:00:00 1970
++++ wl-2.12.2/fink/wl-startup Thu Mar 24 16:19:54 2005
@@ -0,0 +1,90 @@
+;;; 65wl.el --- Fink wl startup file -*-mode: emacs-lisp;-*-
+
@@ -267,8 +291,8 @@
+ (setq elc-dir (concat elc-dir "/mule")))
+ (and (file-directory-p (concat elc-dir "/nomule"))
+ (setq elc-dir (concat elc-dir "/nomule")))))
-+ (if (fboundp 'debian-pkg-add-load-path-item)
-+ (debian-pkg-add-load-path-item elc-dir)
++ (if (and nil (fboundp 'fink-pkg-add-load-path-item)) ; fink-pkg-* is not
++ (fink-pkg-add-load-path-item elc-dir) ; correctly working.
+ (setq load-path (cons elc-dir load-path)))
+ (autoload 'wl-user-agent-compose "wl-draft" nil t)
+ (if (fboundp 'define-mail-user-agent)
Index: mule-ucs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/mule-ucs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mule-ucs.info 2 Oct 2004 11:19:48 -0000 1.1
+++ mule-ucs.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,6 +1,6 @@
Package: mule-ucs
Version: 0.84.999+0.20030129
-Revision: 1
+Revision: 4
Description: Mule universal encoding system
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -9,7 +9,9 @@
#ftp://ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-current.tar.gz
Source-MD5: 1387a2273fe9a9a160f3a0f63e06dbac
SourceDirectory: Mule-UCS-current
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+<<
CompileScript: echo "Nothing is compiled in this section."
InstallScript: <<
install -m 755 -d %i/share/emacs/site-lisp/%n/lisp/{big5conv,jisx0213,reldata}
Index: flim.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/flim.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flim.info 2 Oct 2004 10:44:23 -0000 1.1
+++ flim.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,12 +1,17 @@
Package: flim
-Version: 1.14.6
-Revision: 3
+Version: 1.14.7
+Revision: 5
Depends: emacsen, apel (>= 9.22-1), make
Recommends: semi
Suggests: wl
-Source: ftp://ftp.m17n.org/pub/mule/%n/%n-1.14/%n-%v.tar.gz
-Source-MD5: 4b903fb1e97320cfc0cb1fce2f8b9945
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+Conflicts: limit
+Replaces: limit
+#Source: ftp://ftp.m17n.org/pub/mule/%n/%n-1.14/%n-%v.tar.gz
+Source: ftp://ftp.ring.gr.jp/pub/elisp/%n/%n-1.14/%n-%v.tar.gz
+Source-MD5: e32430eced7e244c4049f15e2cdd481b
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+<<
CompileScript: <<
#!/bin/sh
FLAGS="-batch -q -no-site-file -l texinfmt"
@@ -16,53 +21,51 @@
makeinfo sasl.texi
<<
InstallScript: <<
-install -m 755 -d %i/share/%n
+install -m 755 -d %i/share/%n
install -m 644 mailcap.el smtpmail.el %i/share/%n
-rm -f mailcap.el smtpmail.el
+rm -f mailcap.el smtpmail.el
-install -m 755 -d %i/share/emacs/site-lisp/%n
+install -m 755 -d %i/share/emacs/site-lisp/%n
install -m 644 *.el FLIM-* Makefile %i/share/emacs/site-lisp/%n
-install -m 755 -d %i/share/info
+install -m 755 -d %i/share/info
install -m 644 *.info %i/share/info
-install -m 755 -d %i/etc/emacs/site-start.d
+install -m 755 -d %i/etc/emacs/site-start.d
install -m 644 fink/%n-startup %i/etc/emacs/site-start.d/50%n.el
-install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
+install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
-install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
+install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
<<
DocFiles: ChangeLog NEWS README* VERSION *.sgml
PostInstScript: <<
+if [ "$1" = "configure" ] && [ -x %p/lib/emacsen-common/emacs-package-install ]
+then
+ %p/lib/emacsen-common/emacs-package-install %n
+fi
+
if [ "$1" = "configure" ] && [ -f %p/share/info/dir ]; then
if which install-info >/dev/null 2>&1; then
install-info --section "Emacs" "MIME (en)" --menuentry=FLIM-en \
--infodir=%p/share/info %p/share/info/mime-en.info
install-info --section "Emacs" "MIME (ja)" --menuentry=FLIM-ja \
--infodir=%p/share/info %p/share/info/mime-ja.info
- install-info --section "Emacs" \
- --infodir=%p/share/info %p/share/info/sasl.info
fi
fi
-
-if [ "$1" = "configure" ] && [ -x %p/lib/emacsen-common/emacs-package-install ]
-then
- %p/lib/emacsen-common/emacs-package-install %n
-fi
<<
PreRmScript: <<
+if [ -x %p/lib/emacsen-common/emacs-package-remove ] ; then
+ %p/lib/emacsen-common/emacs-package-remove %n
+fi
+
if [ -f %p/share/info/dir ]; then
install-info --infodir=%p/share/info --remove %p/share/info/mime-en.info
install-info --infodir=%p/share/info --remove %p/share/info/mime-ja.info
- install-info --infodir=%p/share/info --remove %p/share/info/sasl.info
-fi
-
-if [ -x %p/lib/emacsen-common/emacs-package-remove ] ; then
- %p/lib/emacsen-common/emacs-package-remove %n
fi
<<
ConfFiles: %p/etc/emacs/site-start.d/50%n.el
+InfoDocs: sasl.info
Description: Library to provide basic features about message for Emacsen
DescDetail: <<
FLIM (Faithful Library about Internet Message) is a library to provide
Index: wl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/editors/wl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wl.info 2 Oct 2004 10:47:34 -0000 1.1
+++ wl.info 19 Apr 2005 14:34:12 -0000 1.2
@@ -1,36 +1,44 @@
Package: wl
-Version: 2.10.1
-Revision: 4
-Depends: emacsen, apel (>= 10.3-1), flim (>= 1.14.3-1), semi (>= 1.14.3-1),
make
-Suggests: gnupg, openssl, w3m-el, mhc
-Source: http://www.ring.gr.jp/archives/text/elisp/%n/stable/%n-%v.tar.gz
-Source-MD5: 80cb1a4e3c76025284bf7eaa23faf1d6
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+Version: 2.12.2
+Revision: 5
+Depends: emacsen, apel (>= 10.3-1), flim (>= 1.14.3-1) | limit, semi (>=
1.14.3-1), make
+Suggests: gnupg, openssl, w3m-el, mhc, starttls
+Provides: imap-client, mail-reader, news-reader
+Source: ftp://ftp.gohome.org/%n/stable/%n-%v.tar.gz
+Source-MD5: 841af6be7899a286579a8e37ee662de6
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+<<
CompileScript: make INFODIR=%i/share/info info
InstallScript: <<
-install -m 755 -d %i/share/emacs/site-lisp/%n/{elmo,etc,utils,wl}
-install -m 644 Makefile WL-* %i/share/emacs/site-lisp/%n
-install -m 644 elmo/*.el %i/share/emacs/site-lisp/%n/elmo
-install -m 644 utils/*.el %i/share/emacs/site-lisp/%n/utils
-install -m 644 wl/*.el %i/share/emacs/site-lisp/%n/wl
+install -m 755 -d %i/share/emacs/site-lisp/%n/{elmo,etc,utils,wl}
+install -m 644 Makefile WL-* NEWS* %i/share/emacs/site-lisp/%n
+install -m 644 elmo/*.el %i/share/emacs/site-lisp/%n/elmo
+install -m 644 utils/*.el %i/share/emacs/site-lisp/%n/utils
+install -m 644 wl/*.el* %i/share/emacs/site-lisp/%n/wl
-install -m 755 -d %i/share/pixmaps/%n
+install -m 755 -d %i/share/pixmaps/%n
install -m 644 etc/icons/* %i/share/pixmaps/%n
( cd %i/share/emacs/site-lisp/%n/etc && ln -s ../../../../pixmaps/%n icons )
-install -m 755 -d %i/share/info
+install -m 755 -d %i/share/info
install -m 644 doc/*.info %i/share/info
-install -m 755 -d %i/share/doc/%n/samples/en %i/share/doc/%n/samples/ja
+install -m 755 -d %i/share/doc/%n/samples/{en,ja}
install -m 644 samples/en/dot.* %i/share/doc/%n/samples/en
install -m 644 samples/ja/dot.* %i/share/doc/%n/samples/ja
-install -m 755 -d %i/etc/emacs/site-start.d
+install -m 755 -d %i/share/doc/%n/tests
+install -m 644 tests/* %i/share/doc/%n/tests
+
+install -m 644 etc/ja.Emacs %i/share/doc/%n/Xresources.ja.Emacs
+
+install -m 755 -d %i/etc/emacs/site-start.d
install -m 644 fink/%n-startup %i/etc/emacs/site-start.d/65%n.el
-install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
+install -m 755 -d %i/lib/emacsen-common/packages/{install,remove}
install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
-install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
+install -m 755 fink/%n-remove %i/lib/emacsen-common/packages/remove/%n
<<
DocFiles: BUGS* COPYING ChangeLog INSTALL* NEWS* README* doc/TODO* etc/VERSION
PostInstScript: <<
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
