5 files changed, 64 insertions, 5 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index eadbc5c19afb..70da2920067f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -28,9 +27,10 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	24.0.90
-EMACS_REV=	105951
+EMACS_REV=	106087
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NCURSES=	yes
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index c92e148effa8..15c49e73f97c 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.0.90.105951.tar.xz) = 19d15a081da1079c32f39539955b442a5c4e33f5f5291ac804777ef40242bbbe
-SIZE (emacs-24.0.90.105951.tar.xz) = 23315796
+SHA256 (emacs-24.0.90.106087.tar.xz) = dac2e44e1c32dab7f527b6d9413c8a13ae1d32536c7516667a0fa6fccdaa357c
+SIZE (emacs-24.0.90.106087.tar.xz) = 23349488
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.in
index 5d6d00b3beef..44b4c36ab072 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.in
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- configure.in.orig
 +++ configure.in
-@@ -1129,39 +1129,10 @@
+@@ -1167,39 +1167,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -44,3 +44,21 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
+@@ -1216,7 +1187,7 @@
+   linux/version.h sys/systeminfo.h \
+   stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
+   sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
+-  sys/utsname.h pwd.h utmp.h dirent.h util.h)
++  sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h)
+
+ AC_MSG_CHECKING(if personality LINUX32 can be set)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
+@@ -1369,7 +1340,7 @@ dnl check for GNU Make if we have GCC an
+ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
+    AC_MSG_CHECKING([whether we are using GNU Make])
+    HAVE_GNU_MAKE=no
+-   testval=`make --version 2>/dev/null | grep 'GNU Make'`
++   testval=`${MAKE:-make} --version 2>/dev/null | grep 'GNU Make'`
+    if test "x$testval" != x; then
+       HAVE_GNU_MAKE=yes
+    else
diff --git a/editors/emacs-devel/files/patch-src_process.c b/editors/emacs-devel/files/patch-src_process.c
new file mode 100644
index 000000000000..969accf82807
--- /dev/null
+++ b/editors/emacs-devel/files/patch-src_process.c
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/process.c.orig
++++ src/process.c
+@@ -83,6 +83,10 @@
+ #include <util.h>
+ #endif
+ 
++#ifdef HAVE_LIBUTIL_H
++#include <libutil.h>
++#endif
++
+ #ifdef HAVE_PTY_H
+ #include <pty.h>
+ #endif
diff --git a/editors/emacs-devel/files/patch-src_s_freebsd.h b/editors/emacs-devel/files/patch-src_s_freebsd.h
new file mode 100644
index 000000000000..c929037bdecc
--- /dev/null
+++ b/editors/emacs-devel/files/patch-src_s_freebsd.h
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- src/s/freebsd.h.orig
++++ src/s/freebsd.h
+@@ -61,3 +61,19 @@
+ 
+ /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
+ #define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
++
++#define INTERRUPT_INPUT
++
++#define PTY_ITERATION	int i; for (i = 0; i < 1; i++)
++#define PTY_NAME_SPRINTF	/* none */
++#define PTY_TTY_NAME_SPRINTF	/* none */
++#define PTY_OPEN						\
++  do								\
++    {								\
++      int slave;						\
++      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)	\
++	fd = -1;						\
++      else							\
++	emacs_close (slave);					\
++    }								\
++  while (0)