10 files changed, 162 insertions, 421 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index c135f9d6c734..9dc44db7a34f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -8,12 +8,11 @@
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
 CATEGORIES=	editors ipv6
-MASTER_SITES=	http://dl.droso.net/FreeBSD/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	erwin/kvs
-DISTNAME=	${PORTNAME}-cvs-snapshot-2006-02-28
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= keramida
+DISTNAME=	${PORTNAME}-cvs-snapshot-2006.05.02.05.51.52
 
-MAINTAINER=	kvs@pil.dk
+MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
 
 .if !defined(WITHOUT_X11)
@@ -31,7 +30,7 @@ CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
 EMACS_VER=	22.0.50
-SNAPSHOT=	20060228
+SNAPSHOT=	20060502
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf:259
 .if !defined(WITHOUT_X11)
@@ -45,7 +44,7 @@ USE_XPM=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
 .else
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 895b583e1ab8..76018d5fc08d 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-cvs-snapshot-2006-02-28.tar.bz2) = 122c02c47ce1768cfb130c8b0c372d62
-SHA256 (emacs-cvs-snapshot-2006-02-28.tar.bz2) = 9043e7175e1b9561cff860139696b9bda071eef4a8ebcc1b01f07379f3f92180
-SIZE (emacs-cvs-snapshot-2006-02-28.tar.bz2) = 19511047
+MD5 (emacs-cvs-snapshot-2006.05.02.05.51.52.tar.bz2) = 47fe2cec543c0cb0b0a60ef3dde62b27
+SHA256 (emacs-cvs-snapshot-2006.05.02.05.51.52.tar.bz2) = 5ee0d900a872751999978b6b27e146cf368ecb44921e9883ae40040908b14616
+SIZE (emacs-cvs-snapshot-2006.05.02.05.51.52.tar.bz2) = 19818631
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index c158710e22a7..fce120d4cdab 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Mar  7 00:13:23 2002
-+++ Makefile.in	Thu Mar  7 00:14:30 2002
-@@ -404,14 +404,6 @@
+--- Makefile.in.orig	Thu Apr 20 23:29:18 2006
++++ Makefile.in	Wed May  3 07:04:47 2006
+@@ -409,14 +409,6 @@
  ## That flag is also used in leim/Makefile.in
  install-arch-indep: mkdir info
  	-set ${COPYDESTS} ; \
@@ -15,3 +15,25 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
+@@ -503,9 +495,9 @@
+ 	   fi; \
+ 	   cd ${srcdir}/info ; \
+ 	   for elt in $(INFO_FILES); do \
+-	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+-	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
+-	        chmod a+r $(DESTDIR)${infodir}/$$f; \
++	      for f in `ls $$elt 2>/dev/null`; do \
++	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
++	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
+ 	      done; \
+ 	   done); \
+ 	else true; fi
+@@ -515,7 +507,7 @@
+ 	then \
+ 	  for elt in $(INFO_FILES); do \
+ 	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
++	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
+ 	  done; \
+ 	else true; fi
+ 	-chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.in
index a00ddff006dd..84ebc615c9ae 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.in
@@ -1,5 +1,7 @@
---- configure.in.orig	Sat Apr  1 23:17:28 2006
-+++ configure.in	Sat Apr  1 23:28:18 2006
+Index: configure.in
+===================================================================
+--- configure.in	(.../branches/gnu/emacs)	(revision 15)
++++ configure.in	(.../trunk/emacs)	(revision 15)
 @@ -237,6 +237,9 @@
      opsys=freebsd
      case "${canonical}" in
diff --git a/editors/emacs-devel/files/patch-lib-src-Makefile.in b/editors/emacs-devel/files/patch-lib-src-Makefile.in
index ca8dc01fff48..3a29ebe78735 100644
--- a/editors/emacs-devel/files/patch-lib-src-Makefile.in
+++ b/editors/emacs-devel/files/patch-lib-src-Makefile.in
@@ -1,5 +1,7 @@
---- lib-src/Makefile.in.orig    Fri Jun 11 04:39:49 2004
-+++ lib-src/Makefile.in Tue Apr 12 23:08:49 2005
+Index: lib-src/Makefile.in
+===================================================================
+--- lib-src/Makefile.in	(.../branches/gnu/emacs)	(revision 15)
++++ lib-src/Makefile.in	(.../trunk/emacs)	(revision 15)
 @@ -94,6 +94,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -9,19 +11,20 @@
  INSTALL_STRIP =
  
 @@ -319,7 +320,7 @@
