GNU Emacs updates

editors/emacs: - Update to 25.1[1] - Update CANNA patchset[2] - Cleanup CONFLICTS_INSTALL list[1] - Add LLDB option for lldb support (provided by 3rd party) to GUD[1] - Add various other options, and re-order options[1] - Incorporate games stuff in pkg-plist[1] - Remove outdated diffs[1] editors/emacs-nox11: - Update to 25.1[3] - Cleanup CONFLICTS_INSTALL list[3] editors/emacs-devel: - Update to git revision 25dca60d Mk/bsd.emacs.mk: - Update version numbers[4] PR: 212807 [1], 212808 [3], 212809 [4] Submitted by: Joseph Mingrone <jrm@ftfl.ca> [1][3][4] TAKANO Yuji <takachan@running-dog.net> (private email) [2]
author: ashish <ashish@FreeBSD.org> 2016-10-02 13:07:22 +0800
committer: ashish <ashish@FreeBSD.org> 2016-10-02 13:07:22 +0800
commit: 6b2048e8b3131460ba33afa60a62b2ccdf70d8de (patch)
tree: 30a582870dab03b1f4fd4fcfd8b9923f1972b3fe /editors
parent: 702ab00e799042bc58b59f8017e00a30374c4761 (diff)
download: freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.gz
freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.zst
freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.zip
15 files changed, 747 insertions, 536 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index e3a964082811..023d1e8d1da8 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	25.1-rc2
+DISTVERSION=	${EMACS_VER}.${EMACS_REV}
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
-MASTER_SITES=	GNU_ALPHA/emacs/pretest
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -17,18 +16,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_sparc64=	Emacs does not currently build on sparc64
 BROKEN_ia64=	Emacs does not currently build on ia64
 
-CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS=	emacs-[0-9]* emacs-nox11-[0-9]*
 
-EMACS_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${EMACS_VER}
+USE_GITHUB=	yes
+GH_ACCOUNT=	emacs-mirror
+GH_TAGNAME=	25dca60d
 
+EMACS_VER=	25.2.50
+EMACS_REV=	20161001
 GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
+USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig
 INFO_PATH=	${DATADIR_REL}/info
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
 CPE_VENDOR=	gnu
 
-SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
-		${CONFIGURE_TARGET}
+SUB_FILES+=	sources.el
+SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+SUB_LIST+=	EMACS_VER=${EMACS_VER}
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-gameuser=games:games
@@ -238,25 +242,22 @@ LDFLAGS+=-ltinfo
 
 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
+
 ## stage-qa will give a warning, but don't pull in desktop-file-utils
 ## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
 ## dependencies
-.if ! ${PORT_OPTIONS:MX11}
+post-patch-X11-off:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
 		${WRKSRC}/etc/emacs.desktop
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MSOURCES}
+pre-configure:
+	@cd ${WRKSRC} && ./autogen.sh
+
+post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
 		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/sources.el \
+	${INSTALL_DATA} ${WRKDIR}/sources.el \
 		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
-.endif
-	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
-		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
 
 .include <bsd.port.post.mk>
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 83364c9a80b7..fafc5057da89 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471833409
-SHA256 (emacs-25.1-rc2.tar.xz) = 5bd45f03bdff90f9d7add7224917fc828ed89716e952b3db8eb98242b7dfcec1
-SIZE (emacs-25.1-rc2.tar.xz) = 42317560
+TIMESTAMP = 1475279278
+SHA256 (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = e7dcebce7c33ca6124220301665fcb173bca4f9d0e01f9f5ff0d157c00f7abcb
+SIZE (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = 38532769
diff --git a/editors/emacs-devel/files/patch-sources.el b/editors/emacs-devel/files/patch-sources.el
deleted file mode 100644
index ee44f5c0881f..000000000000
--- a/editors/emacs-devel/files/patch-sources.el
+++ /dev/null
@@ -1,7 +0,0 @@
---- sources.el.orig	2016-02-01 06:06:37 UTC
-+++ sources.el
-@@ -0,0 +1,4 @@
-+;;; Path to Emacs C Sources.
-+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
-+  (setq find-function-C-source-directory
-+        "%%DATADIR%%/%%EMACS_VER%%/src"))
diff --git a/editors/emacs-devel/files/sources.el.in b/editors/emacs-devel/files/sources.el.in
new file mode 100644
index 000000000000..3f5929f3aa96
--- /dev/null
+++ b/editors/emacs-devel/files/sources.el.in
@@ -0,0 +1,4 @@
+;;; Path to Emacs C Sources.
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
+  (setq find-function-C-source-directory
+        "%%DATADIR%%/%%EMACS_VER%%/src"))
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 38d32f45594f..37fc35669f23 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -756,105 +756,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00000-0007F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00080-000FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00100-0017F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00180-0024F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00250-002AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/002B0-002FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00300-0036F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00370-003FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00400-004FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00500-0052F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00530-0058F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00590-005FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00600-006FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00700-0074F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00780-007BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00900-0097F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00980-009FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A00-00A7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A80-00AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B00-00B7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B80-00BFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C00-00C7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C80-00CFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D00-00D7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D80-00DFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E00-00E7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E80-00EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00F00-00FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01000-0109F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/010A0-010FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01100-011FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01200-0137F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/013A0-013FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01400-0167F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01680-0169F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/016A0-016FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01700-0171F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01720-0173F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01740-0175F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01760-0177F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01780-017FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01800-018AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01E00-01EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01F00-01FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02000-0206F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02070-0209F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020A0-020CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020D0-020FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02100-0214F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02150-0218F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02190-021FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02200-022FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02300-023FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02400-0243F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02440-0245F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02460-024FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02500-0257F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02580-0259F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/025A0-025FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02600-026FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02700-027BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027C0-027EF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027F0-027FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02800-028FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02900-0297F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02980-029FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02A00-02AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02E80-02EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02F00-02FDF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02FF0-02FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03000-0303F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03040-0309F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/030A0-030FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03100-0312F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03130-0318F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03190-0319F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031A0-031BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031F0-031FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03200-032FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03300-033FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03400-04DBF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A000-0A48F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A490-0A4CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB00-0FB4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB50-0FDFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE00-0FE0F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE20-0FE2F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE30-0FE4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE50-0FE6F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE70-0FEFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FF00-0FFEF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FFF0-0FFFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10300-1032F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10330-1034F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10400-1044F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D000-1D0FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D100-1D1FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D400-1D7FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/E0000-E007F.el
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml
@@ -893,22 +794,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
@@ -1030,6 +915,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/arc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoinsert.el.gz
@@ -1548,6 +1435,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
@@ -1576,6 +1464,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz
@@ -1657,6 +1547,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
@@ -1713,6 +1604,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/regexp-opt.el.gz
@@ -1745,6 +1638,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/trace.el.gz
@@ -1990,18 +1885,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/.dir-locals.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-agent.el.gz
@@ -2036,8 +1923,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-dup.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-gravatar.el.gz
@@ -2068,6 +1953,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-picon.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
@@ -2084,8 +1971,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-start.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-undo.el.gz
@@ -2100,28 +1985,14 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-bodies.el.gz
@@ -2204,32 +2075,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnvirtual.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smime.el.gz
@@ -2242,12 +2089,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.el.gz
@@ -2276,12 +2117,14 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
@@ -2298,6 +2141,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/image-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz
@@ -2358,6 +2205,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ogonek.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.el.gz
@@ -2381,6 +2230,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-uppercase.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
@@ -2620,14 +2471,22 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/emacsbug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailabbrev.el.gz
@@ -2642,12 +2501,21 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/metamail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
@@ -2680,6 +2548,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/unrmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.el.gz
@@ -2798,12 +2668,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/html2text.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/html2text.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.el.gz
@@ -2828,6 +2702,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.el.gz
@@ -2852,6 +2730,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr-color.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-client.el.gz
@@ -2860,6 +2744,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-inspect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.el.gz
@@ -2901,8 +2787,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-mode.el.gz
@@ -2915,8 +2799,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-cmpct.el.gz
@@ -2953,8 +2835,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/abbrevlist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
@@ -2975,16 +2855,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
@@ -3003,6 +2875,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/messcompat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.el.gz
@@ -3033,22 +2906,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz
@@ -3348,6 +3211,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/tetris.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/proced.el.gz
@@ -3536,6 +3401,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
@@ -3544,6 +3410,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/rect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/replace.el.gz
@@ -3556,6 +3424,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.el.gz
@@ -3597,6 +3467,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/subdirs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tabify.el.gz
@@ -3708,6 +3580,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz
@@ -4080,6 +3953,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sound.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.h
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 52a59eaac9b2..46a90f2dd270 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,15 +1,15 @@
 # Created by: phoffman@proper.com
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-nox11
+PKGNAMESUFFIX=		-nox11
 
