Date: Sun, 23 Nov 2014 07:35:23 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373123 - in head/editors/tamago: . files Message-ID: <201411230735.sAN7ZN8B097936@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Nov 23 07:35:23 2014 New Revision: 373123 URL: https://svnweb.freebsd.org/changeset/ports/373123 QAT: https://qat.redports.org/buildarchive/r373123/ Log: - Fix warnings due to use of obsolete functions. - Style fixes. Added: head/editors/tamago/files/patch-configure (contents, props changed) head/editors/tamago/files/patch-egg-cnv.el (contents, props changed) head/editors/tamago/files/patch-egg-mlh.el (contents, props changed) head/editors/tamago/files/patch-egg-sim.el (contents, props changed) head/editors/tamago/files/patch-egg-sj3.el (contents, props changed) head/editors/tamago/files/post-patch-egg-anthy.el (contents, props changed) head/editors/tamago/files/post-patch-egg-canna.el (contents, props changed) head/editors/tamago/files/post-patch-egg-wnn.el (contents, props changed) Modified: head/editors/tamago/Makefile head/editors/tamago/files/patch-egg-com.el head/editors/tamago/files/patch-its.el Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Sun Nov 23 06:14:21 2014 (r373122) +++ head/editors/tamago/Makefile Sun Nov 23 07:35:23 2014 (r373123) @@ -3,7 +3,7 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -16,14 +16,16 @@ PATCHFILES= egg_4.0.6+0.20041122cvs-19.d PATCH_DIST_STRIP= -p1 MAINTAINER= hrs@FreeBSD.org -COMMENT= The Multilingual Input Method - Egg V4 +COMMENT= Egg V4, Multilingual Input Method for Emacsen LICENSE= GPLv2 USES= gmake -GNU_CONFIGURE= yes USE_EMACS= yes +POST_PATCHES= ${PATCHDIR}/post-patch-* WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs +GNU_CONFIGURE= yes +CONFIGURE_ENV= lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}" PLIST_SUB= ELISPDIR="${EMACS_VERSION_SITE_LISPDIR}" PORTDOCS= AUTHORS ChangeLog ChangeLog.1997-1998 \ ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO \ @@ -32,23 +34,19 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${EMACS_PORT_NAME} == emacs21 || \ - ${EMACS_PORT_NAME} == emacs22 || \ - ${EMACS_PORT_NAME} == emacs23 || \ - ${EMACS_PORT_NAME} == emacs24 +.if ${EMACS_PORT_NAME:Memacs2[1234]} PLIST_SUB+= HAS_JISX0213="" .else PLIST_SUB+= HAS_JISX0213="@comment " .endif -pre-configure: - @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ - ${WRKSRC}/configure +post-patch: + cd ${PATCH_WRKSRC} && (${CAT} ${POST_PATCHES} | ${PATCH}) post-build: - (cd ${WRKSRC}/helper && \ + cd ${WRKSRC}/helper && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ - ${_MAKE_JOBS} ${MAKE_ARGS} egg-helper) + ${_MAKE_JOBS} ${MAKE_ARGS} egg-helper ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${WRKSRC}/changelog.Debian ${INSTALL_DATA} ${WRKSRC}/debian/README.Debian ${WRKSRC} @@ -57,7 +55,7 @@ post-install: ${STAGEDIR}${PREFIX}/bin/egg-helper .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> Added: head/editors/tamago/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-configure Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,11 @@ +--- configure.orig 2002-09-10 07:14:26.000000000 +0900 ++++ configure 2014-11-23 16:22:46.000000000 +0900 +@@ -646,7 +646,7 @@ + fi + + +-lispdir=${datadir}/emacs/site-lisp ++: ${lispdir:=${datadir}/emacs/24.4/site-lisp} + + trap '' 1 2 15 + cat > confcache <<\EOF Added: head/editors/tamago/files/patch-egg-cnv.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-cnv.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,12 @@ +--- egg-cnv.el.orig 2002-07-23 06:59:44.000000000 +0900 ++++ egg-cnv.el 2014-11-23 16:00:50.000000000 +0900 +@@ -1245,7 +1245,8 @@ + (with-output-to-temp-buffer "*Help*" + (princ "EGG Conversion mode:\n") + (princ (documentation 'egg-conversion-mode)) +- (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p)))) ++ (help-setup-xref (cons #'help-xref-mode (current-buffer)) ++ (called-interactively-p 'interactive)))) + + (provide 'egg-cnv) + Modified: head/editors/tamago/files/patch-egg-com.el ============================================================================== --- head/editors/tamago/files/patch-egg-com.el Sun Nov 23 06:14:21 2014 (r373122) +++ head/editors/tamago/files/patch-egg-com.el Sun Nov 23 07:35:23 2014 (r373123) @@ -1,6 +1,72 @@ ---- egg-com.el.orig 2013-04-23 16:10:35.000000000 +0900 -+++ egg-com.el 2013-04-23 16:13:12.000000000 +0900 -@@ -828,9 +828,10 @@ +--- egg-com.el.orig 2014-11-23 15:54:16.000000000 +0900 ++++ egg-com.el 2014-11-23 15:58:24.000000000 +0900 +@@ -99,9 +99,10 @@ + (prog1 (- (point) pos) + (goto-char pos)))) + +-(eval-and-compile +- (if (string< mule-version "6.0") ;; for before Emacs23 +- (progn ++(if (and (fboundp 'make-coding-system) ++ (null (get 'make-coding-system 'byte-obsolete-info))) ++;; since Emacs 23.1, make-coding-system has been marked as obsolete. ++ (eval-and-compile + (define-ccl-program ccl-decode-fixed-euc-jp + `(2 + ((r2 = ,(charset-id 'japanese-jisx0208)) +@@ -156,7 +157,8 @@ + (make-coding-system 'fixed-euc-jp 4 ?W "Coding System for fixed EUC Japanese" + (cons ccl-decode-fixed-euc-jp ccl-encode-fixed-euc-jp)) + ) +- ;; Emacs23 or later ++ (eval-and-compile ++ ;; since Emacs 23.1, make-coding-system has been marked as obsolete. + ;; From Handa-san. [mule-ja : No.09414] + (define-charset 'fixed-euc-jp + "Fixed EUC Japanese" +@@ -175,7 +177,10 @@ + + ;; Korean + +-(eval-and-compile ++(if (and (fboundp 'make-coding-system) ++ (null (get 'make-coding-system 'byte-obsolete-info))) ++;; since Emacs 23.1, make-coding-system has been marked as obsolete. ++ (eval-and-compile + (define-ccl-program ccl-decode-fixed-euc-kr + `(2 + ((r2 = ,(charset-id 'korean-ksc5601)) +@@ -202,12 +207,27 @@ + (write-read-repeat r0))) + (read r0) + (repeat))))) ++(make-coding-system 'fixed-euc-kr 4 ?W "Coding System for fixed EUC Korean" ++ (cons ccl-decode-fixed-euc-kr ccl-encode-fixed-euc-kr))) ++ (eval-and-compile ++ ;; since Emacs 23.1, make-coding-system has been marked as obsolete. ++ (define-charset 'fixed-euc-kr ++ "Fixed EUC Korean" ++ :dimension 2 ++ :superset '(ascii ++ (korean-ksc5601 . #x8080))) ++ (define-coding-system 'fixed-euc-kr ++ "Coding System for fixed EUC Korean" ++ :mnemonic ?W ++ :coding-type 'charset ++ :charset-list '(fixed-euc-kr)) ++ ) + ) + +-(make-coding-system 'fixed-euc-kr 4 ?W "Coding System for fixed EUC Korean" +- (cons ccl-decode-fixed-euc-kr ccl-encode-fixed-euc-kr)) + + ;; Chinese ++;; ++;; TODO: convert an obsolete make-coding-system to define-coding-system. + + (defconst egg-pinyin-shengmu + '(("" . 0) ("B" . 1) ("C" . 2) ("Ch" . 3) ("D" . 4) +@@ -828,9 +848,10 @@ ;; Do not move the point, leave it where it was. (defmacro comm-accept-process-output () `(let ((p (point))) @@ -14,7 +80,7 @@ (defmacro comm-require-process-output (n) `(if (< (point-max) (+ (point) ,n)) -@@ -839,10 +840,11 @@ +@@ -839,10 +860,11 @@ (defun comm-wait-for-space (proc n) (let ((p (point)) (r (+ (point) n))) Added: head/editors/tamago/files/patch-egg-mlh.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-mlh.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,20 @@ +--- egg-mlh.el.orig 2014-11-22 15:28:22.000000000 +0900 ++++ egg-mlh.el 2014-11-22 15:28:40.000000000 +0900 +@@ -122,7 +122,7 @@ + (goto-char end-marker) + (backward-delete-char 2) + (let* ((str (buffer-substring beg (point))) +- (val (string-to-int str))) ++ (val (string-to-number str))) + (delete-region beg (point)) + (if (= val 0) + (setq val 1)) +@@ -220,7 +220,7 @@ + (goto-char end-marker) + (backward-delete-char 2) + (let* ((str (buffer-substring beg (point))) +- (val (string-to-int str))) ++ (val (string-to-number str))) + (delete-region beg (point)) + (if (= val 0) + (setq val 1)) Added: head/editors/tamago/files/patch-egg-sim.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-sim.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,38 @@ +--- egg-sim.el.orig 2014-11-23 15:19:11.000000000 +0900 ++++ egg-sim.el 2014-11-23 15:20:02.000000000 +0900 +@@ -432,7 +432,7 @@ + (insert "-+") + (let ((i 0)) + (while (< i 16) +- (insert (format "----" i)) ++ (insert (format "----")) + (setq i (1+ i)))) + (insert "\n") + +@@ -461,7 +461,7 @@ + (insert "-+") + (let ((i 0)) + (while (< i 16) +- (insert (format "----" i)) ++ (insert (format "----")) + (setq i (1+ i)))) + (insert "\n") + +@@ -496,7 +496,7 @@ + (insert "-+") + (let ((i 0)) + (while (< i 16) +- (insert (format "----" i)) ++ (insert (format "----")) + (setq i (1+ i)))) + (insert "\n") + +@@ -531,7 +531,7 @@ + (insert "-+") + (let ((i 1)) + (while (<= i 94) +- (insert (format "-----" i)) ++ (insert (format "-----")) + (setq i (1+ i)))) + (insert "\n") + Added: head/editors/tamago/files/patch-egg-sj3.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-sj3.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,11 @@ +--- egg/sj3.el.orig 2014-11-23 16:07:41.000000000 +0900 ++++ egg/sj3.el 2014-11-23 16:08:04.000000000 +0900 +@@ -146,7 +146,7 @@ + (setq proc (open-network-stream "SJ3" buf hostname sj3-server-port)) + ((error quit) + (egg-error "failed to connect sj3 server"))) +- (process-kill-without-query proc) ++ (set-process-query-on-exit-flag proc nil) + (set-process-coding-system proc 'binary 'binary) + (set-marker-insertion-type (process-mark proc) t) + (save-excursion Modified: head/editors/tamago/files/patch-its.el ============================================================================== --- head/editors/tamago/files/patch-its.el Sun Nov 23 06:14:21 2014 (r373122) +++ head/editors/tamago/files/patch-its.el Sun Nov 23 07:35:23 2014 (r373123) @@ -1,5 +1,5 @@ ---- its.el.orig 2002-08-02 12:07:34.000000000 +0900 -+++ its.el 2013-03-30 17:11:53.000000000 +0900 +--- its.el.orig 2014-11-23 16:01:01.000000000 +0900 ++++ its.el 2014-11-23 16:01:52.000000000 +0900 @@ -397,7 +397,7 @@ (defun its-self-insert-char () (interactive) @@ -17,4 +17,14 @@ + (if (its-keyseq-acceptable-p (vector last-command-event) syl) (its-self-insert-char) (its-kick-convert-region n)))) - + +@@ -1554,7 +1554,8 @@ + (with-output-to-temp-buffer "*Help*" + (princ "ITS mode:\n") + (princ (documentation 'its-mode)) +- (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p)))) ++ (help-setup-xref (cons #'help-xref-mode (current-buffer)) ++ (called-interactively-p 'interactive)))) + + ;; The `point-left' hook function will never be called in Emacs 21.2.50 + ;; when the command `next-line' is used in the last line of a buffer Added: head/editors/tamago/files/post-patch-egg-anthy.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/post-patch-egg-anthy.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,11 @@ +--- egg/anthy.el.orig 2014-11-23 16:11:09.000000000 +0900 ++++ egg/anthy.el 2014-11-23 16:11:30.000000000 +0900 +@@ -146,7 +146,7 @@ + (if anthy-egg-use-utf8 + '("--egg" "--utf8") + '("--egg")))) +- (process-kill-without-query anthy-egg-proc) ++ (set-process-query-on-exit-flag anthy-egg-proc nil) + (set-process-coding-system anthy-egg-proc cs cs) + (set-process-sentinel anthy-egg-proc 'anthy-egg-proc-sentinel) + (set-marker-insertion-type (process-mark anthy-egg-proc) t) Added: head/editors/tamago/files/post-patch-egg-canna.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/post-patch-egg-canna.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,29 @@ +--- egg/canna.el.orig 2014-11-23 16:07:10.000000000 +0900 ++++ egg/canna.el 2014-11-23 16:10:05.000000000 +0900 +@@ -337,7 +337,7 @@ + (setq port (substring hostname (match-end 0)) + hostname (substring hostname 0 (match-beginning 0)))) + (if (and (stringp port) (string-match "^[0-9]+$" port)) +- (setq port (string-to-int port))) ++ (setq port (string-to-number port))) + (and (equal hostname "") + (setq hostname (or (getenv "CANNAHOST") "localhost"))) + (setq host hostname) +@@ -367,7 +367,7 @@ + (setq proc (open-network-stream proc-name buf hostname port)) + (error quit))))) + (when (processp proc) +- (process-kill-without-query proc) ++ (set-process-query-on-exit-flag proc nil) + (set-process-coding-system proc 'binary 'binary) + (set-process-sentinel proc 'canna-comm-sentinel) + (set-marker-insertion-type (process-mark proc) t) +@@ -869,7 +869,7 @@ + (setq kouho-list (cdr (reverse kouho-list))) + (setq kouho-list (reverse kouho-list)) + (setq i 0) +- (setq kouho-list (mapcar '(lambda (k) ++ (setq kouho-list (mapcar #'(lambda (k) + (prog1 + (cons k i) + (setq i (1+ i)))) Added: head/editors/tamago/files/post-patch-egg-wnn.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/post-patch-egg-wnn.el Sun Nov 23 07:35:23 2014 (r373123) @@ -0,0 +1,11 @@ +--- egg/wnn.el.orig 2014-11-23 16:11:58.000000000 +0900 ++++ egg/wnn.el 2014-11-23 16:12:19.000000000 +0900 +@@ -1283,7 +1283,7 @@ + (setq proc (open-network-stream proc-name buf hostname port)) + (error quit))))) + (when (processp proc) +- (process-kill-without-query proc) ++ (set-process-query-on-exit-flag proc nil) + (set-process-coding-system proc 'binary 'binary) + (set-process-sentinel proc 'wnn-comm-sentinel) + (set-marker-insertion-type (process-mark proc) t)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411230735.sAN7ZN8B097936>