svn commit: r315774 - head/editors/emacs-devel/files

[Ashish SHUKLA]

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;
  }