From yasu@home.utahime.org  Fri Aug  3 21:13:23 2012
Return-Path: <yasu@home.utahime.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BAA93106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Aug 2012 21:13:23 +0000 (UTC)
	(envelope-from yasu@home.utahime.org)
Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210])
	by mx1.freebsd.org (Postfix) with ESMTP id 8910F8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Aug 2012 21:13:23 +0000 (UTC)
Received: from eastasia.home.utahime.org (mail.home.utahime.org [192.168.174.1])
	by gate.utahime.jp (Postfix) with ESMTP id 2AAD02E421;
	Sat,  4 Aug 2012 06:04:09 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id F0C0A2EA6C;
	Sat,  4 Aug 2012 06:04:08 +0900 (JST)
Received: by eastasia.home.utahime.org (Postfix, from userid 1000)
	id C839C2EA68; Sat,  4 Aug 2012 06:04:08 +0900 (JST)
Message-Id: <20120803210408.C839C2EA68@eastasia.home.utahime.org>
Date: Sat,  4 Aug 2012 06:04:08 +0900 (JST)
From: Yasuhiro KIMURA <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] editors/tamago: stop calling make-local-hook
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170360
>Category:       ports
>Synopsis:       [PATCH] editors/tamago: stop calling make-local-hook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 03 21:20:08 UTC 2012
>Closed-Date:    Sat Aug 04 00:46:06 UTC 2012
>Last-Modified:  Sat Aug  4 00:50:06 UTC 2012
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 9.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD eastasia.home.utahime.org 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Wed Jun 13 07:27:30 JST 2012 root@eastasia.home.utahime.org:/usr/obj/usr0/freebsd/src/releng_9_0/src/sys/EASTASIA i386


	
>Description:
	Stop calling make-local-hook because it is obsolete since 21.1
        and removed at 24.1.

	
>How-To-Repeat:
	
>Fix:

	