-         if [ `(cd ${archlibdir} && /bin/pwd)` \
+         if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
               != `(cd ${srcdir} && /bin/pwd)` ]; then \
  	  for file in ${SCRIPTS}; do \
--	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
+-	    $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
++	    $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
  	  done ; \
  	fi
  
 @@ -331,7 +332,7 @@
- 	  chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+ 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
  	done
  	for file in ${INSTALLABLE_SCRIPTS} ; do \
--	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
- 	  chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
++	  $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
+ 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
  	done
+ 
diff --git a/editors/emacs-devel/files/patch-lispintro-Makefile.in b/editors/emacs-devel/files/patch-lispintro-Makefile.in
index 80ac99cc3635..1e3bca9f5a11 100644
--- a/editors/emacs-devel/files/patch-lispintro-Makefile.in
+++ b/editors/emacs-devel/files/patch-lispintro-Makefile.in
@@ -1,11 +1,7 @@
---- lispintro/Makefile.in.orig	Fri Jun 11 04:39:50 2004
-+++ lispintro/Makefile.in	Tue Apr 12 23:22:24 2005
-@@ -30,10 +30,10 @@
- INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi
- # The file name eintr must fit within 5 characters, to allow for
- # -NN extensions to fit into DOS 8+3 limits without clashing
--INFO_TARGETS = ${infodir}/eintr
-+INFO_TARGETS = ${infodir}/eintr.info
+--- lispintro/Makefile.in.orig	Thu Apr 20 23:29:18 2006
++++ lispintro/Makefile.in	Wed May  3 04:48:53 2006
+@@ -33,7 +33,7 @@
+ INFO_TARGETS = ${infodir}/eintr
  DVI_TARGETS = emacs-lisp-intro.dvi
  
 -MAKEINFO = makeinfo
@@ -13,12 +9,3 @@
  TEXI2DVI = texi2dvi
  DVIPS = dvips
  ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
-@@ -44,7 +44,7 @@
- 
- dvi: $(DVI_TARGETS)
- 
--${infodir}/eintr: ${INFO_SOURCES}
-+${infodir}/eintr.info: ${INFO_SOURCES}
- 	$(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi
- 
- emacs-lisp-intro.dvi: ${INFO_SOURCES}
diff --git a/editors/emacs-devel/files/patch-lispref-Makefile.in b/editors/emacs-devel/files/patch-lispref-Makefile.in
index 2760a77676c6..014a8cfd974b 100644
--- a/editors/emacs-devel/files/patch-lispref-Makefile.in
+++ b/editors/emacs-devel/files/patch-lispref-Makefile.in
@@ -1,5 +1,5 @@
---- lispref/Makefile.in.orig	Sat Mar 26 18:34:51 2005
-+++ lispref/Makefile.in	Tue Apr 12 23:23:23 2005
+--- lispref/Makefile.in.orig	Thu Apr 20 23:29:18 2006
++++ lispref/Makefile.in	Wed May  3 04:50:53 2006
 @@ -31,7 +31,7 @@
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
@@ -9,49 +9,30 @@
  
  # The name of the manual:
  VERSION=2.9
-@@ -97,10 +97,10 @@
- .PHONY: clean
- 
- # The info file is named `elisp'.
--info: $(infodir)/elisp
-+info: $(infodir)/elisp.info
- 
--$(infodir)/elisp: $(srcs)
--	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
-+$(infodir)/elisp.info: $(srcs)
-+	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp.info
- 
- elisp.dvi: $(srcs)
- 	$(TEXI2DVI) -I $(srcdir) $(srcdir)/elisp.texi
-@@ -108,8 +108,8 @@
+@@ -108,7 +108,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)
--	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
-+	cp elisp.info $(infodir)
-+	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp.info
++	cp elisp $(infodir)
+ 	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
  
  # This is for use in a separate distro of the Emacs Lisp manual.