-CONFLICTS_INSTALL=	emacs[0-9]*
+CONFLICTS_INSTALL=	emacs-[0-9]* emacs-devel-[0-9]*
 
-OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
-		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
-		XAW XAW3D MOTIF
-OPTIONS_DEFAULT?=SOURCES GNUTLS XML
+OPTIONS_EXCLUDE=	CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK    \
+			MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
+			XPM XWIDGETS
+OPTIONS_DEFAULT=	GNUTLS MODULES SOURCES XML
 
-MASTERDIR=	${.CURDIR}/../emacs
+MASTERDIR=		${.CURDIR}/../emacs
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 91117b3d0d8d..39e7ee46e171 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,13 +3,11 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
-PKGNAMESUFFIX?= 24
+1PKGNAMESUFFIX?=	25
 
-PATCH_SITE_SUBDIR+=	ashish
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -18,199 +16,183 @@ COMMENT=	GNU editing macros
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_ia64=	Emacs 24.X does not currently build on ia64
+CONFLICTS_INSTALL?=	emacs-devel-[0-9]* emacs-nox11-[0-9]*
 
-CONFLICTS_INSTALL?=	emacs-nox11-[0-9]*
-CONFLICTS_INSTALL+=	\
-		emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
-		xemacs-devel-mule-[0-9]* \
-		emacs-devel-[0-9]*
-
-EMACS_VER=	24.5
+EMACS_VER=	25.1
 GNU_CONFIGURE=	yes
-USES=		cpe gmake localbase makeinfo ncurses pkgconfig shebangfix tar:xz
-# Building with GCC 4.6+ requires it
+USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
+# Building with GCC 4.6+ requires it; remove after 9.3 EOL
 LDFLAGS+=	${ncurses_ARGS:Mport:C/.+/-ltinfo/}
 INFO_PATH=	${DATADIR_REL}/info
 CPE_VENDOR=	gnu
 
-SUB_FILES=	pkg-install sources.el
+SUB_FILES=	sources.el
 SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
 SUB_LIST+=	EMACS_VER=${EMACS_VER} # sources.el
-SHEBANG_FILES=	lib-src/grep-changelog
 
-CONFIGURE_ARGS=	--localstatedir=/var
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--with-gameuser=games:games
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 
 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-gnutls \
