7087610 emacs runpath points at wrong ELFCLASS as well as being redundant
authorAli Bahrami <Ali.Bahrami@Oracle.COM>
Mon, 13 Feb 2012 09:15:28 -0700
changeset 686 b4fe91eb660b
parent 685 5e6df462e21d
child 687 05f0db35db4e
7087610 emacs runpath points at wrong ELFCLASS as well as being redundant 7048759 font not available error when attempting to set default font in emacs-gtk 7117531 update GNU Emacs to 23.4
components/emacs/Makefile
components/emacs/README
components/emacs/gnu-emacs-lisp.p5m
components/emacs/gnu-emacs.p5m
components/emacs/patches/buffer_menu.patch
components/emacs/patches/dldump.patch
components/emacs/patches/etags.patch
components/emacs/patches/sysmalloc.patch
components/emacs/patches/xft.patch
--- a/components/emacs/Makefile	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/Makefile	Mon Feb 13 09:15:28 2012 -0700
@@ -18,16 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		emacs
-COMPONENT_VERSION=	23.1
+COMPONENT_VERSION=	23.4
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/emacs/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:5f2d5dfcc17e7627ea752f675c605fe37c9c145c
+COMPONENT_ARCHIVE_HASH=	sha1:5effbd2af6bf7a4feb2d80810e49b0ce47b463cb
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/emacs/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -66,6 +66,10 @@
 # local proto instead of from its final installed location.
 #CONFIGURE_PREFIX =	$(PROTO_DIR)/usr
 
+# The configure script runs the pkg-config command. Since we're building
+# 64-bit executables, we need pkg-config to use the 64-bit metadata files
+CONFIGURE_ENV += PKG_CONFIG_PATH=/usr/lib/$(MACH64)/pkgconfig
+
 # configure options common to all variants of emacs that we want to build.
 CONFIGURE_OPTIONS +=	CC="$(CC) -m64"
 CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
--- a/components/emacs/README	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/README	Mon Feb 13 09:15:28 2012 -0700
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 NAME:             emacs
-VERSION:          23.1
+VERSION:          23.4
 DESCRIPTION:      GNU Emacs editor
 LICENSE:          GPLv3
 BUGTRAQ:          solaris/utility/emacs
@@ -36,14 +36,6 @@
 
 - We patch the following changes to the emacs sources:
 
-	buffer_menu.patch
-	    Fixes an issue with GTK and the Buffers menu where the
-	    menu contents is not updated to show the current buffers
-	    and instead shows a stale list. I based these patches
-	    on the official ones applied to the emacs development branch:
-
-	    http://lists.gnu.org/archive/html/emacs-diffs/2009-09/msg00039.html
-
 	sysmalloc.patch
 	    Use the system malloc instead of the built in one
 
@@ -56,13 +48,6 @@
 	    Patch configure script to provide necessary missing
 	    libraries for the GTK version of emacs.
 
-        etags.patch
-            The version of etags in Emacs 23.1 has a bug in the function
-            absolute_filename(). It uses strcpy() to do overlapped string
-            copies, which is undefined. This patch substitutes memmove(),
-            which exists specifically to handle that case.
-
-
 - Emacs can be built as either 32-bit or 64-bit, depending on the target
   machine. The benefit of a 64-bit emacs is that the size of the files it
   can handle is not limited to 128MB, as it is with the 32-bit version.
@@ -83,23 +68,6 @@
   builds necessary in half, and also the binary package size. It also
   simplifies packaging, and the user's view of /usr/bin/emacs*.
 
-  Note that we're installing a 64-bit objects in /bin, and
-  usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR). The userland
-  pkglint plugin considers these to be a "32-bit path". There is an
-  RFE to suppress lint for specific attributes:
-
-        Bug 17777 - it would be nice if pkglint could suppress specific
-                    messages for specific actions
-        https://defect.opensolaris.org/bz/show_bug.cgi?id=17777
-
-  Until then, we simply assert that the whole action for those files is
-  linted with
-
-        pkg.linted=True
-
-  This disables all lint checking for these items, so extra care is needed
-  not to introduce some other error.
-
 - There are three different toolkit options: None, Athena widgets
   (aka Xaw, or lucid), and gtk. It would be nice to only support gtk,
   but for purposes of minimization and user preference, we supply binaries
