From owner-svn-ports-head@FreeBSD.ORG  Tue Apr  9 18:14:38 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5259C480;
 Tue,  9 Apr 2013 18:14:38 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 44A49F2D;
 Tue,  9 Apr 2013 18:14:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r39IEcUh096951;
 Tue, 9 Apr 2013 18:14:38 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r39IEcXh096950;
 Tue, 9 Apr 2013 18:14:38 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201304091814.r39IEcXh096950@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Tue, 9 Apr 2013 18:14:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315774 - head/editors/emacs-devel/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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Apr 2013 18:14:38 -0000

Author: ashish
Date: Tue Apr  9 18:14:37 2013
New Revision: 315774
URL: http://svnweb.freebsd.org/changeset/ports/315774

Log:
  - Fix brokenness on SPARC platforms
  
  Reported by:	tabthorpe
  Approved by:	portmgr

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

Modified: head/editors/emacs-devel/files/patch-src_sysdep.c
==============================================================================
--- head/editors/emacs-devel/files/patch-src_sysdep.c	Tue Apr  9 18:11:23 2013	(r315773)
+++ head/editors/emacs-devel/files/patch-src_sysdep.c	Tue Apr  9 18:14:37 2013	(r315774)
@@ -3,29 +3,24 @@ $FreeBSD$
 
 --- src/sysdep.c.orig
 +++ src/sysdep.c
-@@ -37,6 +37,20 @@
- #include "sysselect.h"
- #include "blockinput.h"
+@@ -43,7 +43,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
+@@ -2583,6 +2591,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 @@
+@@ -3294,6 +3336,176 @@
    return attrs;
  }