-		emacs-mime emacs 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 vip viper widget wisent woman
-
-OPTIONS_DEFINE=	CANNA X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
-		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY
-
-OPTIONS_RADIO=	X11 SOUND
-
-CANNA_DESC=		Canna support
-ACL_DESC=		ACL support
-GSETTINGS_DESC=		GSettings support
-SCROLLBARS_DESC=	Toolkit scroll-bars
-SOUND_DESC=		Sound support
-SOURCES_DESC=		Install sources
-XAW_DESC=		Athena widgets
-XAW3D_DESC=		Athena3D widgets
-XIM_DESC=		X Input Method Support
-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+)
-
-OPTIONS_RADIO_X11=	GTK2 GTK3 XAW XAW3D MOTIF
-OPTIONS_RADIO_SOUND=	ALSA OSS
-
-OPTIONS_DEFAULT?=	DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOURCES SVG TIFF \
-			SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS OSS
-
-OPTIONS_SUB=		SOURCES
-
-CANNA_CONFIGURE_ON=	--with-canna \
-			--with-canna-includes=${LOCALBASE}/include \
-			--with-canna-libraries=${LOCALBASE}/lib
-CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
-CANNA_PATCHFILES=	emacs24.4canna-20141030.diff.gz
-CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
-
-SOUND_CONFIGURE_OFF=	--with-sound=no
+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=	ACL CANNA DBUS GNUTLS LLDB MODULES SOURCES X11 XML
+
+OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
+OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
+OPTIONS_RADIO_SOUND=		ALSA OSS
+OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
+OPTIONS_GROUP=			GRAPHICS NEEDX11
+OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
+				XWIDGETS
+
+OPTIONS_DEFAULT?=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK2 JPEG KQUEUE    \
+			M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG  \
+			TIFF X11 XFT XIM XML XPM
+
+ACL_DESC=	Access control list support
+CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
+CANNA_DESC=	Japanese input support
+FILENOTIFY_DESC=File notification support
+GFILE_DESC=	File notification via gfile
+GRAPHICS_DESC=	Graphics support (each implies X11)
+GSETTINGS_DESC=	GSettings API for application settings
+KQUEUE_DESC=	File notification via kqueue
+LLDB_DESC=	LLDB support for GUD
+#LTO_DESC=	Enable link-time optimization
+MAGICK_DESC=	ImageMagick image processing support
+M17N_DESC=	M17N for text-shaping                  (implies XFT)
+MODULES_DESC=	Dynamic modules support
+NEEDX11_DESC=	Other X11-dependent (each implies X11)
+OTF_DESC=	Opentype fonts                         (implies XFT)
+SCROLLBARS_DESC=Toolkit scroll-bars
+SOURCES_DESC=	Install sources
+SVG_DESC=	Scalable vector graphics support       (implies PNG)
+X11_DESC=	X window system support
+X11TOOLKIT_DESC=X11 toolkit (each implies X11)
+XAW3D_DESC=	Athena3D widgets
+XAW_DESC=	Athena widgets
+XIM_DESC=	X Input Method
+XWIDGETS_DESC=	GTK widgets in Emacs buffers           (requires GTK3)
+
+OPTIONS_SUB=		YES
+
+ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_IMPLIES=		SOUND
-OSS_CONFIGURE_ON=	--with-sound=oss
-OSS_IMPLIES=		SOUND
-
+CAIRO_USE=		GNOME=cairo
+CAIRO_CONFIGURE_WITH=	cairo
+CAIRO_IMPLIES=		PNG XFT X11
+CANNA_CONFIGURE_WITH=	canna
+CANNA_PATCH_SITES=	http://www.gentei.org/~yuuji/software/emacs25canna/ \
+			http://distfiles.pirateparty.in/ashish/ \
+			LOCAL/ashish
+CANNA_PATCHFILES=	emacs25.1canna-20160919.diff.gz
+CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
-
+GCONF_USE=		GNOME=gconf2
+GCONF_CONFIGURE_WITH=	gconf
+GCONF_IMPLIES=		X11
+GFILE_CONFIGURE_ON=	--with-file-notification=gfile
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=	gif
+GIF_IMPLIES=		X11
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
-
-XML_USE=		GNOME=libxml2
-XML_CONFIGURE_WITH=	xml2
-
-SVG_USE=		GNOME=librsvg2
-SVG_CONFIGURE_WITH=	rsvg
-SVG_IMPLIES=		X11
-
-X11_CONFIGURE_WITH=	x
-X11_USE=		XORG=x11
-X11_USES=		desktop-file-utils
-X11_VARS=		INSTALLS_ICONS=yes
-
-GTK2_USE=		GNOME=gtk20
+GSETTINGS_USE=		GNOME=glib20
+GSETTINGS_CONFIGURE_WITH=gsettings
+GSETTINGS_IMPLIES=	DBUS X11
+GTK2_USE=		GNOME=cairo,gtk20
+GTK2_USES=		gettext-runtime
 GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK2_IMPLIES=		X11
-
-GTK3_USE=		GNOME=gtk30
+GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libfontconfig.so:x11-fonts/fontconfig
+GTK3_USE=		GNOME=cairo,gtk30
+GTK3_USES=		gettext-runtime
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 GTK3_IMPLIES=		X11
-
-XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
-XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
-XAW3D_IMPLIES=		X11
-
-XAW_USE=		XORG=xaw
-XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
-XAW_IMPLIES=		X11
-
-MOTIF_USES=		motif
-MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
-MOTIF_IMPLIES=		X11
-
-SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
-SCROLLBARS_IMPLIES=	X11
-
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_IMPLIES=		X11
-
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	tiff
-TIFF_IMPLIES=		X11
-
-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
-GIF_CONFIGURE_WITH=	gif
-GIF_IMPLIES=		X11
-
-PNG_LIB_DEPENDS+=	libpng.so:graphics/png
-PNG_CONFIGURE_WITH=	png
-PNG_IMPLIES=		X11
-
-XPM_USE=		XORG=xpm
-XPM_CONFIGURE_WITH=	xpm
-XPM_IMPLIES=		X11
-
-XFT_USE=		XORG=xft
-XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
-XFT_CONFIGURE_WITH=	xft
-XFT_IMPLIES=		X11
-
+KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
+LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
+#LTO_CONFIGURE_ON=	--enable-link-time-optimization
 M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=	m17n-flt
-M17N_IMPLIES=		XFT
-
-OTF_LIB_DEPENDS=	libotf.so:print/libotf
-OTF_CONFIGURE_WITH=	libotf
-OTF_IMPLIES=		XFT
-
+M17N_IMPLIES=		XFT X11
 MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 MAGICK_IMPLIES=		X11
-
-GSETTINGS_USE=		gnome=glib20
-GSETTINGS_CONFIGURE_WITH=	gsettings
-GSETTINGS_IMPLIES=	X11 DBUS
-
-GCONF_USE=		gnome=gconf2
-GCONF_CONFIGURE_WITH=	gconf
-GCONF_IMPLIES=		X11
-
+MODULES_CONFIGURE_WITH=	modules
+MOTIF_USES=		motif
+MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
+MOTIF_IMPLIES=		X11
+MOTIF_LIB_DEPENDS=	libXp.so:x11/libXp
+OSS_CONFIGURE_ON=	--with-sound=oss
+OTF_LIB_DEPENDS=	libotf.so:print/libotf
+OTF_CONFIGURE_WITH=	libotf
+OTF_IMPLIES=		X11 XFT
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_CONFIGURE_WITH=	png
+PNG_IMPLIES=		X11
+SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
+SCROLLBARS_IMPLIES=	X11
+SVG_USE=		GNOME=cairo,librsvg2
+SVG_CONFIGURE_WITH=	rsvg
+SVG_IMPLIES=		X11 PNG
+SVG_USES=		gettext-runtime
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=	tiff
+TIFF_IMPLIES=		X11
+X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
+X11_CONFIGURE_ON=	--with-x
+X11_USE=		XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt
+X11_USES=		desktop-file-utils
+X11_VARS=		installs_icons=yes
+X11_VARS_OFF=		without_x11=yes
+XAW_USE=		XORG=xaw
+XAW_CONFIGURE_ON=	--with-x-toolkit=athena --without-xaw3d
+XAW_IMPLIES=		X11
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
+XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
+XAW3D_IMPLIES=		X11
+XFT_USE=		XORG=xft,xrender
+XFT_CONFIGURE_WITH=	xft
+XFT_IMPLIES=		X11
+XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libfreetype.so:print/freetype2
 XIM_CONFIGURE_WITH=	xim
 XIM_IMPLIES=		X11