@@ -134,10 +102,3 @@
   this is that we do not install update-game-score as setuid, and
   therefore the game files are not usable. This the same decision made
   by Debian, among others.
-
-- The depend line in gnu-emacs.p5m requiring one of the three toolkit versions
-  to be installed currently has the pkg.linted=true attribute set, pending
-  the resolution of
-
-        Bug 18202 - pkglint AttributeError when using require-any depend action
-        https://defect.opensolaris.org/bz/show_bug.cgi?id=18202
--- a/components/emacs/gnu-emacs-lisp.p5m	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/gnu-emacs-lisp.p5m	Mon Feb 13 09:15:28 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,30 +33,43 @@
 
 license emacs.license license="GPLv3"
 
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mail
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mh-e
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url
+dir  path=usr
+dir  path=usr/share
+dir  path=usr/share/emacs
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mail
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mh-e
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url
 
 file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic/ja-dic.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/4Corner.el.gz
@@ -207,6 +220,154 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/todo-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/case-table.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cdl.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-cscope.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-files.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-global.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-idutils.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/data-debug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/auto.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/autoconf-edit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/base.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/cpp-root.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/custom.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/dired.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/emacs.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/files.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/generic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/linux.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/locate.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/make.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/makefile-edit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/pconf.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/pmake.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-archive.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-aux.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-comp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-elisp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-info.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-misc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-obj.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-prog.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-scheme.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-shared.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/project-am.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/shell.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/simple.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/source.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/speedbar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/srecode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/system.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/util.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/inversion.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/mode-local.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/pulse.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/complete.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/debug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/fcn.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/refs.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/c-by.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/c.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/debug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/el.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/gcc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/make-by.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/make.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/scm-by.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/scm.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/chart.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/complete.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ctxt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-debug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-ebrowse.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-el.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-file.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-find.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-global.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-javascript.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-ref.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-typecache.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/debug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate/include.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate/mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/dep.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/doc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ede-grammar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/edit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/find.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/format.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/fw.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/grammar-wy.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/grammar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/html.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ia-sb.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ia.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/idle.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/imenu.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/java.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/lex-spp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/lex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/mru-bookmark.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/sb.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/scope.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/senator.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/sort.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/cscope.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/filter.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/global.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/grep.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/idutils.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/list.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-file.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-ls.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-write.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/texi.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/util-modes.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/util.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/comp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/java-tags.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/javascript.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/javat-wy.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/js-wy.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/python-wy.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/python.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/wisent.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/args.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/compile.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/cpp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/ctxt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/dictionary.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/document.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/el.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/expandproto.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/extract.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/fields.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/filters.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/find.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/getset.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/insert.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/java.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/map.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/semantic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt-wy.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/table.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/template.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/texi.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/chistory.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cmuscheme.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/comint.el.gz
@@ -268,9 +429,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-opt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-run.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/bytecomp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/chart.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/check-declare.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/checkdoc.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-extra.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-indent.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-macs.el.gz
@@ -285,6 +446,13 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easy-mmode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easymenu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/edebug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-base.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-comp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-custom.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-datadebug.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-opt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-speedbar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eldoc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/elint.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/elp.el.gz
@@ -295,12 +463,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generic.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/gulp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/helper.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/levents.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp-mnt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lmenu.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lucid.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/macroexp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/map-ynp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/pp.el.gz
@@ -310,6 +475,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ring.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/rx.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/shadow.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/smie.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/sregex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/syntax.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.el.gz
@@ -426,6 +592,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/faces.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ffap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filesets.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/find-cmd.el.gz
@@ -438,6 +605,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/follow.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-core.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-lock.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-setting.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format-spec.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/forms.el.gz
@@ -584,10 +752,12 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/help.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hex-util.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hexl.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hfy-cmap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hi-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hilit-chg.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hippie-exp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hl-line.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/htmlfontify.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuf-ext.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuf-macs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuffer.el.gz
@@ -607,7 +777,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/informat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/ccl.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/characters.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/encoded-kb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/fontset.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/isearch-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/iso-ascii.el.gz
@@ -620,6 +789,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/latexenc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/latin1-disp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-cmds.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-conf.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-diag.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-util.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule.el.gz
@@ -627,6 +797,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/quail.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/robin.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/titdic-cnv.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/ucs-normalize.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/utf-7.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearch.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearchb.el.gz
@@ -738,6 +909,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse-drag.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse-sel.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mpc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/msb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mwheel.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ange-ftp.el.gz
@@ -757,6 +929,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/goto-addr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-def.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-md5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/imap-hash.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/imap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ldap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/mairix.el.gz
@@ -786,7 +959,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-fish.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-ftp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gw.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-imap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.el.gz
@@ -821,11 +996,15 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml/xmltok.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml/xsd-regexp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/awk-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/fast-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-acc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-insert.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-swed.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/levents.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lmenu.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lucid.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/resume.el.gz
@@ -834,41 +1013,58 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/scribe.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/swedish.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sym-comp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-mcvs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/x-menu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ascii.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-clock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-colview.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-compat.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-crypt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docbook.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp-blocks.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-export-latex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-freemind.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-html.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-icalendar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-inlinetask.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-install.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-irc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-jsinfo.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-latex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-list.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mac-message.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mew.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-publish.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-remember.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-timer.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-vm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-w3m.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-wl.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-xoxo.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/outline.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/paren.el.gz
@@ -941,7 +1137,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-menus.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-styles.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-subword.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-vars.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cfengine.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cmacexp.el.gz
@@ -978,6 +1173,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/idlw-toolbar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/idlwave.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/inf-lisp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/js.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ld-script.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/m4-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.el.gz
@@ -997,7 +1193,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sh-script.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/simula.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sql.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sym-comp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/subword.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/tcl.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/vera-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/verilog-mode.el.gz
--- a/components/emacs/gnu-emacs.p5m	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/gnu-emacs.p5m	Mon Feb 13 09:15:28 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
@@ -34,101 +34,113 @@
 
 license emacs.license license="GPLv3"
 
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/lib
-dir path=usr/lib/emacs
-dir path=usr/lib/emacs/$(COMPONENT_VERSION)
-dir path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)
-dir path=usr/share
-dir path=usr/share/applications
-dir path=usr/share/emacs
-dir path=usr/share/emacs/$(COMPONENT_VERSION)
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/gnus
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/custom
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/ezimage
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gnus
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/128x128
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/128x128/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/16x16
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/16x16/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/24x24
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/24x24/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/32x32
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/32x32/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/mimetypes
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/low-color
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mail
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies/grayscale
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies/medium
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/folder
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/nxml
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/schema
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/etc/tutorials
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mail
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mh-e
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url
-dir path=usr/share/emacs/$(COMPONENT_VERSION)/site-lisp
-dir path=usr/share/emacs/site-lisp
-dir path=usr/share/icons
-dir path=usr/share/icons/hicolor
-dir path=usr/share/icons/hicolor/128x128
-dir path=usr/share/icons/hicolor/128x128/apps
-dir path=usr/share/icons/hicolor/16x16
-dir path=usr/share/icons/hicolor/16x16/apps
-dir path=usr/share/icons/hicolor/24x24
-dir path=usr/share/icons/hicolor/24x24/apps
-dir path=usr/share/icons/hicolor/32x32
-dir path=usr/share/icons/hicolor/32x32/apps
-dir path=usr/share/icons/hicolor/48x48
-dir path=usr/share/icons/hicolor/48x48/apps
-dir path=usr/share/icons/hicolor/scalable
-dir path=usr/share/icons/hicolor/scalable/apps
-dir path=usr/share/icons/hicolor/scalable/mimetypes
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=usr
+dir  path=usr/bin
+dir  path=usr/gnu
+dir  path=usr/gnu/bin
+dir  path=usr/gnu/share
+dir  path=usr/gnu/share/man
+dir  path=usr/gnu/share/man/man1
+dir  path=usr/lib
+dir  path=usr/lib/emacs
+dir  path=usr/lib/emacs/$(COMPONENT_VERSION)
+dir  path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)
+dir  path=usr/share
+dir  path=usr/share/applications
+dir  path=usr/share/emacs
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/gnus
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/custom
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/ezimage
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gnus
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/128x128
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/128x128/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/16x16
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/16x16/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/24x24
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/24x24/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/32x32
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/32x32/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/mimetypes
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/low-color
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mail
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies/grayscale
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/smilies/medium
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/folder
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/nxml
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/schema
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/etc/tutorials
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mail
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mh-e
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url
+dir  path=usr/share/emacs/$(COMPONENT_VERSION)/site-lisp
+dir  path=usr/share/emacs/site-lisp
+dir  path=usr/share/icons
+dir  path=usr/share/icons/hicolor
+dir  path=usr/share/icons/hicolor/128x128
+dir  path=usr/share/icons/hicolor/128x128/apps
+dir  path=usr/share/icons/hicolor/16x16
+dir  path=usr/share/icons/hicolor/16x16/apps
+dir  path=usr/share/icons/hicolor/24x24
+dir  path=usr/share/icons/hicolor/24x24/apps
+dir  path=usr/share/icons/hicolor/32x32
+dir  path=usr/share/icons/hicolor/32x32/apps
+dir  path=usr/share/icons/hicolor/48x48
+dir  path=usr/share/icons/hicolor/48x48/apps
+dir  path=usr/share/icons/hicolor/scalable
+dir  path=usr/share/icons/hicolor/scalable/apps
+dir  path=usr/share/icons/hicolor/scalable/mimetypes
+dir  path=usr/share/info
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+
 
 file path=usr/bin/b2m
 file path=usr/bin/ebrowse
