- Update to 2008.06.06.08.01.29 snapshot version.

- Make portlint happy.

PR:		ports/124359
Submitted by:	keramida
Approved by:	gabor (mentor, implicit)

6 files changed, 126 insertions, 73 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 402882861a57..0d3b90c1e74c 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -11,8 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	keramida
-DISTNAME=       ${PORTNAME}-cvs-2008.03.08.07.56.12
-USE_BZIP2=	yes
+DISTNAME=	${PORTNAME}-cvs-2008.06.06.08.01.29
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -34,6 +33,9 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
+USE_BZIP2=	yes
+INSTALLS_ICONS=	yes
+
 EMACS_VER=	23.0.60
 SNAPSHOT=	20080308
 GNU_CONFIGURE=	yes
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 0729ff399b23..9540cebb9153 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-cvs-2008.03.08.07.56.12.tar.bz2) = fc780afe7497942565acfdcc3bbf710c
-SHA256 (emacs-cvs-2008.03.08.07.56.12.tar.bz2) = 959bc40baac5586314ffdd02652307f8fdf6658ac009f2ffb1a4a20d73d1e6b0
-SIZE (emacs-cvs-2008.03.08.07.56.12.tar.bz2) = 23328969
+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
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index f8ea44be0190..186e8d47a870 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
-+++ Makefile.in	2008-01-02 14:41:21.000000000 +0200
-@@ -431,14 +431,6 @@
- ## commands to set make variables.
- install-arch-indep: mkdir info
+--- 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 @@
+ 
+ install-arch-indep: mkdir info install-etc
  	-set ${COPYDESTS} ; \
 -	unset CDPATH; \
 -	for dir in ${COPYDIR} ; do \
@@ -15,10 +15,10 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -547,9 +539,9 @@
- 	   fi; \
+@@ -555,9 +547,9 @@
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
+ 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
 -	      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; \
@@ -28,9 +28,9 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -559,7 +551,7 @@
- 	then \
+@@ -568,7 +560,7 @@
  	  for elt in $(INFO_FILES); do \
