diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2013-05-13 05:33:57 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2013-05-13 05:33:57 +0000 |
| commit | 31585680385e237f2a6fc7fc6088a4f9c0ecb040 (patch) | |
| tree | 65147f056a4ad0af5ef82093ad035d2fd982bc1d /editors/emacs-devel/files | |
| parent | - Bring back PORTREVISION, accidentally removed in previous commit (diff) | |
- Update to bzr snapshot 112532
Diffstat (limited to 'editors/emacs-devel/files')
| -rw-r--r-- | editors/emacs-devel/files/patch-doc-lispintro-Makefile.in | 8 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-src_sysdep.c | 25 |
2 files changed, 19 insertions, 14 deletions
diff --git a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in index ff0a5cddab52..cfe14309de4a 100644 --- a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in +++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- doc/lispintro/Makefile.in.orig +++ doc/lispintro/Makefile.in -@@ -27,7 +27,7 @@ - texinfodir = $(srcdir)/../misc +@@ -35,7 +35,7 @@ + INFO_OPTS=@INFO_OPTS@ MAKEINFO = @MAKEINFO@ --MAKEINFO_OPTS = --force -I $(srcdir) -+MAKEINFO_OPTS = --force --no-split -I $(srcdir) +-MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir) ++MAKEINFO_OPTS = --force --no-split -I $(emacsdir) -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips diff --git a/editors/emacs-devel/files/patch-src_sysdep.c b/editors/emacs-devel/files/patch-src_sysdep.c index 312388756c88..7b03201d37e5 100644 --- a/editors/emacs-devel/files/patch-src_sysdep.c +++ b/editors/emacs-devel/files/patch-src_sysdep.c @@ -3,24 +3,29 @@ $FreeBSD$ --- src/sysdep.c.orig +++ src/sysdep.c -@@ -43,7 +43,15 @@ - #endif +@@ -37,6 +37,20 @@ + #include "sysselect.h" + #include "blockinput.h" - #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 -@@ -2583,6 +2591,40 @@ - return proclist; ++#include <sys/resource.h> ++#include <math.h> ++#endif ++ + #ifdef WINDOWSNT + #define read sys_read + #define write sys_write +@@ -2529,6 +2543,40 @@ + return proclist; } +#elif defined (__FreeBSD__) @@ -60,7 +65,7 @@ $FreeBSD$ /* The WINDOWSNT implementation is in w32.c. The MSDOS implementation is in dosfns.c. */ #elif !defined (WINDOWSNT) && !defined (MSDOS) -@@ -3294,6 +3336,176 @@ +@@ -3079,6 +3127,176 @@ return attrs; } |