- elisp: $(srcs)
-@@ -124,9 +124,9 @@
+@@ -124,7 +124,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.info
++	cd $(infodir); rm -f elisp
  
--dist: $(infodir)/elisp elisp.dvi
-+dist: $(infodir)/elisp.info elisp.dvi
+ dist: $(infodir)/elisp elisp.dvi
  	-rm -rf temp
- 	-mkdir temp
- 	-mkdir temp/$(manual)
 @@ -134,7 +134,7 @@
   $(srcdir)/Makefile.in $(srcs) \
   $(srcdir)/../man/texinfo.tex \
   elisp.dvi elisp.aux elisp.??s \
 - $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
-+ $(infodir)/elisp.info \
++ $(infodir)/elisp \
   temp/$(manual)
  	-(cd temp/$(manual); rm -f mkinstalldirs)
  	cp $(srcdir)/mkinstalldirs temp/$(manual)
diff --git a/editors/emacs-devel/files/patch-man-Makefile.in b/editors/emacs-devel/files/patch-man-Makefile.in
index e958c2727772..cd036d15d8ac 100644
--- a/editors/emacs-devel/files/patch-man-Makefile.in
+++ b/editors/emacs-devel/files/patch-man-Makefile.in
@@ -1,289 +1,11 @@
---- man/Makefile.in.orig    Mon Dec 27 20:56:34 2004
-+++ man/Makefile.in Tue Apr 12 22:56:18 2005
-@@ -32,34 +32,33 @@
+--- man/Makefile.in.orig	Wed May  3 03:47:47 2006
++++ man/Makefile.in	Wed May  3 03:48:25 2006
+@@ -32,7 +32,7 @@
  
  # The makeinfo program is part of the Texinfo distribution.
  # Use --force so that it generates output even if there are errors.
 -MAKEINFO = makeinfo --force
