Index: Makefile
===================================================================
--- Makefile	(revision 404615)
+++ Makefile	(working copy)
@@ -14,21 +14,21 @@
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_9=	does not build
+BROKEN_FreeBSD_9=does not build
 BROKEN_sparc64=	fails to compile at bootstrap phase
-BROKEN_ia64=		Emacs 24.X does not currently build on ia64
+BROKEN_ia64=	Emacs 24.X does not currently build on ia64
 
-CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
-		emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
-		emacs-nox11-[0-9]*
+CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]*              \
+		emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]*           \
+		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
+		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	af40b76
+GH_TAGNAME=	ff5f37e
 
 EMACS_VER=	25.0.50
-EMACS_REV=	20151126
+EMACS_REV=	20151227
 GNU_CONFIGURE=	yes
 USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -37,7 +37,8 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
 CPE_VENDOR=	gnu
 
-SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
+		${CONFIGURE_TARGET}
 
 CONFIGURE_ARGS=	--localstatedir=/var --with-gameuser=games:games
 
@@ -45,21 +46,24 @@
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x      \
-		ebrowse ede ediff edt efaq eieio eintr elisp emacs             \
-		emacs-gnutls emacs-mime epa erc ert eshell eudc eww flymake    \
-		forms gnus htmlfontify idlwave ido info mairix-el message mh-e \
-		newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex  \
-		remember sasl sc semantic ses sieve smtpmail speedbar srecode  \
-		todo-mode tramp url vhdl-mode vip viper widget wisent woman
+INFO=		ada-mode auth autotype bovine calc ccmode cl dbus     \
+		dired-x ebrowse ede ediff edt efaq eieio eintr elisp  \
+		emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \
+		eww flymake forms gnus htmlfontify idlwave ido info   \
+		mairix-el message mh-e newsticker nxml-mode           \
+		octave-mode org pcl-cvs pgg rcirc reftex remember     \
+		sasl sc semantic ses sieve smtpmail speedbar srecode  \
+		todo-mode tramp url vhdl-mode vip viper widget wisent \
+		woman
 
-OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
-		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO
+OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
+		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
+		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO
 
 OPTIONS_SINGLE=	X11 SOUND
 
 ACL_DESC=	ACL support
-GSETTINGS_DESC=	GSettings support
+GSETTINGS_DESC= GSettings support
 SCROLLBARS_DESC=Toolkit scroll-bars
 SOUND_DESC=	Sound support
 SOURCES_DESC=	Install sources
@@ -75,11 +79,11 @@
 OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
 OPTIONS_SINGLE_SOUND=	ALSA OSS
 
-OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 JPEG M17N \
-		MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES SVG TIFF X11 XFT XIM \
-		XML XPM
+OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2   \
+		JPEG M17N MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES \
+		SVG TIFF X11 XFT XIM XML XPM
 
-OPTIONS_SUB=		YES
+OPTIONS_SUB=	YES
 
 LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
 
@@ -105,7 +109,7 @@
 X11_USES=		desktop-file-utils
 
 GTK2_USE=		GNOME=gtk20
-GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
+GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
 
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
@@ -119,9 +123,9 @@
 MOTIF_USES=		motif
 MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
 
-SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
+SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
 
-SYNC_INPUT_CONFIGURE_WITH=	sync-input
+SYNC_INPUT_CONFIGURE_WITH=sync-input
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
@@ -148,11 +152,11 @@
 OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
 OTF_CONFIGURE_WITH=	libotf
 
-MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 
 GSETTINGS_USE=		gnome=glib20
-GSETTINGS_CONFIGURE_WITH=	gsettings
+GSETTINGS_CONFIGURE_WITH=gsettings
 
 GCONF_USE=		gnome=gconf2
 GCONF_CONFIGURE_WITH=	gconf
@@ -165,7 +169,7 @@
 ACL_CONFIGURE_OFF=	--disable-acl
 
 FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
-FILENOTIFY_CONFIGURE_OFF=	--without-file-notification
+FILENOTIFY_CONFIGURE_OFF=--without-file-notification
 FILENOTIFY_USE=		GNOME=glib20
 
 CAIRO_USE=		GNOME=cairo
@@ -173,30 +177,29 @@
 
 .include <bsd.port.options.mk>
 
-# 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)
+# 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
+.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}
-
 .if ${PORT_OPTIONS:MX11}
 INSTALLS_ICONS=	yes
 .if !${PORT_OPTIONS:MXFT}
 .if ${PORT_OPTIONS:MM17N}
-IGNORE=		m17n support for text-shaping requires Xft. Please run 'make config'
+IGNORE=		m17n requires Xft. Please run 'make config'
 .elif ${PORT_OPTIONS:MOTF}
-IGNORE=		opentype fonts support requires Xft. Please run 'make config'
+IGNORE=		Opentype fonts require Xft. Please run 'make config'
 .endif
 .endif
 .else
-.for OPT in 	GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF PNG \
-		SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
+.for OPT in 	GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF  \
+		PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
 .if ${PORT_OPTIONS:M${OPT}}
 IGNORE=		option ${OPT} requires X11 option
 .endif
@@ -205,7 +208,7 @@
 
 .if !${PORT_OPTIONS:MDBUS}
 .if ${PORT_OPTIONS:MGSETTINGS}
-IGNORE=		support for GSettings requires DBUS. Please run 'make config'
+IGNORE=		GSettings requires DBUS. Please run 'make config'
 .endif
 .endif
 
@@ -218,16 +221,13 @@
 
 post-patch:
 	@${RM} -f ${WRKSRC}/info/*
-	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
+	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e      \
+	"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
 .if empty(PORT_OPTIONS:MX11)
-	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
+	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/'        \
+	${WRKSRC}/etc/emacs.desktop
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e \
-	"s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
-	${WRKSRC}/src/Makefile
-
 pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh
 
@@ -234,15 +234,18 @@
 post-install:
 .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
-	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
+	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name      \
+	'*.gz' -exec ${GUNZIP_CMD} '{}' \;
 
 .if !defined(WITHOUT_X11)
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
+	@${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
 	@${ECHO_MSG}
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 404615)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 432b7359f5c798c4294d17661071e20dc4d8b6e7058105ab20a431619712ae77
-SIZE (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 37709547
+SHA256 (emacs-mirror-emacs-25.0.50.20151227-ff5f37e_GH0.tar.xz) = 0462b156c200c3f25353bb21e1d778a8788e0383df6ae6acf717118dffd48665
+SIZE (emacs-mirror-emacs-25.0.50.20151227-ff5f37e_GH0.tar.xz) = 37739117
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 404615)
+++ pkg-plist	(working copy)
@@ -2754,8 +2754,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
@@ -2766,12 +2764,12 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz
@@ -2953,6 +2951,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz