4 files changed, 20 insertions, 18 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index faa21f824592..44755f88b262 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%/ \
@@ -27,8 +26,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 
-EMACS_VER=	24.0.90
-EMACS_REV=	106240
+EMACS_VER=	24.0.93
+EMACS_REV=	107364
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
@@ -157,11 +156,7 @@ LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .if defined(WITHOUT_GIF)
 CONFIGURE_ARGS+=	--without-gif
 .else
-. if exists(${LOCALBASE}/lib/libgif.so)
 LIB_DEPENDS+=   gif.5:${PORTSDIR}/graphics/giflib
-. else
-LIB_DEPENDS+=   ungif.5:${PORTSDIR}/graphics/libungif
-. endif
 .endif
 
 .if defined(WITHOUT_PNG)
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index d5fcdba80a9c..3256cd3fbef8 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.0.90.106240.tar.xz) = afcb6851402e2321599e260b95c1953d01525a65f897c1abd9c5bb1600af590d
-SIZE (emacs-24.0.90.106240.tar.xz) = 23337568
+SHA256 (emacs-24.0.93.107364.tar.xz) = 51ce2b1fefbf7db5e5927dc6d956f37851b06682af459e82267f05119c9805db
+SIZE (emacs-24.0.93.107364.tar.xz) = 23549876
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.in
index d5fa248c35a2..05dbf8d39a9a 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
-@@ -1167,39 +1167,10 @@
+@@ -1169,39 +1169,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -12,9 +12,9 @@ $FreeBSD$
 -  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
 -  if test $HAVE_ALSA = yes; then
 -    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
+-    SAVE_LIBS="$LIBS"
 -    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    LIBS="$ALSA_LIBS $LIBS"
 -    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
 -                    emacs_alsa_normal=yes,
 -	            emacs_alsa_normal=no)
@@ -30,7 +30,7 @@ $FreeBSD$
 -    fi
 -
 -    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
+-    LIBS="$SAVE_LIBS"
 -    LIBSOUND="$LIBSOUND $ALSA_LIBS"
 -    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
 -    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
@@ -44,7 +44,7 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
-@@ -1216,7 +1187,7 @@
+@@ -1218,7 +1189,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 \
diff --git a/editors/emacs-devel/files/patch-src_sysdep.c b/editors/emacs-devel/files/patch-src_sysdep.c
index 820efd8f1e73..a5c26fd702f7 100644
--- a/editors/emacs-devel/files/patch-src_sysdep.c
+++ b/editors/emacs-devel/files/patch-src_sysdep.c
@@ -3,21 +3,28 @@ $FreeBSD$
 
 --- src/sysdep.c.orig
 +++ src/sysdep.c
-@@ -37,6 +37,13 @@
+@@ -37,6 +37,20 @@
  #include "sysselect.h"
  #include "blockinput.h"
  
 +#ifdef __FreeBSD__
 +#include <sys/sysctl.h>
++/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
++#ifdef __sparc__ 
++#define frame freebsd_sparc_frame
++#endif
 +#include <sys/user.h>
-+#include <sys/resource.h> */
++#ifdef __sparc__ 
++#undef frame
++#endif
++#include <sys/resource.h>
 +#include <math.h>
 +#endif
 +
  #ifdef WINDOWSNT
  #define read sys_read
  #define write sys_write
-@@ -2529,6 +2536,40 @@
+@@ -2529,6 +2543,40 @@
    return proclist;
  }
  
@@ -58,7 +65,7 @@ $FreeBSD$
  /* The WINDOWSNT implementation is in w32.c.
     The MSDOS implementation is in dosfns.c.  */
  #elif !defined (WINDOWSNT) && !defined (MSDOS)
-@@ -3079,6 +3120,176 @@
+@@ -3079,6 +3127,176 @@
    return attrs;
  }