--INFO_TARGETS = ../info/emacs ../info/emacs-xtra ../info/ccmode ../info/cl \
--	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
--		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
--		../info/info ../info/mh-e ../info/reftex \
--		../info/sc ../info/vip ../info/viper ../info/widget \
--		../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
--		../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
--		../info/woman ../info/eshell ../info/org ../info/url \
--		../info/speedbar ../info/tramp ../info/ses ../info/smtpmail \
--		../info/flymake ../info/newsticker ../info/rcirc ../info/erc
--DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
--		 ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
--                 gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
--		 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
--		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
--		 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
--		 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
--                 newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
-+MAKEINFO = makeinfo --no-split --force
-+TEXI2DVI = texi2dvi
-+INFO_TARGETS = emacs.info emacs-xtra.info ccmode.info cl.info dired-x.info \
-+	       ediff.info forms.info gnus.info message.info sieve.info \
-+	       pgg.info emacs-mime.info info.info mh-e.info reftex.info \
-+	       sc.info vip.info viper.info widget.info efaq.info \
-+	       ada-mode.info autotype.info calc.info idlwave.info \
-+	       eudc.info ebrowse.info pcl-cvs.info woman.info eshell.info \
-+	       org.info url.info speedbar.info tramp.info ses.info \
-+	       smtpmail.info flymake.info newsticker.info rcirc.info erc.info
-+DVI_TARGETS =  emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-+	       ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
-+	       gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
-+	       reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
-+	       ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-+	       pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
-+	       speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-+	       newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
- INFOSOURCES = info.texi
- 
- # The following rule does not work with all versions of `make'.
--.SUFFIXES: .texi .dvi
-+.SUFFIXES: .texi .dvi .info
- .texi.dvi:
--	texi2dvi $<
-+	TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" $(TEXI2DVI) $<
- 
--TEXI2DVI = texi2dvi
--ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
-+.texi.info:
-+	cd $(srcdir); $(MAKEINFO) $< -o ../info/$(<:.texi=.info)
- 
- EMACSSOURCES= \
- 	${srcdir}/emacs.texi \
-@@ -119,22 +118,6 @@
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
- 
--# The following target uses an explicit -o switch to work around
--# the @setfilename directive in info.texi, which is required for
--# the Texinfo distribution.
--
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
--
--info.dvi: ${INFOSOURCES}
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
--
--../info/emacs: ${EMACSSOURCES}
--	cd $(srcdir); $(MAKEINFO) emacs.texi
--
--emacs.dvi: ${EMACSSOURCES}
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
--
- # This target is here so you could easily get the list of the *.texi
- # files which belong to the Emacs manual (as opposed to the separate
- # manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
-@@ -142,200 +125,21 @@
- emacsman:
- 	@echo $(EMACSSOURCES)
- 
--../info/ccmode: cc-mode.texi
--	cd $(srcdir); $(MAKEINFO) cc-mode.texi
--cc-mode.dvi: cc-mode.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
--
--../info/ada-mode: ada-mode.texi
--	cd $(srcdir); $(MAKEINFO) ada-mode.texi
--ada-mode.dvi: ada-mode.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
--
--../info/pcl-cvs: pcl-cvs.texi
--	cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
--pcl-cvs.dvi: pcl-cvs.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
--
--../info/eshell: eshell.texi
--	cd $(srcdir); $(MAKEINFO) eshell.texi
--eshell.dvi: eshell.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
--
--../info/cl: cl.texi
--	cd $(srcdir); $(MAKEINFO) cl.texi
--cl.dvi: cl.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
--
--../info/dired-x: dired-x.texi
--	cd $(srcdir); $(MAKEINFO) dired-x.texi
--dired-x.dvi: dired-x.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
--
--../info/ediff: ediff.texi
--	cd $(srcdir); $(MAKEINFO) ediff.texi
--ediff.dvi: ediff.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
--
--../info/emacs-xtra: emacs-xtra.texi
--	cd $(srcdir); $(MAKEINFO) emacs-xtra.texi
--emacs-xtra.dvi: emacs-xtra.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
--
--../info/forms: forms.texi
--	cd $(srcdir); $(MAKEINFO) forms.texi
--forms.dvi: forms.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
--
- # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
--../info/gnus: gnus.texi gnus-faq.texi
--	cd $(srcdir); $(MAKEINFO) gnus.texi
- gnus.dvi: gnus.texi gnus-faq.texi
- 	sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
--	$(ENVADD) $(TEXI2DVI) gnustmp.texi
-+	TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" $(TEXI2DVI) gnustmp.texi
- 	cp gnustmp.dvi $*.dvi
- 	rm gnustmp.*
- 
--../info/message: message.texi
--	cd $(srcdir); $(MAKEINFO) message.texi
--message.dvi: message.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
--
--../info/sieve: sieve.texi
--	cd $(srcdir); $(MAKEINFO) sieve.texi
--sieve.dvi: sieve.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
--
--../info/emacs-mime: emacs-mime.texi
--	cd $(srcdir); $(MAKEINFO) emacs-mime.texi
--emacs-mime.dvi: emacs-mime.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
--
--../info/pgg: pgg.texi
--	cd $(srcdir); $(MAKEINFO) pgg.texi
--pgg.dvi: pgg.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
--
--../info/mh-e: mh-e.texi
--	cd $(srcdir); $(MAKEINFO) mh-e.texi
--mh-e.dvi: mh-e.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
--
--../info/reftex: reftex.texi
--	cd $(srcdir); $(MAKEINFO) reftex.texi
--reftex.dvi: reftex.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
--
--../info/sc: sc.texi
--	cd $(srcdir); $(MAKEINFO) sc.texi
--sc.dvi: sc.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
--
--../info/vip: vip.texi
--	cd $(srcdir); $(MAKEINFO) vip.texi
--vip.dvi: vip.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
--
--../info/viper: viper.texi
--	cd $(srcdir); $(MAKEINFO) viper.texi
--viper.dvi: viper.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
--
--../info/widget: widget.texi
--	cd $(srcdir); $(MAKEINFO) widget.texi
--widget.dvi: widget.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
--
--../info/efaq: faq.texi
--	cd $(srcdir); $(MAKEINFO) faq.texi
--faq.dvi: faq.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-+ccmode.info: cc-mode.texi
-+	cd $(srcdir); $(MAKEINFO) cc-mode.texi -o ../info/ccmode.info
-+
-+efaq.info: faq.texi
-+	cd $(srcdir); $(MAKEINFO) faq.texi -o ../info/efaq.info
- 
- ../etc/GNU: gnu1.texi gnu.texi
- 	cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
--
--../info/autotype: autotype.texi
--	cd $(srcdir); $(MAKEINFO) autotype.texi
--autotype.dvi: autotype.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
--
--../info/calc: calc.texi
--	cd $(srcdir); $(MAKEINFO) calc.texi
--
--calc.dvi: calc.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
--
--# This is produced with --no-split to avoid making files whose
--# names clash on DOS 8+3 filesystems
--../info/idlwave: idlwave.texi
--	cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
--idlwave.dvi: idlwave.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
--
--../info/eudc: eudc.texi
--	cd $(srcdir); $(MAKEINFO) eudc.texi
--eudc.dvi: eudc.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
--
--../info/ebrowse: ebrowse.texi
--	cd $(srcdir); $(MAKEINFO) ebrowse.texi
--ebrowse.dvi: ebrowse.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
--
--../info/woman: woman.texi
--	cd $(srcdir); $(MAKEINFO) woman.texi
--woman.dvi: woman.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
--
--../info/org: org.texi
--	cd $(srcdir); $(MAKEINFO) org.texi
--org.dvi: org.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
--
--../info/url: url.texi
--	cd $(srcdir); $(MAKEINFO) url.texi
--url.dvi: url.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
--
--../info/speedbar: speedbar.texi
--	cd $(srcdir); $(MAKEINFO) speedbar.texi
--speedbar.dvi: speedbar.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
--
--../info/tramp: tramp.texi trampver.texi
--	cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
--tramp.dvi: tramp.texi trampver.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
--
--../info/ses: ses.texi
--	cd $(srcdir); $(MAKEINFO) ses.texi
--ses.dvi: ses.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
--
--../info/smtpmail: smtpmail.texi
--	cd $(srcdir); $(MAKEINFO) smtpmail.texi
--smtpmail.dvi: smtpmail.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
--
--../info/flymake: flymake.texi
--	cd $(srcdir); $(MAKEINFO) flymake.texi
--flymake.dvi: flymake.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
--
--../info/newsticker: newsticker.texi
--	cd $(srcdir); $(MAKEINFO) newsticker.texi
--newsticker.dvi: newsticker.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
--
--../info/rcirc: rcirc.texi
--	cd $(srcdir); $(MAKEINFO) rcirc.texi
--rcirc.dvi: rcirc.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
--
--../info/erc: erc.texi
--	cd $(srcdir); $(MAKEINFO) erc.texi
--erc.dvi: erc.texi
--	$(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
- 
- mostlyclean:
- 	rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
++MAKEINFO = makeinfo --force --no-split
+ INFO_TARGETS = ../info/emacs ../info/emacs-xtra ../info/ccmode ../info/cl \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+ 		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
diff --git a/editors/emacs-devel/files/patch-src__alloc.c b/editors/emacs-devel/files/patch-src__alloc.c
index 9c296b14a1b1..9fee60ffca59 100644
--- a/editors/emacs-devel/files/patch-src__alloc.c
+++ b/editors/emacs-devel/files/patch-src__alloc.c
@@ -1,6 +1,8 @@
---- src/alloc.c.orig	Sat Apr  1 23:41:43 2006
-+++ src/alloc.c	Sat Apr  1 23:42:32 2006
-@@ -4528,7 +4528,11 @@
+Index: src/alloc.c
+===================================================================
+--- src/alloc.c	(.../branches/gnu/emacs)	(revision 15)
++++ src/alloc.c	(.../trunk/emacs)	(revision 15)
+@@ -4542,8 +4542,12 @@
       needed on ia64 too.  See mach_dep.c, where it also says inline
       assembler doesn't work with relevant proprietary compilers.  */
  #ifdef sparc
@@ -8,7 +10,8 @@
 +  asm ("flushw");
 +#else
    asm ("ta 3");
-+#endif
  #endif
++#endif
  
    /* Save registers that we need to see on the stack.  We need to see
+      registers used to hold register variables and registers used to
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index e6a52eca2042..2df7e991dbc7 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -24,7 +24,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/COPYING
 %%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
 %%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
-%%DATADIR%%/%%EMACS_VER%%/etc/DOC-22.0.50.1
+%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
 %%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
 %%DATADIR%%/%%EMACS_VER%%/etc/FTP
@@ -124,20 +124,28 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/images/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cancel.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cancel.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.xpm
+%%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/cut.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/data-save.pbm
+%%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.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/diropen.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/diropen.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/execute.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/execute.xpm
+%%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/bits.xpm
@@ -167,8 +175,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag-v.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/tag.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/fld-open.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/fld-open.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/bar.xbm
@@ -223,6 +229,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unimportant.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unsubscribe.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/unsubscribe.xpm
@@ -268,8 +275,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/watch.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/help.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/help.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/highlight.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/highlight.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_16.png
@@ -284,6 +289,9 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/lock.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/back-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/copy.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/cut.xpm
@@ -308,14 +316,19 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/undo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/up-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/up-node.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/alias.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/alias.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/refile.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/refile.xpm
+%%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.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.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/outbox.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/preview.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/repack.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/repack.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/reply-all.pbm
@@ -326,17 +339,20 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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.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.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/next-page.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/next-page.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/open.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/open.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/page-down.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/page-down.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/paste.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/paste.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/preferences.pbm
@@ -345,6 +361,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right-arrow.pbm
@@ -357,6 +374,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/blink.pbm
@@ -375,6 +393,11 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-column-ascending.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-criteria.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-descending.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/sort-row-ascending.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.pbm
@@ -383,8 +406,9 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%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/widen.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/widen.xpm
+%%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/ledit.l
 %%DATADIR%%/%%EMACS_VER%%/etc/letter.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/letter.xpm
@@ -1209,7 +1233,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/lisp/fringe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/TODO
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/binhex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/binhex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.el.gz
@@ -1228,6 +1251,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/format-spec.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/format-spec.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
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-agent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-art.el.gz
@@ -1417,7 +1442,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnrss.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnrss.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnslashdot.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnslashdot.el.new
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnslashdot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnsoup.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnsoup.elc
@@ -2160,8 +2184,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-complete-structtag.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-help.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-help.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-rinfo.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-rinfo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-shell.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-shell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-toolbar.el.gz
@@ -2287,6 +2309,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/%%EMACS_VER%%/lisp/subdirs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tabify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tabify.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/talk.el.gz
@@ -2577,48 +2601,46 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/yow
 %%DATADIR%%/site-lisp/subdirs.el
 var/games/emacs/snake-scores
 var/games/emacs/tetris-scores
-@dirrm var/games/emacs
-@dirrm var/games
-@dirrm var
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
-@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/play
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/net
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mail
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/language
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/international
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/gnus
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/eshell
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/erc
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emulation
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calendar
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calc
-@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp
-@dirrm %%DATADIR%%/%%EMACS_VER%%/leim/quail
-@dirrm %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic
-@dirrm %%DATADIR%%/%%EMACS_VER%%/leim
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/icons
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gud
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus
+@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
+@dirrm libexec/emacs/%%EMACS_VER%%
+@unexec rmdir %D/libexec/emacs 2>/dev/null || true
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gud
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/icons
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc
-@dirrm %%DATADIR%%/%%EMACS_VER%%
-@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
-@dirrm libexec/emacs/%%EMACS_VER%%
-@dirrm libexec/emacs
+@dirrm %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic
+@dirrm %%DATADIR%%/%%EMACS_VER%%/leim/quail
+@dirrm %%DATADIR%%/%%EMACS_VER%%/leim
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calc
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calendar
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emulation
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/erc
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/eshell
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/gnus
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/international
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/language
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mail
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/net
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/play
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp
+@unexec rmdir %D/%%DATADIR%%/site-lisp 2>/dev/null || true
+@unexec rmdir %D%%DATADIR%% 2>/dev/null || true
+@dirrm var/games/emacs
+@unexec rmdir %D/var/games 2>/dev/null || true
+@unexec rmdir %D/var 2>/dev/null || true