9 files changed, 109 insertions, 85 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 0d3b90c1e74c..8a06cf58859c 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	keramida
-DISTNAME=	${PORTNAME}-cvs-2008.06.06.08.01.29
+DISTNAME=	${PORTNAME}-cvs-2008.12.07.18.51.01
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -37,10 +37,10 @@ USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 
 EMACS_VER=	23.0.60
-SNAPSHOT=	20080308
+SNAPSHOT=	20081207
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	bootfast
+ALL_TARGET=	bootstrap
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -49,9 +49,11 @@ CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 CONFIGURE_ARGS=		--with-x=no
 .else
 .if !defined(WITHOUT_GTK)
-CONFIGURE_ARGS=		--with-gtk
+CONFIGURE_ARGS=		--with-x-toolkit=gtk
+.else
+CONFIGURE_ARGS=		--with-x-toolkit=athena
 .endif
-CONFIGURE_ARGS=		--enable-font-backend
+CONFIGURE_ARGS+=	--enable-font-backend
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
 			m17n.3:${PORTSDIR}/devel/m17n-lib
 # also libotf, which is pulled in by m17n
@@ -66,11 +68,12 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
-		efaq eintr elisp emacs-mime emacs epa erc eshell eudc \
-		flymake forms gnus idlwave info message mh-e newsticker \
-		nxml-mode org pcl-cvs pgg rcirc reftex remember sc ses sieve smtpmail speedbar \
-		tramp url vip viper widget woman
+INFO=		ada-mode autotype calc ccmode cl dbus dired-x \
+		ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
+		erc eshell eudc flymake forms gnus idlwave info \
+		mairix-el message mh-e newsticker nxml-mode \
+		org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve \
+		smtpmail speedbar tramp url vip viper widget woman
 
 LATEST_LINK=	emacs23
 
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 9540cebb9153..8497d0ecda2b 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-cvs-2008.06.06.08.01.29.tar.bz2) = 19679f0dfd1d74dd17692f671c75d7ca
-SHA256 (emacs-cvs-2008.06.06.08.01.29.tar.bz2) = e6b0635f826addd665ba60cda5e3e16e193b494c7ab55b0ce039636781c7330a
-SIZE (emacs-cvs-2008.06.06.08.01.29.tar.bz2) = 23749163
+MD5 (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = e8f610d73c1108ea226e100770d5bc1a
+SHA256 (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = 6305c0d0c2e502fc2b9df46e66d4ab58dd24bc60fa790e9bff2390c955a5c999
+SIZE (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = 23799850
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index 186e8d47a870..4251ca05271a 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-06-03 06:14:47.000000000 +0300
-+++ Makefile.in	2008-06-06 19:05:25.000000000 +0300
-@@ -447,14 +447,6 @@
+--- Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ Makefile.in	2008-12-09 19:25:19.000000000 +0200
+@@ -444,14 +444,6 @@
  
  install-arch-indep: mkdir info install-etc
  	-set ${COPYDESTS} ; \
@@ -15,7 +15,7 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -555,9 +547,9 @@
+@@ -552,9 +544,9 @@
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
  	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -568,7 +560,7 @@
+@@ -565,7 +557,7 @@
  	  for elt in $(INFO_FILES); do \
  	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
  	    (cd $${thisdir}; \
diff --git a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
index a2b9879daa1f..da2f5b8506b8 100644
--- a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
@@ -1,5 +1,5 @@
---- doc/emacs/Makefile.in.orig	2008-05-16 09:02:53.000000000 +0300
-+++ doc/emacs/Makefile.in	2008-06-06 19:05:25.000000000 +0300
+--- doc/emacs/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/emacs/Makefile.in	2008-12-09 19:25:19.000000000 +0200
 @@ -34,7 +34,7 @@
  
  # The makeinfo program is part of the Texinfo distribution.
@@ -9,7 +9,7 @@
  
  INFO_TARGETS = $(infodir)/emacs
  DVI_TARGETS  = emacs.dvi
-@@ -145,7 +145,7 @@
+@@ -144,7 +144,7 @@
  #	rm -f Makefile
  
  maintainer-clean: distclean
diff --git a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
index d6246b2687ca..a6266c3bef95 100644
--- a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
@@ -1,5 +1,5 @@
---- doc/lispintro/Makefile.in.orig	2008-05-16 08:49:09.000000000 +0300
-+++ doc/lispintro/Makefile.in	2008-06-06 19:05:25.000000000 +0300
+--- doc/lispintro/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/lispintro/Makefile.in	2008-12-09 19:25:20.000000000 +0200
 @@ -33,7 +33,7 @@
  INFO_TARGETS = ${infodir}/eintr
  DVI_TARGETS = emacs-lisp-intro.dvi
diff --git a/editors/emacs-devel/files/patch-doc-lispref-Makefile.in b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
index 8e2727408c7d..6d069939164d 100644
--- a/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
@@ -1,38 +1,11 @@
---- doc/lispref/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
-+++ doc/lispref/Makefile.in	2008-01-02 14:41:21.000000000 +0200
-@@ -33,7 +33,7 @@
+--- doc/lispref/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/lispref/Makefile.in	2008-12-09 19:25:20.000000000 +0200
+@@ -32,7 +32,7 @@
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
  INSTALL_INFO = install-info
 -MAKEINFO = makeinfo --force
 +MAKEINFO = makeinfo --force --no-split
  
- # The name of the manual:
- VERSION=2.9
-@@ -110,7 +110,7 @@
- # This is for use in a separate distro of the Emacs Lisp manual.
- install: elisp
- 	$(srcdir)/mkinstalldirs $(infodir)
--	cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
-+	cp elisp $(infodir)
- 	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
+ # List of all the texinfo files in the manual:
  
- # This is for use in a separate distro of the Emacs Lisp manual.
-@@ -126,7 +126,7 @@
- 
- maintainer-clean: clean
- 	rm -f elisp.dvi elisp.oaux
--	cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
-+	cd $(infodir); rm -f elisp
- 
- dist: $(infodir)/elisp elisp.dvi
- 	-rm -rf temp
-@@ -136,7 +136,7 @@
-  $(srcdir)/Makefile.in $(srcs) \
-  $(miscmanualdir)/texinfo.tex \
-  elisp.dvi elisp.aux elisp.??s \
-- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
-+ $(infodir)/elisp \
-  temp/$(manual)
- 	-(cd temp/$(manual); rm -f mkinstalldirs)
- 	cp $(srcdir)/mkinstalldirs temp/$(manual)
diff --git a/editors/emacs-devel/files/patch-doc-misc-Makefile.in b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
index b03a8a0feb65..74c400c2b024 100644
--- a/editors/emacs-devel/files/patch-doc-misc-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
@@ -1,6 +1,6 @@
---- doc/misc/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
-+++ doc/misc/Makefile.in	2008-01-02 14:41:21.000000000 +0200
-@@ -36,7 +36,7 @@
+--- doc/misc/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/misc/Makefile.in	2008-12-09 19:25:20.000000000 +0200
+@@ -34,7 +34,7 @@
  
  # The makeinfo program is part of the Texinfo distribution.
  # Use --force so that it generates output even if there are errors.
diff --git a/editors/emacs-devel/files/patch-src-alloc.c b/editors/emacs-devel/files/patch-src-alloc.c
index 1738123d3ffb..408581bc67b9 100644
--- a/editors/emacs-devel/files/patch-src-alloc.c
+++ b/editors/emacs-devel/files/patch-src-alloc.c
@@ -1,9 +1,9 @@
---- src/alloc.c.orig	2008-01-02 14:45:48.000000000 +0200
-+++ src/alloc.c	2008-01-02 14:41:21.000000000 +0200
-@@ -4532,8 +4532,12 @@
+--- src/alloc.c.orig	2008-12-09 19:27:59.000000000 +0200
++++ src/alloc.c	2008-12-09 19:25:42.000000000 +0200
+@@ -4488,8 +4488,12 @@
       needed on ia64 too.  See mach_dep.c, where it also says inline
       assembler doesn't work with relevant proprietary compilers.  */
- #ifdef sparc
+ #ifdef __sparc__
 +#ifdef __sparc64__
 +  asm ("flushw");
 +#else
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 28a1def0bd9d..9fd3c0ab0a35 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -300,6 +300,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnntg.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.png
+%%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.xpm
@@ -544,8 +546,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/splash.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/splash.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/splash8.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/close.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/close.xpm
@@ -741,22 +744,18 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbcalstbl.rnc
-%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbdyntbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbhier.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbnotn.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbpool.rnc
-%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbsoextbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbstart.rnc
-%%DATADIR%%/%%EMACS_VER%%/etc/schema/docbk-dyntbl.rnc
-%%DATADIR%%/%%EMACS_VER%%/etc/schema/docbk-soextbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/docbook.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/locate.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/rdfxml.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/relaxng.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/schemas.xml
-%%DATADIR%%/%%EMACS_VER%%/etc/schema/soextbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-applet.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-attribs.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-base.rnc
@@ -794,7 +793,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/ses-example.ses
 %%DATADIR%%/%%EMACS_VER%%/etc/sex.6
 %%DATADIR%%/%%EMACS_VER%%/etc/spook.lines
-%%DATADIR%%/%%EMACS_VER%%/etc/termcap.src
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.bg
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.cn
@@ -873,7 +871,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/greek.elc
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul.el.gz
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul.elc
-%%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul3.el
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja-jis.el.gz
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja-jis.elc
 %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja.el.gz
@@ -1538,7 +1535,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-groups.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-io.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-io.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-maint.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-module.el.gz
@@ -1788,6 +1784,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnheader.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnimap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnimap.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnir.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnkiboze.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnkiboze.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnlistserv.el.gz
@@ -1933,8 +1931,6 @@ 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/codepage.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/codepage.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.elc
@@ -1994,8 +1990,6 @@ 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/isearch-multi.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-multi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
@@ -2126,6 +2120,24 @@ 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/pmail.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailedit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailedit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailhdr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailhdr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailkwd.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailkwd.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmsc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmsc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailout.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailout.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsort.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsort.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsum.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.el.gz
@@ -2162,7 +2174,6 @@ 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/vms-pmail.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.el.gz
@@ -2231,6 +2242,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/minibuffer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/misc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/misc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/misearch.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/misearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-copy.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-copy.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-drag.el.gz
@@ -2281,10 +2294,22 @@ share/applications/emacs.desktop
 %%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/net-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-backend.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-backend.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-plainview.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-plainview.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-reader.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-reader.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-ticker.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-ticker.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/newst-treeview.el.gz
+%%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/ntlm.el.gz
@@ -2335,6 +2360,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/trampver.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/webjump.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/webjump.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/xesam.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/xesam.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/zeroconf.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/zeroconf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/newcomment.el.gz
@@ -2407,6 +2434,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnews.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnews.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnewspost.el.gz
@@ -2423,6 +2452,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.el.gz
@@ -2441,12 +2472,18 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mac-message.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mac-message.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macs.el.gz
@@ -2457,6 +2494,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.el.gz
@@ -2465,8 +2504,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-vm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-vm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.el.gz
@@ -2762,8 +2805,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/replace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/reposition.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/reposition.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/resume.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/resume.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/reveal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/reveal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.el.gz
@@ -2833,14 +2874,17 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/README
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/apollo.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/lk201.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/mac-win.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/mac-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/news.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/ns-win.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/ns-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.el.gz
@@ -2942,6 +2986,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/remember.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/remember.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/rst.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/rst.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/sgml-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/sgml-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/spell.el.gz
@@ -3046,16 +3092,20 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/url/vc-dav.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/url/vc-dav.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/userlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/userlock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-annotate.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-annotate.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-arch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-arch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-bzr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-bzr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-cvs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-cvs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-dav.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-dav.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-dir.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-dir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-dispatcher.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-dispatcher.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-git.el.gz
@@ -3081,8 +3131,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/version.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/vms-patch.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/vmsproc.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt100-led.el.gz