@@ -140,8 +152,6 @@
 file path=usr/gnu/bin/etags
 file path=usr/gnu/share/man/man1/ctags.1
 file path=usr/gnu/share/man/man1/etags.1
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/cvtmail \
-	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/digest-doc \
 	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/fakemail \
@@ -342,21 +352,35 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e/eterm-color
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e/eterm-color.ti
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/echo.msg
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/edt-user.doc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/edt-user.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs-buffer.gdb
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.bash
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.csh
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.desktop
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.icon
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.py pkg.tmp.autopyc=false
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs2.py pkg.tmp.autopyc=false
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs3.py pkg.tmp.autopyc=false
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.py \
+	pkg.tmp.autopyc=false
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs2.py \
+	pkg.tmp.autopyc=false
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs3.py \
+	pkg.tmp.autopyc=false
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/enriched.doc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/forms-d2.dat
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/future-bug
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/gnus-tut.txt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/gnus/gnus-setup.ast
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/gnus/news-server.ast
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/bovine-grammar.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/c.by
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/grammar.wy
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/java-tags.wy
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/js.wy
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/make.by
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/python.wy
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/scheme.by
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/srecode-template.wy
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grammars/wisent-grammar.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/grep.txt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/attach.pbm
@@ -483,6 +507,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gnus/uu-post.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gnus/uu-post.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/all.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/break.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/break.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/cont.pbm
@@ -503,8 +528,16 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/print.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/pstar.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/pstar.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rcont.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/recstart.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/recstop.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/remove.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/remove.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rfinish.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rnext.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rnexti.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rstep.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/rstepi.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/run.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/run.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/step.pbm
@@ -513,6 +546,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/stepi.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/stop.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/stop.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/thread.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/until.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/until.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/gud/up.pbm
@@ -603,6 +637,15 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mail/send.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mail/spam.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mh-logo.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/add.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/ffwd.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/next.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/pause.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/play.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/prev.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/rewind.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/mpc/stop.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/new.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/new.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/next-node.pbm
@@ -1117,6 +1160,157 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/todo-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/case-table.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cdl.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-cscope.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-files.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-global.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet-idutils.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/cedet.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/data-debug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/auto.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/autoconf-edit.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/base.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/cpp-root.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/custom.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/dired.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/emacs.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/files.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/generic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/linux.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/loaddefs.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/locate.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/make.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/makefile-edit.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/pconf.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/pmake.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-archive.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-aux.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-comp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-elisp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-info.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-misc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-obj.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-prog.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-scheme.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj-shared.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/proj.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/project-am.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/shell.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/simple.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/source.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/speedbar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/srecode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/system.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/ede/util.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/inversion.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/mode-local.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/pulse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/complete.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/debug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/fcn.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/analyze/refs.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/c-by.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/c.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/debug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/el.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/gcc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/make-by.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/make.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/scm-by.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/bovine/scm.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/chart.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/complete.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ctxt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-debug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-ebrowse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-el.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-file.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-find.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-global.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-javascript.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-ref.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db-typecache.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/db.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/debug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate/include.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/decorate/mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/dep.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/doc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ede-grammar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/edit.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/find.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/format.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/fw.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/grammar-wy.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/grammar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/html.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ia-sb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/ia.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/idle.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/imenu.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/java.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/lex-spp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/lex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/loaddefs.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/mru-bookmark.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/sb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/scope.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/senator.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/sort.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/cscope.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/filter.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/global.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/grep.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/idutils.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/symref/list.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-file.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-ls.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag-write.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/tag.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/texi.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/util-modes.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/util.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/comp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/java-tags.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/javascript.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/javat-wy.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/js-wy.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/python-wy.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/python.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/semantic/wisent/wisent.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/args.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/compile.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/cpp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/ctxt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/dictionary.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/document.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/el.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/expandproto.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/extract.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/fields.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/filters.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/find.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/getset.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/insert.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/java.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/loaddefs.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/map.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/semantic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt-mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt-wy.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/srt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/table.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/template.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cedet/srecode/texi.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/chistory.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/cmuscheme.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/comint.elc
@@ -1179,9 +1373,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-opt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-run.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/bytecomp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/chart.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/check-declare.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/checkdoc.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-extra.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-indent.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-loaddefs.el
@@ -1198,6 +1392,13 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easy-mmode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easymenu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/edebug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-base.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-comp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-custom.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-datadebug.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-opt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-speedbar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eldoc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/elint.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/elp.elc
@@ -1208,12 +1409,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generic.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/gulp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/helper.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/levents.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp-mnt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lmenu.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lucid.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/macroexp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/map-ynp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/pp.elc
@@ -1223,6 +1421,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ring.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/rx.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/shadow.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/smie.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/sregex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/syntax.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.elc
@@ -1340,6 +1539,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/faces.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ffap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filesets.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/find-cmd.elc
@@ -1353,6 +1553,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/follow.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-core.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-lock.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/font-setting.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format-spec.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/forms-d2.el
@@ -1501,10 +1702,12 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/help.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hex-util.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hexl.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hfy-cmap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hi-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hilit-chg.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hippie-exp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/hl-line.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/htmlfontify.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuf-ext.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuf-macs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ibuffer.elc
@@ -1527,7 +1730,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/characters.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/charprop.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/cp51932.el
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/encoded-kb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/eucjp-ms.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/fontset.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/isearch-x.elc
@@ -1541,7 +1743,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/latexenc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/latin1-disp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-cmds.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-conf.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-conf.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-diag.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule-util.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/mule.elc
@@ -1549,6 +1751,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/quail.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/robin.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/titdic-cnv.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/ucs-normalize.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-bidi.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-category.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-combining.el
@@ -1700,6 +1903,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse-drag.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse-sel.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mouse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mpc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/msb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/mwheel.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ange-ftp.elc
@@ -1719,6 +1923,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/goto-addr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-def.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-md5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/imap-hash.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/imap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ldap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/mairix.elc
@@ -1748,7 +1953,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-fish.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-ftp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gw.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-imap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.elc
@@ -1784,12 +1991,16 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml/xmltok.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/nxml/xsd-regexp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/awk-mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/fast-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-acc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-insert.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-swed.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/keyswap.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/levents.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lmenu.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lucid.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/resume.elc
@@ -1798,41 +2009,58 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/scribe.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/swedish.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sym-comp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-mcvs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/x-menu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ascii.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-clock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-colview.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-compat.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-crypt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docbook.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp-blocks.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-export-latex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-freemind.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-html.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-icalendar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-inlinetask.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-install.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-irc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-jsinfo.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-latex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-list.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mac-message.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mew.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-publish.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-remember.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-timer.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-vm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-w3m.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-wl.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-xoxo.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/outline.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/paren.elc
@@ -1908,7 +2136,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-menus.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-styles.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-subword.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-vars.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cfengine.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cmacexp.elc
@@ -1945,6 +2172,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/idlw-toolbar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/idlwave.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/inf-lisp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/js.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ld-script.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/m4-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.elc
@@ -1964,7 +2192,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sh-script.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/simula.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sql.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/sym-comp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/subword.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/tcl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/vera-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/verilog-mode.elc
@@ -2201,8 +2429,11 @@
 file path=usr/share/info/dbus
 file path=usr/share/info/dired-x
 file path=usr/share/info/ebrowse