-
-LTO_CONFIGURE_ON=	--enable-link-time-optimization
-LTO_USE=		GCC=4.6+
-
-ACL_CONFIGURE_OFF=	--disable-acl
-
-FILENOTIFY_CONFIGURE_ON=	--with-file-notification=gfile
-FILENOTIFY_CONFIGURE_OFF=	--without-file-notification
-FILENOTIFY_USE=		GNOME=glib20
-
+XML_USE=		GNOME=libxml2
+XML_CONFIGURE_WITH=	xml2
+XPM_USE=		XORG=xpm
+XPM_CONFIGURE_WITH=	xpm
+XPM_IMPLIES=		X11
+XWIDGETS_USE=		XORG=xcomposite
+XWIDGETS_CONFIGURE_WITH=xwidgets
+XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
+XWIDGETS_IMPLIES=	GTK3
+
+# With a desktop entry stage-qa will give a warning about requiring
+# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
+# but don't pull in those dependencies when X11 is off.
 post-patch-X11-off:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 
-post-install:
-	@${RM} -rf ${STAGEDIR}/var/games/emacs
-	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
-
 post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKDIR}/sources.el \
-		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
-
-.if !defined(WITHOUT_X11)
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
-	@${ECHO_MSG}
-.endif
+	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
 
 .include <bsd.port.mk>
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 3735f166834e..80416be66da0 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,5 @@
-SHA256 (emacs-24.5.tar.xz) = dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e
-SIZE (emacs-24.5.tar.xz) = 39759804
-SHA256 (emacs24.4canna-20141030.diff.gz) = 3c49cbdf9bf822c8d682568b63328c959a79edafa2ac73aa4e5c2d27059fcfa0
-SIZE (emacs24.4canna-20141030.diff.gz) = 31687
+TIMESTAMP = 1474863458
+SHA256 (emacs-25.1.tar.xz) = 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33
+SIZE (emacs-25.1.tar.xz) = 42498944
+SHA256 (emacs25.1canna-20160919.diff.gz) = b0ef90be88e8b947d41805713735a79c6f78e2401b749d5e6d1e3fd1bc7e5f32
+SIZE (emacs25.1canna-20160919.diff.gz) = 31671
diff --git a/editors/emacs/files/extrapatch-lldb-gud.el b/editors/emacs/files/extrapatch-lldb-gud.el
new file mode 100644
index 000000000000..73828b04af58
--- /dev/null
+++ b/editors/emacs/files/extrapatch-lldb-gud.el
@@ -0,0 +1,291 @@
+This diff is retrieved from http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html
+
+And traces its origin back to https://gitorious.org/lldb/lldb/commit/40e4dbf
+
+It's also present on Apple's OS site:
+
+http://www.opensource.apple.com/source/lldb/lldb-76/utils/emacs/
+
+diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
+index 42c5b20..7f2e9c0 100644
+--- lisp/progmodes/gud.el
++++ lisp/progmodes/gud.el
+@@ -35,7 +35,7 @@
+ ;; kluge with the gud-xdb-directories hack producing gud-dbx-directories.
+ ;; Derek L. Davies <ddavies@world.std.com> added support for jdb (Java
+ ;; debugger.)  Jan Nieuwenhuizen added support for the Guile REPL (Guile
+-;; debugger).
++;; debugger). llvm.org added support for lldb.
+ 
+ ;;; Code:
+ 
+@@ -56,7 +56,7 @@
+ 
+ (defgroup gud nil
+   "The \"Grand Unified Debugger\" interface.
+-Supported debuggers include gdb, sdb, dbx, xdb, perldb,
++Supported debuggers include lldb, gdb, sdb, dbx, xdb, perldb,
+ pdb (Python), and jdb."
+   :group 'processes
+   :group 'tools)
+@@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.")
+ 			       (display-graphic-p)
+ 			       (fboundp 'x-show-tip))
+ 		  :visible (memq gud-minor-mode
+-				'(gdbmi guiler dbx sdb xdb pdb))
++				'(lldb gdbmi guiler dbx sdb xdb pdb))
+ 	          :button (:toggle . gud-tooltip-mode))
+     ([refresh]	"Refresh" . gud-refresh)
+     ([run]	menu-item "Run" gud-run
+                   :enable (not gud-running)
+-		  :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
++		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
+     ([go]	menu-item (if (bound-and-true-p gdb-active-process)
+ 			      "Continue" "Run") gud-go
+ 		  :visible (and (eq gud-minor-mode 'gdbmi)
+@@ -164,18 +164,18 @@ Used to gray out relevant toolbar icons.")
+     ([tbreak]	menu-item "Temporary Breakpoint" gud-tbreak
+                   :enable (not gud-running)
+ 		  :visible (memq gud-minor-mode
+-				'(gdbmi gdb sdb xdb)))
++				'(lldb gdbmi gdb sdb xdb)))
+     ([break]	menu-item "Set Breakpoint" gud-break
+                   :enable (not gud-running)
+ 		  :visible (gud-tool-bar-item-visible-no-fringe))
+     ([up]	menu-item "Up Stack" gud-up
+ 		  :enable (not gud-running)
+ 		  :visible (memq gud-minor-mode
+-				 '(gdbmi gdb guiler dbx xdb jdb pdb)))
++				 '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
+     ([down]	menu-item "Down Stack" gud-down
+ 		  :enable (not gud-running)
+ 		  :visible (memq gud-minor-mode
+-				 '(gdbmi gdb guiler dbx xdb jdb pdb)))
++				 '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
+     ([pp]	menu-item "Print S-expression" gud-pp
+                   :enable (and (not gud-running)
+ 				  (bound-and-true-p gdb-active-process))
+@@ -187,7 +187,7 @@ Used to gray out relevant toolbar icons.")
+ 			      "Dump object"
+ 			    "Print Dereference") gud-pstar
+                   :enable (not gud-running)
+-		  :visible (memq gud-minor-mode '(gdbmi gdb jdb)))
++		  :visible (memq gud-minor-mode '(lldb gdbmi gdb jdb)))
+     ([print]	menu-item "Print Expression" gud-print
+                   :enable (not gud-running))
+     ([watch]	menu-item "Watch Expression" gud-watch
+@@ -196,13 +196,13 @@ Used to gray out relevant toolbar icons.")
+     ([finish]	menu-item "Finish Function" gud-finish
+                   :enable (not gud-running)
+ 		  :visible (memq gud-minor-mode
+-				 '(gdbmi gdb guiler xdb jdb pdb)))
++				 '(lldb gdbmi gdb guiler xdb jdb pdb)))
+     ([stepi]	menu-item "Step Instruction" gud-stepi
+                   :enable (not gud-running)
+-		  :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
++		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
+     ([nexti]	menu-item "Next Instruction" gud-nexti
+                   :enable (not gud-running)
+-		  :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
++		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
+     ([step]	menu-item "Step Line" gud-step
+                   :enable (not gud-running))
+     ([next]	menu-item "Next Line" gud-next
+@@ -237,7 +237,7 @@ Used to gray out relevant toolbar icons.")
+ 	:visible (not (eq gud-minor-mode 'gdbmi)))
+        ([menu-bar run] menu-item
+ 	,(propertize "run" 'face 'font-lock-doc-face) gud-run
+-	:visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
++	:visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
+        ([menu-bar go] menu-item
+ 	,(propertize " go " 'face 'font-lock-doc-face) gud-go
+ 	:visible (and (eq gud-minor-mode 'gdbmi)
+@@ -356,6 +356,7 @@ are interpreted specially if present.  These are:
+   %l -- Number of current source line.
+   %e -- Text of the C lvalue or function-call expression surrounding point.
+   %a -- Text of the hexadecimal address surrounding point.
++  %b -- Text of the most recently created breakpoint id.
+   %p -- Prefix argument to the command (if any) as a number.
+   %c -- Fully qualified class name derived from the expression
+         surrounding point (jdb only).
+@@ -964,6 +965,131 @@ SKIP is the number of chars to skip on each line, it defaults to 0."
+ 
+ 
+ ;; ======================================================================
++;; lldb functions
++
++;; History of argument lists passed to lldb.
++(defvar gud-lldb-history nil)
++
++;; Keeps track of breakpoint created.  In the following case, the id is "1".
++;; It is used to implement temporary breakpoint.
++;; (lldb) b main.c:39
++;; breakpoint set --file 'main.c' --line 39
++;; Breakpoint created: 1: file ='main.c', line = 39, locations = 1
++(defvar gud-breakpoint-id nil)
++
++(defun lldb-extract-breakpoint-id (string)
++  ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern.
++  (if (string-match "Breakpoint created: \\([^:\n]*\\):" string)
++      (progn
++        (setq gud-breakpoint-id (match-string 1 string))
++        (message "breakpoint id: %s" gud-breakpoint-id)))
++)
++
++(defun gud-lldb-marker-filter (string)
++  (setq gud-marker-acc
++	(if gud-marker-acc (concat gud-marker-acc string) string))
++  (lldb-extract-breakpoint-id gud-marker-acc)
++  (let (start)
++    ;; Process all complete markers in this chunk
++    (while (or
++            ;; (lldb) r
++            ;; Process 15408 launched: '/Volumes/data/lldb/svn/trunk/test/conditional_break/a.out' (x86_64)
++            ;; (lldb) Process 15408 stopped
++            ;; * thread #1: tid = 0x2e03, 0x0000000100000de8 a.out`c + 7 at main.c:39, stop reason = breakpoint 1.1, queue = com.apple.main-thread
++            (string-match " at \\([^:\n]*\\):\\([0-9]*\\), stop reason = .*\n"
++                          gud-marker-acc start)
++            ;; (lldb) frame select -r 1
++            ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44
++            (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
++                           gud-marker-acc start))
++      (setq gud-last-frame
++            (cons (match-string 1 gud-marker-acc)
++                  (string-to-number (match-string 2 gud-marker-acc)))
++            start (match-end 0)))
++
++    ;; Search for the last incomplete line in this chunk
++    (while (string-match "\n" gud-marker-acc start)
++      (setq start (match-end 0)))
++
++    ;; If we have an incomplete line, store it in gud-marker-acc.
++    (setq gud-marker-acc (substring gud-marker-acc (or start 0))))
++  string)
++
++;; Keeps track of whether the Python lldb_oneshot_break function definition has
++;; been exec'ed.
++(defvar lldb-oneshot-break-defined nil)
++
++;;;###autoload
++(defun lldb (command-line)
++  "Run lldb on program FILE in buffer *gud-FILE*.
++The directory containing FILE becomes the initial working directory
++and source-file directory for your debugger."
++  (interactive (list (gud-query-cmdline 'lldb)))
++
++  (gud-common-init command-line nil 'gud-lldb-marker-filter)
++  (set (make-local-variable 'gud-minor-mode) 'lldb)
++  (setq lldb-oneshot-break-defined nil)
++
++  (gud-def gud-listb  "breakpoint list"
++                      "l"    "List all breakpoints.")
++  (gud-def gud-bt     "thread backtrace"
++                      "b"    "Show stack for the current thread.")
++  (gud-def gud-bt-all "thread backtrace all"
++                      "B"    "Show stacks for all the threads.")
++
++  (gud-def gud-break  "breakpoint set -f %f -l %l"
++                      "\C-b" "Set breakpoint at current line.")
++  (gud-def gud-tbreak
++	   (progn (gud-call "breakpoint set -f %f -l %l")
++                  (sit-for 1)
++                  (if (not lldb-oneshot-break-defined)
++                      (progn
++                        ;; The "\\n"'s are required to escape the newline chars
++                        ;; passed to the lldb process.
++                        (gud-call (concat "script exec \"def lldb_oneshot_break(frame, bp_loc):\\n"
++                                                        "    target=frame.GetThread().GetProcess().GetTarget()\\n"
++                                                        "    bp=bp_loc.GetBreakpoint()\\n"
++                                                        "    print 'Deleting oneshot breakpoint:', bp\\n"
++                                                        "    target.BreakpointDelete(bp.GetID())\""))
++                        (sit-for 1)
++                        ;; Set the flag since Python knows about the function def now.
++                        (setq lldb-oneshot-break-defined t)))
++                  (gud-call "breakpoint command add -p %b -o 'lldb_oneshot_break(frame, bp_loc)'"))
++	              "\C-t" "Set temporary breakpoint at current line.")
++  (gud-def gud-remove "breakpoint clear -f %f -l %l"
++                      "\C-d" "Remove breakpoint at current line")
++  (gud-def gud-step   "thread step-in"
++                      "\C-s" "Step one source line with display.")
++  (gud-def gud-stepi  "thread step-inst"
++                      "\C-i" "Step one instruction with display.")
++  (gud-def gud-next   "thread step-over"
++                      "\C-n" "Step one line (skip functions).")
++  (gud-def gud-nexti  "thread step-inst-over"
++                      nil    "Step one instruction (skip functions).")
++  (gud-def gud-cont   "process continue"
++                      "\C-r" "Continue with display.")
++  (gud-def gud-finish "thread step-out"
++                      "\C-f" "Finish executing current function.")
++  (gud-def gud-up     "frame select -r %p"
++                      "<"    "Up 1 stack frame.")
++  (gud-def gud-down   "frame select -r -%p"
++                      ">"    "Down 1 stack frame.")
++  (gud-def gud-print  "expression -- %e"
++                      "\C-p" "Evaluate C expression at point.")
++  (gud-def gud-pstar  "expression -- *%e"
++                      nil    "Evaluate C dereferenced pointer expression at point.")
++  (gud-def gud-run    "run"
++                      nil    "Run the program.")
++  (gud-def gud-stop-subjob    "process kill"
++                      nil    "Stop the program.")
++
++  (setq comint-prompt-regexp  "\\(^\\|\n\\)\\*")
++  (setq paragraph-start comint-prompt-regexp)
++  (run-hooks 'lldb-mode-hook)
++  )
++
++
++;; ======================================================================
+ ;; sdb functions
+ 
+ ;; History of argument lists passed to sdb.
+@@ -2499,9 +2625,10 @@ gud, see `gud-mode'."
+   "Major mode for interacting with an inferior debugger process.
+ 
+    You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx,
+-M-x perldb, M-x xdb, or M-x jdb.  Each entry point finishes by executing a
+-hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
+-`perldb-mode-hook', `xdb-mode-hook', or `jdb-mode-hook' respectively.
++M-x perldb, M-x xdb, M-x jdb, or M-x lldb.  Each entry point finishes by
++executing a hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
++`perldb-mode-hook', `xdb-mode-hook', `jdb-mode-hook', or `lldb-mode-hook'
++respectively.
+ 
+ After startup, the following commands are available in both the GUD
+ interaction buffer and any source buffer GUD visits due to a breakpoint stop
+@@ -2531,7 +2658,7 @@ Under gdb, sdb and xdb, \\[gud-tbreak] behaves exactly like \\[gud-break],
+ except that the breakpoint is temporary; that is, it is removed when
+ execution stops on it.
+ 
+-Under gdb, dbx, and xdb, \\[gud-up] pops up through an enclosing stack
++Under gdb, dbx, xdb, and lldb, \\[gud-up] pops up through an enclosing stack
+ frame.  \\[gud-down] drops back down through one.
+ 
+ If you are using gdb or xdb, \\[gud-finish] runs execution to the return from
+@@ -2858,7 +2985,7 @@ Obeying it means displaying in another window the specified file and line."
+ 	result)
+     (while (and str
+ 		(let ((case-fold-search nil))
+-		  (string-match "\\([^%]*\\)%\\([adefFlpc]\\)" str)))
++		  (string-match "\\([^%]*\\)%\\([abdefFlpc]\\)" str)))
+       (let ((key (string-to-char (match-string 2 str)))
+ 	    subst)
+ 	(cond
+@@ -2886,6 +3013,8 @@ Obeying it means displaying in another window the specified file and line."
+ 	  (setq subst (gud-find-expr)))
+ 	 ((eq key ?a)
+ 	  (setq subst (gud-read-address)))
++	 ((eq key ?b)
++	  (setq subst gud-breakpoint-id))
+ 	 ((eq key ?c)
+ 	  (setq subst
+                 (gud-find-class
+@@ -3520,6 +3649,7 @@ With arg, dereference expr if ARG is positive, otherwise do not dereference."
+ (defun gud-tooltip-print-command (expr)
+   "Return a suitable command to print the expression EXPR."
+   (pcase gud-minor-mode
++    (`lldb (concat "expression -o -- \"" expr "\""))
+     (`gdbmi (concat "-data-evaluate-expression \"" expr "\""))
+     (`guiler expr)
+     (`dbx (concat "print " expr))
diff --git a/editors/emacs/files/patch-src_unexaix.c b/editors/emacs/files/patch-src_unexaix.c
deleted file mode 100644
index 4c13317e8e43..000000000000
--- a/editors/emacs/files/patch-src_unexaix.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unexaix.c.orig	2015-08-22 16:04:45 UTC
-+++ src/unexaix.c
-@@ -478,7 +478,7 @@ mark_x (const char *name)
-   int um;
-   int new = 0;  /* for PERROR */
- 
--  um = umask (777);
-+  um = umask (0777);
-   umask (um);
-   if (stat (name, &sbuf) == -1)
-     {
diff --git a/editors/emacs/files/patch-src_unexcoff.c b/editors/emacs/files/patch-src_unexcoff.c
deleted file mode 100644
index 777f6696e4e3..000000000000
--- a/editors/emacs/files/patch-src_unexcoff.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unexcoff.c.orig	2015-08-22 16:05:00 UTC
-+++ src/unexcoff.c
-@@ -451,7 +451,7 @@ mark_x (const char *name)
-   int um;
-   int new = 0;  /* for PERROR */
- 
--  um = umask (777);
-+  um = umask (0777);
-   umask (um);
-   if (stat (name, &sbuf) == -1)
-     {
diff --git a/editors/emacs/files/patch-src_unexelf.c b/editors/emacs/files/patch-src_unexelf.c
deleted file mode 100644
index 4aa3869e4e38..000000000000
--- a/editors/emacs/files/patch-src_unexelf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unexelf.c.orig	2015-08-22 16:05:06 UTC
-+++ src/unexelf.c
-@@ -1323,7 +1323,7 @@ temacs:
-   if (stat (new_name, &stat_buf) != 0)
-     fatal ("Can't stat (%s): %s", new_name, strerror (errno));
- 
--  mask = umask (777);
-+  mask = umask (0777);
-   umask (mask);
-   stat_buf.st_mode |= 0111 & ~mask;
-   if (chmod (new_name, stat_buf.st_mode) != 0)
diff --git a/editors/emacs/files/pkg-install.in b/editors/emacs/files/pkg-install.in
deleted file mode 100644
index 7c3bd729433c..000000000000
--- a/editors/emacs/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-GAMESROOT=/var/games/emacs
-ARCHLIBDIR=%%ARCHLIBDIR%%
-
-if [ "$2" = "POST-INSTALL" ]; then
-    umask 022
-    mkdir -p $GAMESROOT
-    touch $GAMESROOT/snake-scores
-    touch $GAMESROOT/tetris-scores
-    chown games $ARCHLIBDIR/update-game-score
-    chmod u+s $ARCHLIBDIR/update-game-score
-    chown games $GAMESROOT
-    chmod 775 $GAMESROOT
-fi
-
-exit 0
diff --git a/editors/emacs/pkg-deinstall b/editors/emacs/pkg-deinstall
deleted file mode 100644
index 1de426349244..000000000000
--- a/editors/emacs/pkg-deinstall
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-GAMESROOT=/var/games/emacs
-
-if [ "$2" = "DEINSTALL" ]; then
-    for s in snake tetris; do
-	if [ ! -s $GAMESROOT/$s-scores ]; then
-	    rm -f $GAMESROOT/$s-scores
-	fi
-    done
-    rmdir $GAMESROOT 2>/dev/null
-fi
-
-exit 0
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index c5ff62411e0d..44824f8bd242 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -4,23 +4,21 @@ bin/emacs
 bin/emacs-%%EMACS_VER%%
 bin/emacsclient
 bin/etags
-bin/grep-changelog
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
-libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
+@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
 man/man1/ctags.1.gz
 man/man1/ebrowse.1.gz
 man/man1/emacs.1.gz
 man/man1/emacsclient.1.gz
 man/man1/etags.1.gz
-man/man1/grep-changelog.1.gz
+share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/CALC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/CENSORSHIP
-%%DATADIR%%/%%EMACS_VER%%/etc/CONTRIBUTE
 %%DATADIR%%/%%EMACS_VER%%/etc/COPYING
 %%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
 %%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR
@@ -33,6 +31,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/GNU
 %%DATADIR%%/%%EMACS_VER%%/etc/GNUS-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/HELLO
+%%DATADIR%%/%%EMACS_VER%%/etc/HISTORY
 %%DATADIR%%/%%EMACS_VER%%/etc/JOKES
 %%DATADIR%%/%%EMACS_VER%%/etc/LINUX-GNU
 %%DATADIR%%/%%EMACS_VER%%/etc/MACHINES
@@ -46,6 +45,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.21
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.23
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.24
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
@@ -219,15 +219,20 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/checked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/connect.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right-pushed.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right-pushed.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.xpm
@@ -235,39 +240,68 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/data-save.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/delete.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/delete.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/describe.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/describe.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/diropen.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/diropen.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/disconnect.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/disconnect.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/exit.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/exit.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bits.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bits.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bitsbang.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bitsbang.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box-minus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box-minus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box-plus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box-plus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/checkmark.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/checkmark.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir-minus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir-minus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir-plus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir-plus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/dir.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc-minus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc-minus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc-plus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc-plus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/doc.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/info.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/info.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/key.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/key.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/label.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/label.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/lock.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/lock.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/mail.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/mail.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page-minus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page-minus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page-plus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page-plus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/page.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-gt.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-gt.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-minus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-minus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-plus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-plus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-type.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-type.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-v.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-v.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm
@@ -297,11 +331,13 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.xbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/important.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/important.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/kill-group.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/kill-group.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-send.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.xpm
@@ -311,6 +347,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/prev-ur.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/preview.xbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/preview.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/receipt.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/receipt.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reply-wo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reply-wo.xpm
@@ -324,7 +361,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/save-art.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/subscribe.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/subscribe.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/toggle-subscription.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/toggle-subscription.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unimportant.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unimportant.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unsubscribe.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unsubscribe.xpm
@@ -333,6 +372,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/all.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/all.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.xpm
@@ -354,15 +394,23 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/print.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rcont.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rcont.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstart.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstart.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstop.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstop.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rfinish.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rfinish.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnext.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnext.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnexti.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnexti.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstep.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstep.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstepi.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstepi.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.xpm
@@ -372,6 +420,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stepi.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/thread.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/thread.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.xpm
@@ -429,16 +478,23 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/128x128/apps/emacs.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/128x128/apps/emacs23.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/16x16/apps/emacs.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/16x16/apps/emacs22.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/16x16/apps/emacs23.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/24x24/apps/emacs.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/24x24/apps/emacs22.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/24x24/apps/emacs23.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/32x32/apps/emacs.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/32x32/apps/emacs22.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/32x32/apps/emacs23.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs22.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs23.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/apps/emacs.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/apps/emacs23.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/index.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/index.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/info.pbm
@@ -449,8 +505,11 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/letter.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/letter.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/back-arrow.xpm
@@ -480,16 +539,21 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/copy.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/copy.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/flag-for-followup.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/flag-for-followup.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/forward.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/forward.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/inbox.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/inbox.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/move.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/move.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/not-spam.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/not-spam.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/outbox.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/outbox.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/preview.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/preview.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/repack.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/repack.xpm
@@ -501,20 +565,30 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/reply-to.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/reply.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/reply.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/save-draft.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/save-draft.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/save.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/add.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/add.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/ffwd.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/ffwd.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/next.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/next.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/pause.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/pause.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/play.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/play.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/prev.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/prev.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/rewind.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/rewind.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/stop.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/stop.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.xpm
@@ -528,6 +602,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/next-item.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/prev-feed.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/prev-item.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/rss-feed.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/rss-feed.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/newsticker/update.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.xpm
@@ -543,6 +619,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/prev-node.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/print.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/print.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/redo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/redo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.xpm
@@ -556,16 +633,22 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/search-replace.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/search.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/search.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/separator.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/blink.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/blink.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/braindamaged.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/braindamaged.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/cry.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/cry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/dead.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/dead.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/evil.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/evil.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/forced.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/forced.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/frown.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/frown.xpm
@@ -583,7 +666,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/sad.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/smile.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/wry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grin.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grin.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/indifferent.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/indifferent.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/blink.xpm
@@ -605,10 +690,15 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/smile.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/wry.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/wry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-ascending.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-ascending.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-column-ascending.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-column-ascending.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-criteria.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-criteria.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-descending.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-descending.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-row-ascending.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-row-ascending.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.xpm
@@ -654,6 +744,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/no-handle.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/unchecked.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/unchecked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.xpm
@@ -661,6 +752,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-node.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-node.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.xpm
@@ -772,56 +864,51 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/package-keyring.gpg
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/publicsuffix.txt
+%%DATADIR%%/%%EMACS_VER%%/etc/publicsuffix.txt.gz
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/Makefile
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/README
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex.in
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.eps
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pdflayout.sty
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
@@ -1135,10 +1222,14 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/autoconf-edit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/base.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/base.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/config.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/config.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/custom.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/custom.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/detect.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/detect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/emacs.el.gz
@@ -1418,6 +1509,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/template.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/char-fold.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/char-fold.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cmuscheme.el.gz
@@ -1469,6 +1562,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/dom.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/dom.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-fns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-vars.el.gz
@@ -1495,8 +1590,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/elide-head.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/advice.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/advice.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/authors.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/authors.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/autoload.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/autoload.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/avl-tree.el.gz
@@ -1523,6 +1616,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/checkdoc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-extra.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-extra.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-generic.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-generic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-indent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-indent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-lib.el.gz
@@ -1530,6 +1625,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-macs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl.el.gz
@@ -1538,6 +1635,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/crm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/crm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cursor-sensor.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cursor-sensor.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/debug.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/debug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/derived.el.gz
@@ -1552,6 +1651,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.el.gz
@@ -1580,14 +1681,18 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/find-func.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/float-sup.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/float-sup.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/generator.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/generator.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/generic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/generic.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gulp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gulp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gv.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gv.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/let-alist.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/let-alist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mode.el.gz
@@ -1598,6 +1703,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.el.gz
@@ -1618,6 +1725,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ring.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rx.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rx.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/smie.el.gz
@@ -1634,6 +1743,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tcover-unsafep.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.el.gz
@@ -1909,6 +2020,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cache.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cite.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cite.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cloud.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cloud.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-delay.el.gz
@@ -1963,8 +2076,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-setup.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-setup.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sieve.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-spec.el.gz
@@ -2109,8 +2220,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2104.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2104.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.el.gz
@@ -2209,8 +2318,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/charprop.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/charscript.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/charscript.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/isearch-x.el.gz
@@ -2272,10 +2385,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.el.gz
-%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.elc
+%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.el.gz
+%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/jit-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/jka-cmpr-hook.el.gz
@@ -2450,6 +2563,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/lrt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/programmer-dvorak.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/programmer-dvorak.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/py-punct.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/py-punct.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/pypunct-b5.el.gz
@@ -2468,6 +2583,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/slovak.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/symbol-ksc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/symbol-ksc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tamil-dvorak.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tamil-dvorak.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/thai.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/thai.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tibetan.el.gz
@@ -2659,8 +2776,6 @@ share/applications/emacs.desktop
 %%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
@@ -2671,12 +2786,12 @@ share/applications/emacs.desktop
 %%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
@@ -2711,12 +2826,18 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-treeview.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/newsticker.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/newsticker.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/rfc2104.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/rfc2104.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rlogin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rlogin.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-cram.el.gz
@@ -2725,6 +2846,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-digest.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-rfc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-rfc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/secrets.el.gz
@@ -2828,13 +2951,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xmltok.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xsd-regexp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xsd-regexp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obarray.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obarray.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/abbrevlist.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/abbrevlist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz
@@ -2847,8 +2973,12 @@ share/applications/emacs.desktop
 %%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
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.el.gz
@@ -2857,7 +2987,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ledit.el.gz
@@ -2884,7 +3017,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/patcomp.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/patcomp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/patcomp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pc-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pc-select.el.gz
@@ -2927,8 +3061,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
@@ -3198,8 +3332,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/handwrite.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/hanoi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/hanoi.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/play/landmark.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/play/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/life.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/life.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/morse.el.gz
@@ -3244,8 +3376,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/bat-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/bug-reference.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/bug-reference.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cap-words.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cap-words.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-align.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-align.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-awk.el.gz
@@ -3304,6 +3434,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ebnf2ps.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ebrowse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ebrowse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elisp-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elisp-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.el.gz
@@ -3366,6 +3498,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/perl-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prog-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prog-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/project.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/project.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prolog.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prolog.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ps-mode.el.gz
@@ -3394,6 +3528,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vhdl-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/which-func.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/which-func.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xref.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xref.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xscheme.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xscheme.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-bdf.el.gz
@@ -3480,8 +3616,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/README
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/apollo.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/apollo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.el.gz
@@ -3514,26 +3648,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tvi970.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt100.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt100.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt102.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt102.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt125.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt125.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt200.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt200.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt201.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt201.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt220.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt220.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt240.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt240.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt300.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt300.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt320.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt320.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt400.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt400.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt420.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/vt420.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32console.el.gz
@@ -3714,6 +3830,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-proxy.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-queue.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-queue.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-tramp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-tramp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-vars.el.gz
@@ -3774,8 +3892,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/smerge-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-annotate.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-annotate.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-arch.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-arch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-bzr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-bzr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-cvs.el.gz
@@ -3786,6 +3902,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dispatcher.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dispatcher.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-filewise.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-filewise.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-git.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-git.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-hg.el.gz
@@ -3798,6 +3916,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-rcs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-sccs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-sccs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-src.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-src.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-svn.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-svn.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc.el.gz
@@ -3812,8 +3932,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt100-led.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt100-led.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/w32-common-fns.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/w32-common-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-fns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-vars.el.gz
@@ -3842,8 +3960,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h
@@ -3855,7 +3975,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
-%%SOURCES%%%%CANNA%%%%DATADIR%%/%%EMACS_VER%%/src/canna.c
+%%CANNA%%%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/canna.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casefiddle.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/casetab.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/category.c
@@ -3890,8 +4010,12 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/doprnt.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/dosfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/dosfns.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/dynlib.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/dynlib.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/editfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacs-icon.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacs-module.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacs-module.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacs.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacsgtkfixed.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/emacsgtkfixed.h
@@ -3909,6 +4033,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/frame.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/frame.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/fringe.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftcrfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftfont.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftxfont.c
@@ -3931,6 +4056,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
@@ -3990,6 +4116,8 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
@@ -4042,4 +4170,7 @@ share/icons/hicolor/32x32/apps/emacs.png
 share/icons/hicolor/48x48/apps/emacs.png
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
-@dir %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-parallel
+share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
+@(games,games,0664) /var/games/emacs/snake-scores
+@(games,games,0664) /var/games/emacs/tetris-scores
+@dir(games,games,0755) /var/games/emacs
author	ashish <ashish@FreeBSD.org>	2016-10-02 13:07:22 +0800
committer	ashish <ashish@FreeBSD.org>	2016-10-02 13:07:22 +0800
commit	6b2048e8b3131460ba33afa60a62b2ccdf70d8de (patch)
tree	30a582870dab03b1f4fd4fcfd8b9923f1972b3fe /editors
parent	702ab00e799042bc58b59f8017e00a30374c4761 (diff)
download	freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.gz freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.zst freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.zip