--- patch-tamago begins here ---
Index: Makefile
===================================================================
RCS file: /usr0/freebsd/cvsroot/ports/editors/tamago/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile	3 Aug 2012 06:05:08 -0000	1.49
+++ Makefile	3 Aug 2012 20:49:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.18
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
Index: files/post-patch-egg.el
===================================================================
RCS file: files/post-patch-egg.el
diff -N files/post-patch-egg.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/post-patch-egg.el	3 Aug 2012 20:42:11 -0000
@@ -0,0 +1,14 @@
+--- egg.el.orig	2012-08-04 05:36:35.000000000 +0900
++++ egg.el	2012-08-04 05:39:54.000000000 +0900
+@@ -169,7 +169,10 @@
+       (setq egg-modeless-mode t))
+     (setq inactivate-current-input-method-function 'egg-mode)
+     (setq describe-current-input-method-function 'egg-help)
+-    (make-local-hook 'input-method-activate-hook)
++;; Stop calling make-local-hook because
++;; - make-local-hook is obsolete since 21.1 and removed at 24.1
++;; - following add-hook call does the job.
++;;    (make-local-hook 'input-method-activate-hook)
+     (add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t)
+     (if (eq (selected-window) (minibuffer-window))
+ 	(add-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))
Index: files/post-patch-menudiag.el
===================================================================
RCS file: files/post-patch-menudiag.el
diff -N files/post-patch-menudiag.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/post-patch-menudiag.el	3 Aug 2012 20:42:45 -0000
@@ -0,0 +1,14 @@
+--- menudiag.el.orig	2001-01-28 03:53:13.000000000 +0900
++++ menudiag.el	2012-08-04 05:41:14.000000000 +0900
+@@ -503,7 +503,10 @@
+   (make-local-variable 'inhibit-read-only)
+   (setq buffer-read-only t
+ 	inhibit-read-only nil)
+-  (make-local-hook 'post-command-hook)
++;; Stop calling make-local-hook because
++;; - make-local-hook is obsolete since 21.1 and removed at 24.1
++;; - following add-hook call does the job.
++;;  (make-local-hook 'post-command-hook)
+   (add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t)
+   (use-local-map menudiag-selection-map)
+   (setq mode-name "Menudiag Selection")
--- patch-tamago ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hrs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Aug 3 21:20:24 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170360 
State-Changed-From-To: open->closed 
State-Changed-By: hrs 
State-Changed-When: Sat Aug 4 00:45:39 UTC 2012 
State-Changed-Why:  
Committed a fix.  Thank you for your report. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170360 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170360: commit references a PR
Date: Sat,  4 Aug 2012 00:45:44 +0000 (UTC)

 Author: hrs
 Date: Sat Aug  4 00:45:29 2012
 New Revision: 301979
 URL: http://svn.freebsd.org/changeset/ports/301979
 
 Log:
   - Update to 4.0.6.0.20041122.19.
   - Fix make-local-hook issue in emacs24.
   
   PR:	ports/170360
   > Description of fields to fill in above:                     76 columns --|
   > PR:            If a GNATS PR is affected by the change.
   > Submitted by:  If someone else sent in the change.
   > Reviewed by:   If someone else reviewed your modification.
   > Approved by:   If you needed approval for this commit.
   > Obtained from: If the change is from a third party.
   > MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email.
   > Security:      Vulnerability reference (one per line) or description.
   > Empty fields above will be automatically removed.
   
   M    tamago/distinfo
   AM   tamago/files/post-patch-egg.el
   AM   tamago/files/post-patch-menudiag.el
   M    tamago/Makefile
 
 Added:
   head/editors/tamago/files/post-patch-egg.el   (contents, props changed)
   head/editors/tamago/files/post-patch-menudiag.el   (contents, props changed)
 Modified:
   head/editors/tamago/Makefile
   head/editors/tamago/distinfo
 
 Modified: head/editors/tamago/Makefile
 ==============================================================================
 --- head/editors/tamago/Makefile	Fri Aug  3 23:19:19 2012	(r301978)
 +++ head/editors/tamago/Makefile	Sat Aug  4 00:45:29 2012	(r301979)
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	tamago
 -PORTVERSION=	4.0.6.0.20041122.18
 -PORTREVISION=	7
 +PORTVERSION=	4.0.6.0.20041122.19
  CATEGORIES=	editors elisp
  MASTER_SITES=	${MASTER_SITE_DEBIAN}
  MASTER_SITE_SUBDIR=	pool/main/e/egg
 @@ -16,7 +15,7 @@ DISTNAME=	egg_4.0.6+0.20041122cvs.orig
  
  PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
  		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
 -PATCHFILES=	egg_4.0.6+0.20041122cvs-18.diff.gz
 +PATCHFILES=	egg_4.0.6+0.20041122cvs-19.diff.gz
  PATCH_DIST_STRIP=	-p1
  
  MAINTAINER=	hrs@FreeBSD.org
 
 Modified: head/editors/tamago/distinfo
 ==============================================================================
 --- head/editors/tamago/distinfo	Fri Aug  3 23:19:19 2012	(r301978)
 +++ head/editors/tamago/distinfo	Sat Aug  4 00:45:29 2012	(r301979)
 @@ -1,4 +1,4 @@
  SHA256 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 722413515f2d60418d98250c8aed2b811e6b5363cdb69899193d454afe425115
  SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
 -SHA256 (egg_4.0.6+0.20041122cvs-18.diff.gz) = e6ff6e7e1b52b38ba87cadc0733add1651827366af766bd78719b9ab6fd57e8b
 -SIZE (egg_4.0.6+0.20041122cvs-18.diff.gz) = 28267
 +SHA256 (egg_4.0.6+0.20041122cvs-19.diff.gz) = bd4252d0536c1eeb526789063b822b9b9e75f2bbec9c3db97792ce0ee3b89fb0
 +SIZE (egg_4.0.6+0.20041122cvs-19.diff.gz) = 28417
 
 Added: head/editors/tamago/files/post-patch-egg.el
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/editors/tamago/files/post-patch-egg.el	Sat Aug  4 00:45:29 2012	(r301979)
 @@ -0,0 +1,12 @@
 +--- egg.el.orig	2012-08-04 09:27:19.000000000 +0900
 ++++ egg.el	2012-08-04 09:32:15.000000000 +0900
 +@@ -169,7 +169,8 @@
 +       (setq egg-modeless-mode t))
 +     (setq inactivate-current-input-method-function 'egg-mode)
 +     (setq describe-current-input-method-function 'egg-help)
 +-    (make-local-hook 'input-method-activate-hook)
 ++    (if (fboundp 'make-local-hook)
 ++      (eval '(make-local-hook 'input-method-activate-hook)))
 +     (add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t)
 +     (if (eq (selected-window) (minibuffer-window))
 + 	(add-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))
 
 Added: head/editors/tamago/files/post-patch-menudiag.el
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/editors/tamago/files/post-patch-menudiag.el	Sat Aug  4 00:45:29 2012	(r301979)
 @@ -0,0 +1,12 @@
 +--- menudiag.el.orig	2001-01-28 03:53:13.000000000 +0900
 ++++ menudiag.el	2012-08-04 09:32:34.000000000 +0900
 +@@ -503,7 +503,8 @@
 +   (make-local-variable 'inhibit-read-only)
 +   (setq buffer-read-only t
 + 	inhibit-read-only nil)
 +-  (make-local-hook 'post-command-hook)
 ++  (if (fboundp 'make-local-hook)
 ++    (eval '(make-local-hook 'post-command-hook)))
 +   (add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t)
 +   (use-local-map menudiag-selection-map)
 +   (setq mode-name "Menudiag Selection")
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
