From owner-svn-ports-all@FreeBSD.ORG  Sun Feb 23 00:55:47 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5F463BF1;
 Sun, 23 Feb 2014 00:55:47 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 48F6B1F9F;
 Sun, 23 Feb 2014 00:55:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1N0tlZ6040019;
 Sun, 23 Feb 2014 00:55:47 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1N0tlgE040018;
 Sun, 23 Feb 2014 00:55:47 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201402230055.s1N0tlgE040018@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sun, 23 Feb 2014 00:55:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345683 - head/editors/emacs/files
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.17
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: Sun, 23 Feb 2014 00:55:47 -0000

Author: ashish
Date: Sun Feb 23 00:55:46 2014
New Revision: 345683
URL: http://svnweb.freebsd.org/changeset/ports/345683
QAT: https://qat.redports.org/buildarchive/r345683/

Log:
  - Update the diff to fix building on Sparc and ARM platforms
  
  Submitted by:	Nicolas Edel <nicolas.edel@gmail.com> (via private email)

Modified:
  head/editors/emacs/files/patch-src_sysdep.c

Modified: head/editors/emacs/files/patch-src_sysdep.c
==============================================================================
--- head/editors/emacs/files/patch-src_sysdep.c	Sat Feb 22 23:46:21 2014	(r345682)
+++ head/editors/emacs/files/patch-src_sysdep.c	Sun Feb 23 00:55:46 2014	(r345683)
@@ -3,29 +3,24 @@ $FreeBSD$
 
 --- src/sysdep.c.orig
 +++ src/sysdep.c
-@@ -37,6 +37,20 @@
- #include "sysselect.h"
- #include "blockinput.h"
+@@ -46,7 +46,15 @@
+ #endif
  
-+#ifdef __FreeBSD__
+ #ifdef __FreeBSD__
 +#include <sys/sysctl.h>
 +/* machine/frame.h in Sparc/ARM has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
 +#if defined(__sparc__) || defined(__arm__)
 +#define frame freebsd_sparc_frame
 +#endif
-+#include <sys/user.h>
+ #include <sys/user.h>
 +#if defined(__sparc__) || defined(__arm__)
 +#undef frame
 +#endif
-+#include <sys/resource.h>
-+#include <math.h>
-+#endif
-+
- #ifdef WINDOWSNT
- #define read sys_read
- #define write sys_write
-@@ -2529,6 +2543,40 @@
-   return proclist;
+ #include <sys/resource.h>
+ #include <math.h>
+ #endif
+@@ -2691,6 +2699,40 @@
+   return  proclist;
  }
  
 +#elif defined (__FreeBSD__)
@@ -65,7 +60,7 @@ $FreeBSD$
  /* The WINDOWSNT implementation is in w32.c.
     The MSDOS implementation is in dosfns.c.  */
  #elif !defined (WINDOWSNT) && !defined (MSDOS)
-@@ -3079,6 +3127,176 @@
+@@ -3402,6 +3444,176 @@
    return attrs;
  }