3 files changed, 13 insertions, 7 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index d3b0ff2c9d79..a94686420654 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -9,6 +9,7 @@ MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ashish
 PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${PORTVERSION}.${GIT_REV}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	GNU editing macros
@@ -22,13 +23,13 @@ CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	25.0.50
-EMACS_REV=	20150321.4a50af93
+EMACS_REV=	20150427
+GIT_REV=	def0df01
 GNU_CONFIGURE=	yes
 USES=		cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO_PATH=	${DATADIR_REL}/info
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env aclocal:env automake:env autoheader:env
 CPE_VENDOR=	gnu
 CPE_VERSION=	${EMACS_VER}
@@ -71,7 +72,7 @@ M17N_DESC=		M17N support for text-shaping
 OTF_DESC=		Opentype fonts suport
 FILENOTIFY_DESC=	File notification support
 LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
-LLDB_DESC=		Enable lldb support for GUD (from llvm.org) 
+LLDB_DESC=		Enable lldb support for GUD (from llvm.org)
 
 OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
 OPTIONS_SINGLE_SOUND=		ALSA OSS
@@ -173,9 +174,12 @@ FILENOTIFY_USE=			GNOME=glib20
 # clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment
 # and %esi as frame pointer register
 # http://llvm.org/bugs/show_bug.cgi?id=18171
+# fixed in r263312 (11-CURRENT), and fixed in r263765 (10-STABLE)
 .if ${ARCH} == "i386"
+.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)
 USE_GCC=			any
 .endif
+.endif
 
 DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
 
@@ -236,8 +240,8 @@ post-install:
 	@${RM} -rf ${STAGEDIR}/var/games/emacs
 .if ${PORT_OPTIONS:MSOURCES}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	@${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
+	${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
 .endif
 
 .if !defined(WITHOUT_X11)
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index f2ed97df2b00..f4f11b7c2093 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-25.0.50.20150321.4a50af93.tar.xz) = a0aadbf08666febec682901c3e925393e2bdb8c83ae71437b4bd7920e60c136f
-SIZE (emacs-25.0.50.20150321.4a50af93.tar.xz) = 24789768
+SHA256 (emacs-25.0.50.20150427.def0df01.tar.xz) = 7722b76e7e456c15e5809ef84bcbfc9a895502615dd23a64e0a25bd036979626
+SIZE (emacs-25.0.50.20150427.def0df01.tar.xz) = 24842424
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 99552eb75480..b8f2446b205b 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -3636,6 +3636,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-generic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cursor-sensor.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cursor-sensor.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.el