+file path=usr/share/info/ede
 file path=usr/share/info/ediff
+file path=usr/share/info/edt
 file path=usr/share/info/efaq
+file path=usr/share/info/eieio
 file path=usr/share/info/eintr
 file path=usr/share/info/eintr-1
 file path=usr/share/info/eintr-2
@@ -2253,6 +2484,7 @@
 file path=usr/share/info/org
 file path=usr/share/info/org-1
 file path=usr/share/info/org-2
+file path=usr/share/info/org-3
 file path=usr/share/info/pcl-cvs
 file path=usr/share/info/pgg
 file path=usr/share/info/rcirc
@@ -2260,6 +2492,7 @@
 file path=usr/share/info/remember
 file path=usr/share/info/sasl
 file path=usr/share/info/sc
+file path=usr/share/info/semantic
 file path=usr/share/info/ses
 file path=usr/share/info/sieve
 file path=usr/share/info/smtpmail
@@ -2272,7 +2505,8 @@
 file path=usr/share/info/woman
 file path=usr/share/man/man1/b2m.1
 file path=usr/share/man/man1/ebrowse.1
-file path=usr/share/man/man1/emacs.1 mangler.man.stability=committed
+file path=usr/share/man/man1/emacs.1 \
+	mangler.man.stability=committed
 file path=usr/share/man/man1/emacsclient.1
 file path=usr/share/man/man1/grep-changelog.1
 file path=usr/share/man/man1/rcs-checkin.1
