Date: Mon, 13 May 2013 05:33:58 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317997 - in head/editors/emacs-devel: . files Message-ID: <201305130533.r4D5XwD2056104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Mon May 13 05:33:57 2013 New Revision: 317997 URL: http://svnweb.freebsd.org/changeset/ports/317997 Log: - Update to bzr snapshot 112532 Modified: head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo head/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in head/editors/emacs-devel/files/patch-src_sysdep.c Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Mon May 13 05:24:50 2013 (r317996) +++ head/editors/emacs-devel/Makefile Mon May 13 05:33:57 2013 (r317997) @@ -23,7 +23,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-2 emacs-nox11-[0-9]* EMACS_VER= 24.3.50 -EMACS_REV= 112178 +EMACS_REV= 112532 GNU_CONFIGURE= yes USES= ncurses USE_GMAKE= yes Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Mon May 13 05:24:50 2013 (r317996) +++ head/editors/emacs-devel/distinfo Mon May 13 05:33:57 2013 (r317997) @@ -1,2 +1,2 @@ -SHA256 (emacs-24.3.50.112178.tar.xz) = 872ed1ad563c054e9e648d4506dd79e8e3bc9d4924356751d7a51c18fa7d454f -SIZE (emacs-24.3.50.112178.tar.xz) = 31457968 +SHA256 (emacs-24.3.50.112532.tar.xz) = 45f3d33f2f2f291a78c499fe1d05bc2ce403d56f4ec4b0cbaba4bdb0558b54e4 +SIZE (emacs-24.3.50.112532.tar.xz) = 31509672 Modified: head/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in ============================================================================== --- head/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in Mon May 13 05:24:50 2013 (r317996) +++ head/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in Mon May 13 05:33:57 2013 (r317997) @@ -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 Modified: head/editors/emacs-devel/files/patch-src_sysdep.c ============================================================================== --- head/editors/emacs-devel/files/patch-src_sysdep.c Mon May 13 05:24:50 2013 (r317996) +++ head/editors/emacs-devel/files/patch-src_sysdep.c Mon May 13 05:33:57 2013 (r317997) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305130533.r4D5XwD2056104>