+ 	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
  	    (cd $${thisdir}; \
 -	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 +	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
diff --git a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
index fdc3143e2946..a2b9879daa1f 100644
--- a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
@@ -1,6 +1,6 @@
---- doc/emacs/Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
-+++ doc/emacs/Makefile.in	2008-01-02 14:41:21.000000000 +0200
-@@ -35,7 +35,7 @@
+--- 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
+@@ -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.
@@ -9,7 +9,7 @@
  
  INFO_TARGETS = $(infodir)/emacs
  DVI_TARGETS  = emacs.dvi
-@@ -146,7 +146,7 @@
+@@ -145,7 +145,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 5967ba7b1cf8..d6246b2687ca 100644
--- a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
@@ -1,6 +1,6 @@
---- doc/lispintro/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
-+++ doc/lispintro/Makefile.in	2008-01-02 14:41:21.000000000 +0200
-@@ -34,7 +34,7 @@
+--- 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
+@@ -33,7 +33,7 @@
  INFO_TARGETS = ${infodir}/eintr
  DVI_TARGETS = emacs-lisp-intro.dvi
  
@@ -9,11 +9,12 @@
  TEXI2DVI = texi2dvi
  DVIPS = dvips
  
-@@ -66,7 +66,6 @@
+@@ -65,7 +65,7 @@
  
  maintainer-clean: distclean
  	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
 -	cd $(infodir); rm -f eintr eintr-[1-9]
++	cd $(infodir); rm -f eintr
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 04e933418f1b..28a1def0bd9d 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -28,7 +28,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR
 %%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
 %%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
-%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
 %%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
 %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.README
@@ -210,6 +209,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs2.py
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs3.py
 %%DATADIR%%/%%EMACS_VER%%/etc/enriched.doc
+%%DATADIR%%/%%EMACS_VER%%/etc/forms-d2.dat
 %%DATADIR%%/%%EMACS_VER%%/etc/future-bug
 %%DATADIR%%/%%EMACS_VER%%/etc/gnus-tut.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/gnus/gnus-setup.ast
@@ -231,6 +231,11 @@ share/applications/emacs.desktop
 %%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.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right-pushed.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/data-save.pbm
@@ -868,8 +873,7 @@ 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.gz
-%%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul3.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
@@ -1006,6 +1010,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-keypd.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-lang.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-lang.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-macs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-map.el.gz
@@ -1099,6 +1104,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/calendar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-lib.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-lib.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-loaddefs.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/hol-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/holidays.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/holidays.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar.el.gz
@@ -1410,6 +1417,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-file.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-file.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/epa-hook.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/epa-hook.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-mail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-mail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa.el.gz
@@ -1550,6 +1559,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/expand.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ezimage.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ezimage.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/face-remap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/face-remap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/facemenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/facemenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/faces.el.gz
@@ -1562,6 +1573,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/files.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/filesets.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/filesets.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/find-cmd.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/find-cmd.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/find-dired.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/find-dired.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/find-file.el.gz
@@ -1585,7 +1598,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/format-spec.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/format.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/format.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/forms-d2.dat
 %%DATADIR%%/%%EMACS_VER%%/lisp/forms-d2.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/forms-pass.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/forms.el.gz
@@ -1596,6 +1608,8 @@ share/applications/emacs.desktop
 %%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/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
@@ -2020,6 +2034,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/european.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/georgian.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/greek.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/language/hanja-util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/language/hanja-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/hebrew.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/ind-util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/language/ind-util.elc
@@ -2211,6 +2227,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/midnight.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/minibuf-eldef.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/minibuf-eldef.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/minibuffer.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/minibuffer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/misc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/misc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-copy.el.gz
@@ -2317,6 +2335,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/zeroconf.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/zeroconf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/newcomment.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/newcomment.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.el.gz
@@ -2370,20 +2390,10 @@ 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/obsolete/auto-show.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/auto-show.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bg-mouse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bg-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/float.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/float.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hilit19.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hilit19.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hscroll.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hscroll.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
@@ -2393,34 +2403,74 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lselect.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lselect.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mlsupport.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mlsupport.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ooutline.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ooutline.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/profile.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/profile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnews.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnews.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnewspost.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnewspost.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rsz-mini.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rsz-mini.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/uncompress.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/uncompress.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.el.gz
+%%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-bbdb.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-clock.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-clock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-colview.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-colview.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.el.gz
+%%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-info.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.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-mac-message.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mac-message.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-macs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mew.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mew.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.el.gz
+%%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-publish.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.el.gz
+%%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-vm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-vm.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
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/outline.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/outline.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/paren.el.gz
@@ -2522,6 +2572,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/proced.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/proced.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ada-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ada-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ada-prj.el.gz
@@ -2536,6 +2588,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/asm-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/autoconf.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/autoconf.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
@@ -2650,8 +2704,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/mixal-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/modula2.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/modula2.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/octave-hlp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/octave-hlp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/octave-inf.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/octave-inf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/octave-mod.el.gz
@@ -2850,14 +2902,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mouse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mouse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page.el.gz
@@ -3012,6 +3056,8 @@ share/applications/emacs.desktop
 %%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-dispatcher.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-dispatcher.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-git.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-git.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hg.el.gz
@@ -3081,28 +3127,16 @@ share/icons/hicolor/32x32/apps/emacs22.png
 share/icons/hicolor/48x48/apps/emacs.png
 share/icons/hicolor/48x48/apps/emacs22.png
 share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 var/games/emacs/snake-scores
 var/games/emacs/tetris-scores
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/24x24/apps
-@dirrm share/icons/hicolor/24x24
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor/128x128/apps
-@dirrm share/icons/hicolor/128x128
-@dirrm share/icons/hicolor
-@dirrm share/icons
 @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/org
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/nxml
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/net
@@ -3151,16 +3185,32 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gud
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/custom
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/gnus
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/charsets
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc
 @dirrm %%DATADIR%%/%%EMACS_VER%%
-@dirrm share/applications
 @dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VER%%
 @dirrm libexec/emacs
+@dirrmtry share/icons/hicolor/scalable/mimetypes
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
 @dirrmtry var/games/emacs
 @dirrmtry var/games
 @dirrmtry var