diff -Naur ddskk-12.2.0.orig/SKK-MK ddskk-12.2.0/SKK-MK --- ddskk-12.2.0.orig/SKK-MK Mon Jul 21 12:29:50 2003 +++ ddskk-12.2.0/SKK-MK Sun Mar 12 04:44:35 2006 @@ -325,7 +325,7 @@ ;; FSFmacs (when (featurep 'faces) (add-to-list 'list 'ccc)) - (when (= emacs-major-version 21) + (when (>= emacs-major-version 21) (add-to-list 'list 'skk-e21)))) ;; skk-jisx0213.el (when (condition-case nil diff -Naur ddskk-12.2.0.orig/fink/ddskk-install ddskk-12.2.0/fink/ddskk-install --- ddskk-12.2.0.orig/fink/ddskk-install Thu Jan 1 00:00:00 1970 +++ ddskk-12.2.0/fink/ddskk-install Thu Mar 11 09:16:51 2004 @@ -0,0 +1,63 @@ +#! /bin/sh -e +# /lib/emacsen-common/packages/install/ddskk + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +FLAVOR=$1 +PACKAGE=ddskk + +if [ ${FLAVOR} = emacs -o ${FLAVOR} = emacs19 ]; then exit 0; fi + +## Checking MULE supported XEmacs. ------------------------------------- +if [ ${FLAVOR} = "xemacs20" -o ${FLAVOR} = "xemacs21" ]; then + CHECKMULE=`${FLAVOR} -batch -vanilla -eval "(if (featurep 'mule)(message \"MULE\"))" 2>&1` + if [ "${CHECKMULE}" != "MULE" ]; then exit 0; fi +fi +##--------------------------------------------------------------------- + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el" + +ELDIR=/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "Emacs" "Skk" --dirname=${FLAVOR} /share/info/skk.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *` +cp -r ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} -l SKK-MK -f SKK-MK-generate-autoloads-el >CompilationLog 2>&1 +sed '/^;;; `load-path/,/^$/s/^/;/' skk-setup.el.in >skk-setup.el +mv -f leim-list.el.in leim-list.el +${FLAVOR} ${FLAGS} -f batch-byte-compile skk-setup.el >>CompilationLog 2>&1 +${FLAVOR} ${FLAGS} -l SKK-MK -f SKK-MK-compile NONE NONE NONE >>CompilationLog 2>&1 +cd nicola +${FLAVOR} ${FLAGS} -l NICOLA-DDSKK-ELS -l NICOLA-DDSKK-MK -f nicola-ddskk-generate-autoloads >>../CompilationLog 2>&1 +${FLAVOR} ${FLAGS} -f batch-byte-compile nicola-ddskk-autoloads.el >>../CompilationLog 2>&1 +${FLAVOR} ${FLAGS} -l NICOLA-DDSKK-MK -f compile-nicola-ddskk NONE NONE NONE >>../CompilationLog 2>&1 +rm -f NICOLA-* *.el +cd .. +rm -rf SKK-* *.el *.in tut-code +gzip -9qf CompilationLog + +exit 0 diff -Naur ddskk-12.2.0.orig/fink/ddskk-remove ddskk-12.2.0/fink/ddskk-remove --- ddskk-12.2.0.orig/fink/ddskk-remove Thu Jan 1 00:00:00 1970 +++ ddskk-12.2.0/fink/ddskk-remove Thu Mar 11 09:16:03 2004 @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /lib/emacsen-common/packages/remove/ddskk + +FLAVOR=$1 +PACKAGE=ddskk + +if [ ${FLAVOR} != emacs -a ${FLAVOR} != emacs19 ]; then + if test -x /sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /share/info/skk.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /share/${FLAVOR}/site-lisp/${PACKAGE} +fi diff -Naur ddskk-12.2.0.orig/fink/ddskk-startup ddskk-12.2.0/fink/ddskk-startup --- ddskk-12.2.0.orig/fink/ddskk-startup Thu Jan 1 00:00:00 1970 +++ ddskk-12.2.0/fink/ddskk-startup Thu Mar 11 09:45:31 2004 @@ -0,0 +1,41 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux ddskk package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The ddskk package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(or (eq fink-emacs-flavor 'emacs19) + (let ((skkpath + (list (concat "/share/" (symbol-name fink-emacs-flavor) "/site-lisp/ddskk") + (concat "/share/" (symbol-name fink-emacs-flavor) "/site-lisp/ddskk/nicola")))) + (setq load-path (append load-path skkpath)) + + (require 'skk-setup) + + (and (featurep 'xemacs) + (load (concat (car skkpath) "/skk-autoloads.elc"))) ; Why needed? + + (add-hook 'minibuffer-setup-hook + (function (lambda () + (and (boundp 'skk-henkan-okuri-strictly) + skk-henkan-okuri-strictly + (not (eq last-command 'skk-purge-jisyo)) + (put 'skk-henkan-okuri-strictly 'temporary-nil t) + (setq skk-henkan-okuri-strictly nil))))) + (add-hook 'minibuffer-exit-hook + (function (lambda () + (and (get 'skk-henkan-okuri-strictly 'temporary-nil) + (setq skk-henkan-okuri-strictly t) + (put 'skk-henkan-okuri-strictly 'temporary-nil nil))))) + + (setq skk-server-host (or (getenv "SKKSERVER") "localhost")))) + (if (file-exists-p "/share/ddskk/SKK-JISYO.L") + (setq skk-large-jisyo "/share/ddskk/SKK-JISYO.L") + ) diff -Naur ddskk-12.2.0.orig/skk-vars.el ddskk-12.2.0/skk-vars.el --- ddskk-12.2.0.orig/skk-vars.el Fri Jul 18 12:50:53 2003 +++ ddskk-12.2.0/skk-vars.el Fri Mar 12 10:27:39 2004 @@ -2126,7 +2126,7 @@ (cond ((eq skk-emacs-type 'xemacs) (locate-data-file "SKK.tut")) (t - "/usr/local/share/skk/SKK.tut")) + "/share/ddskk/SKK.tut")) "*SKK チュートリアルのファイル名。 The English version is SKK.tut.E." :type 'file