From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 17 02:38:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 09D2BD76;
 Tue, 17 Jun 2014 02:38:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EB1082891;
 Tue, 17 Jun 2014 02:38:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5H2cDRA079703;
 Tue, 17 Jun 2014 02:38:13 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5H2cDpu079696;
 Tue, 17 Jun 2014 02:38:13 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201406170238.s5H2cDpu079696@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Tue, 17 Jun 2014 02:38:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358066 - head/editors/emacs
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jun 2014 02:38:14 -0000

Author: ashish
Date: Tue Jun 17 02:38:13 2014
New Revision: 358066
URL: http://svnweb.freebsd.org/changeset/ports/358066
QAT: https://qat.redports.org/buildarchive/r358066/

Log:
  - Fix building on 10.x when CANNA option is enabled, by updating CANNA
    patchset
  
  PR:				190711
  Submitted by:	Noboyoshi SATO <nobu-s at iwate-pu.ac.jp>

Modified:
  head/editors/emacs/Makefile
  head/editors/emacs/distinfo

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Tue Jun 17 02:07:14 2014	(r358065)
+++ head/editors/emacs/Makefile	Tue Jun 17 02:38:13 2014	(r358066)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -83,7 +83,7 @@ CANNA_CONFIGURE_ON=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
 			--with-canna-libraries=${LOCALBASE}/lib
 CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL}
-CANNA_PATCHFILES=	emacs24.3canna-20130321.diff.gz
+CANNA_PATCHFILES=	emacs24.3canna-20140616.diff.gz
 CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
 
 SOUND_CONFIGURE_WITH=		sound

Modified: head/editors/emacs/distinfo
==============================================================================
--- head/editors/emacs/distinfo	Tue Jun 17 02:07:14 2014	(r358065)
+++ head/editors/emacs/distinfo	Tue Jun 17 02:38:13 2014	(r358066)
@@ -1,4 +1,4 @@
 SHA256 (emacs-24.3.tar.xz) = 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d
 SIZE (emacs-24.3.tar.xz) = 35565352
-SHA256 (emacs24.3canna-20130321.diff.gz) = 9031dcda23f0a289a3318f3437fecb132b4e755f79cd832bf45cee5258b11e71
-SIZE (emacs24.3canna-20130321.diff.gz) = 31492
+SHA256 (emacs24.3canna-20140616.diff.gz) = a9e6a55896aa5ab733446ca86183e65c91404c29fb30e8e288302597ca578439
+SIZE (emacs24.3canna-20140616.diff.gz) = 31698