--- a/components/emacs/patches/buffer_menu.patch	Fri Feb 10 11:33:07 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-*** emacs-23.1/src/ChangeLog.orig	Wed Oct 14 16:57:29 2009
---- emacs-23.1/src/ChangeLog	Wed Oct 14 17:35:12 2009
-***************
-*** 1,3 ****
---- 1,19 ----
-+ 2009-09-02  Jan Djärv  <[email protected]>
-+ 
-+ 	* xterm.h: Rename x_non_menubar_window_to_frame to
-+ 	x_menubar_window_to_frame
-+ 
-+ 	* xterm.c: Remove declarations also in xterm.h
-+ 	(XTmouse_position): Do not return valid positions
-+ 	for clicks in the menubar and the toolbar for Gtk+.
-+ 
-+ 	* xfns.c (x_any_window_to_frame): Assume less about Gtk+ internals,
-+ 	if the widget for the event has the same top level as a frame,
-+ 	return the frame.
-+ 	(x_menubar_window_to_frame): Detect menu bar even with Gtk+
-+ 	internal windows, bug #4122.
-+ 	(x_non_menubar_window_to_frame): Remove.
-+ 	
-  2009-07-29  Chong Yidong  <[email protected]>
-  
-  	* Version 23.1 released.
-*** emacs-23.1/src/xfns.c.orig	Wed Oct 14 16:50:22 2009
---- emacs-23.1/src/xfns.c	Wed Oct 14 17:35:12 2009
-***************
-*** 374,383 ****
-  #ifdef USE_GTK
-                GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-                if (gwdesc != 0
-!                   && (gwdesc == x->widget
-!                       || gwdesc == x->edit_widget
-!                       || gwdesc == x->vbox_widget
-!                       || gwdesc == x->menubar_widget))
-                  found = f;
-  #else
-  	      if (wdesc == XtWindow (x->widget)
---- 374,380 ----
-  #ifdef USE_GTK
-                GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-                if (gwdesc != 0
-!                   && gtk_widget_get_toplevel(gwdesc) == x->widget)
-                  found = f;
-  #else
-  	      if (wdesc == XtWindow (x->widget)
-***************
-*** 398,451 ****
-    return found;
-  }
-  
-- /* Likewise, but exclude the menu bar widget.  */
-- 
-- struct frame *
-- x_non_menubar_window_to_frame (dpyinfo, wdesc)
--      struct x_display_info *dpyinfo;
--      int wdesc;
-- {
--   Lisp_Object tail, frame;
--   struct frame *f;
--   struct x_output *x;
-- 
--   if (wdesc == None) return 0;
-- 
--   for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
--     {
--       frame = XCAR (tail);
--       if (!FRAMEP (frame))
--         continue;
--       f = XFRAME (frame);
--       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
-- 	continue;
--       x = f->output_data.x;
--       /* This frame matches if the window is any of its widgets.  */
--       if (x->hourglass_window == wdesc)
-- 	return f;
--       else if (x->widget)
-- 	{
-- #ifdef USE_GTK
--           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
--           if (gwdesc != 0
--               && (gwdesc == x->widget
--                   || gwdesc == x->edit_widget
--                   || gwdesc == x->vbox_widget))
--             return f;
-- #else
-- 	  if (wdesc == XtWindow (x->widget)
-- 	      || wdesc == XtWindow (x->column_widget)
-- 	      || wdesc == XtWindow (x->edit_widget))
-- 	    return f;
-- #endif
-- 	}
--       else if (FRAME_X_WINDOW (f) == wdesc)
-- 	/* A tooltip frame.  */
-- 	return f;
--     }
--   return 0;
-- }
-- 
-  /* Likewise, but consider only the menu bar widget.  */
-  
-  struct frame *
---- 395,400 ----
-***************
-*** 473,487 ****
-        if (x->menubar_widget)
-          {
-            GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
--           int found = 0;
-  
-!           BLOCK_INPUT;
-            if (gwdesc != 0
-                && (gwdesc == x->menubar_widget
-!                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
-!             found = 1;
-!           UNBLOCK_INPUT;
-!           if (found) return f;
-          }
-  #else
-        if (x->menubar_widget
---- 422,435 ----
-        if (x->menubar_widget)
-          {
-            GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-  
-! 	  /* This gives false positives, but the rectangle check in xterm.c
-! 	     where this is called takes care of that. */
-            if (gwdesc != 0
-                && (gwdesc == x->menubar_widget
-! 		  || gtk_widget_is_ancestor (x->menubar_widget, gwdesc)
-! 		  || gtk_widget_is_ancestor (gwdesc, x->menubar_widget)))
-! 	    return f;
-          }
-  #else
-        if (x->menubar_widget
-*** emacs-23.1/src/xterm.c.orig	Wed Oct 14 16:37:20 2009
---- emacs-23.1/src/xterm.c	Wed Oct 14 17:35:12 2009
-***************
-*** 109,116 ****
-  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-  
-  extern void free_frame_menubar P_ ((struct frame *));
-- extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *,
-- 						    int));
-  #endif
-  
-  #ifdef USE_X_TOOLKIT
---- 109,114 ----
-***************
-*** 143,153 ****
-  
-  #endif /* USE_X_TOOLKIT */
-  
-- #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
-- #define x_any_window_to_frame x_window_to_frame
-- #define x_top_window_to_frame x_window_to_frame
-- #endif
-- 
-  #ifdef USE_X_TOOLKIT
-  #include "widget.h"
-  #ifndef XtNinitialState
---- 141,146 ----
-***************
-*** 3916,3921 ****
---- 3909,3923 ----
-  		if (child == None || child == win)
-  		  break;
-  
-+ #ifdef USE_GTK
-+ 		/* We don't wan't to know the innermost window.  We
-+ 		   want the edit window.  For non-Gtk+ the innermost
-+ 		   window is the edit window.  For Gtk+ it might not
-+ 		   be.  It might be the tool bar for example.  */
-+ 		if (x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win))
-+ 		  break;
-+ #endif
-+ 
-  		win = child;
-  		parent_x = win_x;
-  		parent_y = win_y;
-***************
-*** 3932,3939 ****
---- 3934,3947 ----
-  	       parent_{x,y} are invalid, but that's okay, because we'll
-  	       never use them in that case.)  */
-  
-+ #ifdef USE_GTK
-+ 	     /* We don't wan't to know the innermost window. We
-+ 		want the edit window. */
-+ 	    f1 = x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
-+ #else
-  	    /* Is win one of our frames?  */
-  	    f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
-+ #endif
-  
-  #ifdef USE_X_TOOLKIT
-  	    /* If we end up with the menu bar window, say it's not
-*** emacs-23.1/src/xterm.h.orig	Wed Oct 14 15:08:03 2009
---- emacs-23.1/src/xterm.h	Wed Oct 14 17:35:12 2009
-***************
-*** 374,380 ****
-  
-  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-  extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
-! extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int));
-  extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
-  #endif
-  
---- 374,380 ----
-  
-  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
-  extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
-! extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int));
-  extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
-  #endif
-  
--- a/components/emacs/patches/dldump.patch	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/patches/dldump.patch	Mon Feb 13 09:15:28 2012 -0700
@@ -1,5 +1,5 @@
-*** emacs-23.1/src/s/sol2-6.h.orig	Wed Oct 14 17:55:32 2009
---- emacs-23.1/src/s/sol2-6.h	Wed Oct 14 17:56:46 2009
+*** emacs-23.4.orig/src/s/sol2-6.h	Mon Oct 17 19:20:46 2011
+--- emacs-23.4/src/s/sol2-6.h	Tue Feb  7 12:38:02 2012
 ***************
 *** 2,11 ****
   
--- a/components/emacs/patches/etags.patch	Fri Feb 10 11:33:07 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-*** emacs-23.1/lib-src/etags.c.orig	Wed May 25 16:16:55 2011
---- emacs-23.1/lib-src/etags.c	Wed May 25 16:18:29 2011
-***************
-*** 6695,6707 ****
-  	      else if (cp[0] != '/')
-  		cp = slashp;
-  #endif
-! 	      strcpy (cp, slashp + 3);
-  	      slashp = cp;
-  	      continue;
-  	    }
-  	  else if (slashp[2] == '/' || slashp[2] == '\0')
-  	    {
-! 	      strcpy (slashp, slashp + 2);
-  	      continue;
-  	    }
-  	}
---- 6695,6707 ----
-  	      else if (cp[0] != '/')
-  		cp = slashp;
-  #endif
-! 	      memmove (cp, slashp + 3, strlen(slashp + 3)  + 1);
-  	      slashp = cp;
-  	      continue;
-  	    }
-  	  else if (slashp[2] == '/' || slashp[2] == '\0')
-  	    {
-! 	      memmove (slashp, slashp + 2, strlen(slashp + 2) + 1);
-  	      continue;
-  	    }
-  	}
--- a/components/emacs/patches/sysmalloc.patch	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/patches/sysmalloc.patch	Mon Feb 13 09:15:28 2012 -0700
@@ -1,5 +1,5 @@
-*** emacs-23.1/src/s/sol2-5.h.orig	Wed Oct 14 17:57:22 2009
---- emacs-23.1/src/s/sol2-5.h	Wed Oct 14 17:58:54 2009
+*** emacs-23.4.orig/src/s/sol2-5.h	Mon Oct 17 19:20:46 2011
+--- emacs-23.4/src/s/sol2-5.h	Tue Feb  7 12:38:02 2012
 ***************
 *** 17,22 ****
 --- 17,23 ----
--- a/components/emacs/patches/xft.patch	Fri Feb 10 11:33:07 2012 -0800
+++ b/components/emacs/patches/xft.patch	Mon Feb 13 09:15:28 2012 -0700
@@ -1,10 +1,12 @@
---- emacs-23.1/configure.orig	Thu Mar  3 12:13:44 2011
-+++ emacs-23.1/configure	Thu Mar  3 12:14:37 2011
[email protected]@ -12863,6 +12863,7 @@
-             { echo "$as_me:$LINENO: checking XFT_LIBS" >&5
- echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
-             XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
-+            XFT_LIBS='-R/usr/lib -lXft -lXrender -lfontconfig -lfreetype -lX11  '
-             { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
- echo "${ECHO_T}$XFT_LIBS" >&6; }
-         else
+*** emacs-23.4.orig/configure	Thu Jan 19 08:01:37 2012
+--- emacs-23.4/configure	Tue Feb  7 12:38:02 2012
+***************
+*** 9283,9288 ****
+--- 9283,9289 ----
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFT_LIBS" >&5
+  $as_echo_n "checking XFT_LIBS... " >&6; }
+              XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
++             XFT_LIBS='-lXft -lXrender -lfontconfig -lfreetype -lX11  '
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFT_LIBS" >&5
+  $as_echo "$XFT_LIBS" >&6; }
+          else