Update emacs to 23.2.

Patches were provided by Makoto Fujiwara in PR 43335.

Excerpt from the announcement:

  In addition to a large number of bugfixes, Emacs 23.2 includes
  several new packages, such as the CEDET suite of development tools
  (including Semantic, a set of libraries and utilities for parsing
  source code, and EDE, a package for managing code projects), and a
  new mode for editing Javascript.  The default mail composition mode
  is now Message mode, which provides features such as MIME handling.
  Many other part of Emacs have also been improved.  For a more
  complete list of changes, see the file etc/NEWS.

12 files changed, 506 insertions, 143 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6d179ab10d4..6bc2f5d386f 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.128 2010/05/15 10:00:57 roy Exp $
+# $NetBSD: Makefile,v 1.129 2010/06/01 21:44:54 minskim Exp $
 
-PKGREVISION=	5
+#PKGREVISION=
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index db089b2e017..44c53ed50c9 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2010/05/05 15:17:50 roy Exp $
+# $NetBSD: Makefile.common,v 1.27 2010/06/01 21:44:54 minskim Exp $
 #
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
@@ -7,7 +7,7 @@ DISTNAME=	emacs-${EMACS_VERSION}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
-MAINTAINER=	markd@NetBSD.org
+MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	GNU editing macros (editor)
 LICENSE=	gnu-gpl-v3
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index 6fa05312eb4..336e1118215 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/08/05 22:04:50 minskim Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/06/01 21:44:54 minskim Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -18,7 +18,10 @@ info/dbus
 info/dired-x
 info/ebrowse
 info/ediff
+info/ede
+info/edt
 info/efaq
+info/eieio
 info/eintr
 info/elisp
 info/emacs
@@ -46,6 +49,7 @@ info/sasl
 info/sc
 info/ses
 info/sieve
+info/semantic
 info/smtpmail
 info/speedbar
 info/tramp
@@ -54,7 +58,6 @@ info/vip
 info/viper
 info/widget
 info/woman
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/fakemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
@@ -73,6 +76,18 @@ man/man1/etags.1
 man/man1/grep-changelog.1
 man/man1/rcs-checkin.1
 share/applications/emacs.desktop
+share/emacs/site-lisp/subdirs.el
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs22.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs22.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs22.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs22.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 share/emacs/${EMACS_VERSION}/etc/AUTHORS
 share/emacs/${EMACS_VERSION}/etc/BABYL
 share/emacs/${EMACS_VERSION}/etc/CENSORSHIP
@@ -254,7 +269,7 @@ share/emacs/${EMACS_VERSION}/etc/e/README
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color.ti
 share/emacs/${EMACS_VERSION}/etc/echo.msg
-share/emacs/${EMACS_VERSION}/etc/edt-user.doc
+share/emacs/${EMACS_VERSION}/etc/edt-user.el
 share/emacs/${EMACS_VERSION}/etc/emacs-buffer.gdb
 share/emacs/${EMACS_VERSION}/etc/emacs.bash
 share/emacs/${EMACS_VERSION}/etc/emacs.csh
@@ -395,6 +410,7 @@ share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-decode.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-post.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-post.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/README
+share/emacs/${EMACS_VERSION}/etc/images/gud/all.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/break.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/break.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/cont.pbm
@@ -415,8 +431,16 @@ share/emacs/${EMACS_VERSION}/etc/images/gud/print.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/print.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/pstar.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/pstar.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rcont.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/recstart.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/recstop.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/remove.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/remove.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rfinish.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rnext.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rnexti.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rstep.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/rstepi.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/run.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/run.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/step.pbm
@@ -425,6 +449,7 @@ share/emacs/${EMACS_VERSION}/etc/images/gud/stepi.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stepi.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stop.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stop.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/thread.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/until.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/until.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/up.pbm
@@ -515,6 +540,15 @@ share/emacs/${EMACS_VERSION}/etc/images/mail/send.pbm
 share/emacs/${EMACS_VERSION}/etc/images/mail/send.xpm
 share/emacs/${EMACS_VERSION}/etc/images/mail/spam.xpm
 share/emacs/${EMACS_VERSION}/etc/images/mh-logo.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/README
+share/emacs/${EMACS_VERSION}/etc/images/mpc/add.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/ffwd.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/next.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/pause.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/play.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/prev.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/rewind.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/stop.xpm
 share/emacs/${EMACS_VERSION}/etc/images/new.pbm
 share/emacs/${EMACS_VERSION}/etc/images/new.xpm
 share/emacs/${EMACS_VERSION}/etc/images/next-node.pbm
@@ -1178,6 +1212,297 @@ share/emacs/${EMACS_VERSION}/lisp/case-table.el.gz
 share/emacs/${EMACS_VERSION}/lisp/case-table.elc
 share/emacs/${EMACS_VERSION}/lisp/cdl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cdl.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-cscope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-cscope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-files.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-files.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-idutils.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-idutils.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/data-debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/data-debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/emacs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/emacs.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/files.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/files.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/linux.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/linux.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/locate.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/locate.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/make.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/make.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/makefile-edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/makefile-edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pconf.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pconf.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pmake.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pmake.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-archive.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-archive.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-aux.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-aux.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-elisp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-elisp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-info.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-info.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-misc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-misc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-obj.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-obj.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-prog.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-prog.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-scheme.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-scheme.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-shared.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-shared.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/project-am.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/project-am.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/shell.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/shell.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/simple.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/simple.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/source.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/source.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/speedbar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/speedbar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/srecode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/srecode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/system.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/system.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/util.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/util.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/inversion.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/inversion.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/mode-local.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/mode-local.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/pulse.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/pulse.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/complete.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/fcn.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/fcn.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/refs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/refs.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/chart.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/chart.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/complete.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ctxt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ctxt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ebrowse.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ebrowse.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-file.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-file.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-javascript.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-javascript.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ref.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ref.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-typecache.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-typecache.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/include.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/include.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/dep.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/dep.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/doc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/doc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ede-grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ede-grammar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/format.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/format.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/fw.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/fw.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/html.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/html.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia-sb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia-sb.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/mru-bookmark.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/mru-bookmark.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sb.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/scope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/scope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/senator.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/senator.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sort.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sort.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/cscope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/cscope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/filter.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/filter.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/grep.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/grep.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/idutils.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/idutils.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/list.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/list.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-file.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-file.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-ls.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-ls.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-write.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-write.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/texi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/texi.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util-modes.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util-modes.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javascript.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javascript.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javat-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javat-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/js-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/js-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/wisent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/wisent.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/args.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/args.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/compile.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/compile.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/cpp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/cpp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/ctxt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/ctxt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/dictionary.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/dictionary.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/document.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/document.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/expandproto.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/expandproto.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/extract.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/extract.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/fields.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/fields.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/filters.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/filters.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/getset.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/getset.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/insert.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/insert.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/java.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/java.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/map.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/map.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/semantic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/semantic.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/table.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/table.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.elc
 share/emacs/${EMACS_VERSION}/lisp/chistory.el.gz
 share/emacs/${EMACS_VERSION}/lisp/chistory.elc
 share/emacs/${EMACS_VERSION}/lisp/cmuscheme.el.gz
@@ -1301,6 +1626,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/check-declare.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/check-declare.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/checkdoc.el.gz
@@ -1337,6 +1664,20 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/easymenu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/easymenu.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-opt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-opt.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-speedbar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-speedbar.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eldoc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eldoc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elint.el.gz
@@ -1357,8 +1698,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/levents.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/levents.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mode.el.gz
@@ -1367,8 +1706,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lmenu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lmenu.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lucid.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lucid.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map-ynp.el.gz
@@ -1620,6 +1957,8 @@ share/emacs/${EMACS_VERSION}/lisp/ffap.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ffap.elc
 share/emacs/${EMACS_VERSION}/lisp/filecache.el.gz
 share/emacs/${EMACS_VERSION}/lisp/filecache.elc
+share/emacs/${EMACS_VERSION}/lisp/files-x.el.gz
+share/emacs/${EMACS_VERSION}/lisp/files-x.elc
 share/emacs/${EMACS_VERSION}/lisp/files.el.gz
 share/emacs/${EMACS_VERSION}/lisp/files.elc
 share/emacs/${EMACS_VERSION}/lisp/filesets.el.gz
@@ -1645,6 +1984,8 @@ share/emacs/${EMACS_VERSION}/lisp/font-core.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-core.elc
 share/emacs/${EMACS_VERSION}/lisp/font-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-lock.elc
+share/emacs/${EMACS_VERSION}/lisp/font-setting.el.gz
+share/emacs/${EMACS_VERSION}/lisp/font-setting.elc
 share/emacs/${EMACS_VERSION}/lisp/format-spec.el.gz
 share/emacs/${EMACS_VERSION}/lisp/format-spec.elc
 share/emacs/${EMACS_VERSION}/lisp/format.el.gz
@@ -1939,6 +2280,8 @@ share/emacs/${EMACS_VERSION}/lisp/hex-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hex-util.elc
 share/emacs/${EMACS_VERSION}/lisp/hexl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hexl.elc
+share/emacs/${EMACS_VERSION}/lisp/hfy-cmap.el.gz
+share/emacs/${EMACS_VERSION}/lisp/hfy-cmap.elc
 share/emacs/${EMACS_VERSION}/lisp/hi-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hi-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/hilit-chg.el.gz
@@ -1947,6 +2290,8 @@ share/emacs/${EMACS_VERSION}/lisp/hippie-exp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hippie-exp.elc
 share/emacs/${EMACS_VERSION}/lisp/hl-line.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hl-line.elc
+share/emacs/${EMACS_VERSION}/lisp/htmlfontify.el.gz
+share/emacs/${EMACS_VERSION}/lisp/htmlfontify.elc
 share/emacs/${EMACS_VERSION}/lisp/ibuf-ext.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ibuf-ext.elc
 share/emacs/${EMACS_VERSION}/lisp/ibuf-macs.el.gz
@@ -1988,8 +2333,6 @@ share/emacs/${EMACS_VERSION}/lisp/international/characters.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/characters.elc
 share/emacs/${EMACS_VERSION}/lisp/international/charprop.el
 share/emacs/${EMACS_VERSION}/lisp/international/cp51932.el
-share/emacs/${EMACS_VERSION}/lisp/international/encoded-kb.el.gz
-share/emacs/${EMACS_VERSION}/lisp/international/encoded-kb.elc
 share/emacs/${EMACS_VERSION}/lisp/international/eucjp-ms.el
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.elc
@@ -2015,7 +2358,8 @@ share/emacs/${EMACS_VERSION}/lisp/international/latin1-disp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/latin1-disp.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-cmds.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/mule-cmds.elc
-share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.el
+share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-diag.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/mule-diag.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-util.el.gz
@@ -2030,6 +2374,8 @@ share/emacs/${EMACS_VERSION}/lisp/international/robin.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/robin.elc
 share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.elc
+share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.elc
 share/emacs/${EMACS_VERSION}/lisp/international/uni-bidi.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-category.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-combining.el
@@ -2292,6 +2638,8 @@ share/emacs/${EMACS_VERSION}/lisp/mouse-sel.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse-sel.elc
 share/emacs/${EMACS_VERSION}/lisp/mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse.elc
+share/emacs/${EMACS_VERSION}/lisp/mpc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/mpc.elc
 share/emacs/${EMACS_VERSION}/lisp/msb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/msb.elc
 share/emacs/${EMACS_VERSION}/lisp/mwheel.el.gz
@@ -2330,6 +2678,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/hmac-def.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-def.elc
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-md5.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-md5.elc
+share/emacs/${EMACS_VERSION}/lisp/net/imap-hash.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/imap-hash.elc
 share/emacs/${EMACS_VERSION}/lisp/net/imap.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/imap.elc
 share/emacs/${EMACS_VERSION}/lisp/net/ldap.el.gz
@@ -2388,8 +2738,12 @@ share/emacs/${EMACS_VERSION}/lisp/net/tramp-fish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-fish.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-ftp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-ftp.elc
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-gvfs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-gvfs.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-gw.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-gw.elc
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-imap.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-imap.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-smb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-smb.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-uu.el.gz
@@ -2408,7 +2762,6 @@ share/emacs/${EMACS_VERSION}/lisp/newcomment.el.gz
 share/emacs/${EMACS_VERSION}/lisp/newcomment.elc
 share/emacs/${EMACS_VERSION}/lisp/novice.el.gz
 share/emacs/${EMACS_VERSION}/lisp/novice.elc
-share/emacs/${EMACS_VERSION}/lisp/nxml/TODO
 share/emacs/${EMACS_VERSION}/lisp/nxml/nxml-enc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/nxml-enc.elc
 share/emacs/${EMACS_VERSION}/lisp/nxml/nxml-glyph.el.gz
@@ -2453,6 +2806,7 @@ share/emacs/${EMACS_VERSION}/lisp/nxml/rng-valid.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/rng-valid.elc
 share/emacs/${EMACS_VERSION}/lisp/nxml/rng-xsd.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/rng-xsd.elc
+share/emacs/${EMACS_VERSION}/lisp/nxml/TODO
 share/emacs/${EMACS_VERSION}/lisp/nxml/xmltok.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/xmltok.elc
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.el.gz
@@ -2470,6 +2824,10 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-swed.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/keyswap.el
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.el.gz
@@ -2486,6 +2844,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/x-menu.el.gz
@@ -2494,6 +2854,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-agenda.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-agenda.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-archive.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-archive.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-ascii.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-ascii.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.el.gz
@@ -2506,26 +2868,48 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-colview.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-colview.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-export-latex.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-export-latex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-faces.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-faces.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-feed.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-feed.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-footnote.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-footnote.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-freemind.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-freemind.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-gnus.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-gnus.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-habit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-habit.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-html.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-html.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-icalendar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-icalendar.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-id.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-id.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-indent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-indent.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-info.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-info.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-install.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-install.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-jsinfo.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-jsinfo.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-latex.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-latex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mac-message.el.gz
@@ -2536,28 +2920,36 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-mew.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mew.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mhe.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mhe.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-mobile.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-mobile.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mouse.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-plot.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-plot.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-protocol.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-protocol.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-publish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-publish.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-remember.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-remember.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-rmail.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-rmail.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-src.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-src.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-table.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-table.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-timer.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-timer.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-wl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-wl.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-xoxo.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-xoxo.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-timer.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-timer.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.elc
 share/emacs/${EMACS_VERSION}/lisp/outline.el.gz
 share/emacs/${EMACS_VERSION}/lisp/outline.elc
 share/emacs/${EMACS_VERSION}/lisp/paren.el.gz
@@ -2703,8 +3095,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-styles.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-styles.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-subword.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-subword.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-vars.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-vars.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cfengine.el.gz
@@ -2777,6 +3167,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/idlwave.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/idlwave.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/inf-lisp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/inf-lisp.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/js.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/js.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ld-script.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ld-script.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/m4-mode.el.gz
@@ -2815,8 +3207,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/simula.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/simula.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/sql.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/sql.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/sym-comp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/sym-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/subword.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/subword.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/tcl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/tcl.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/vera-mode.el.gz
@@ -2918,9 +3310,9 @@ share/emacs/${EMACS_VERSION}/lisp/tempo.el.gz
 share/emacs/${EMACS_VERSION}/lisp/tempo.elc
 share/emacs/${EMACS_VERSION}/lisp/term.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term.elc
-share/emacs/${EMACS_VERSION}/lisp/term/AT386.el
 share/emacs/${EMACS_VERSION}/lisp/term/README
 share/emacs/${EMACS_VERSION}/lisp/term/apollo.el
+share/emacs/${EMACS_VERSION}/lisp/term/AT386.el
 share/emacs/${EMACS_VERSION}/lisp/term/bobcat.el
 share/emacs/${EMACS_VERSION}/lisp/term/common-win.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/common-win.elc
@@ -3210,15 +3602,3 @@ share/emacs/${EMACS_VERSION}/lisp/xml.elc
 share/emacs/${EMACS_VERSION}/lisp/xt-mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/xt-mouse.elc
 share/emacs/${EMACS_VERSION}/site-lisp/subdirs.el
-share/emacs/site-lisp/subdirs.el
-share/icons/hicolor/128x128/apps/emacs.png
-share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/16x16/apps/emacs22.png
-share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/24x24/apps/emacs22.png
-share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/32x32/apps/emacs22.png
-share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/48x48/apps/emacs22.png
-share/icons/hicolor/scalable/apps/emacs.svg
-share/icons/hicolor/scalable/mimetypes/emacs-document.svg
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 8ce464a3282..97753007069 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.45 2010/05/15 10:00:57 roy Exp $
+$NetBSD: distinfo,v 1.46 2010/06/01 21:44:54 minskim Exp $
 
-SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51
-RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4
-Size (emacs-23.1.tar.gz) = 42904117 bytes
-SHA1 (patch-aa) = 3e65b93fad3fb436ec573148e5681333d1c58e3a
-SHA1 (patch-ab) = dcd6903d62b58b5c587001b26f0d300bcb54fe6d
-SHA1 (patch-ac) = 9afbc10d2bd0f32cdfde8ae6a32236182dbac558
-SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6
-SHA1 (patch-af) = c888cd3863e533d38f437292d9f800bcd3159529
+SHA1 (emacs-23.2.tar.gz) = 2f99c7111c232cf04410607698d2db842e305c82
+RMD160 (emacs-23.2.tar.gz) = 6d25f8d12cfa23e413ea353933ed871a3d3aa08e
+Size (emacs-23.2.tar.gz) = 46831697 bytes
+SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
+SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
+SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
+SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk
index e2d334b8b25..68091dda7f0 100644
--- a/editors/emacs/options.mk
+++ b/editors/emacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2009/08/05 22:04:50 minskim Exp $
+# $NetBSD: options.mk,v 1.10 2010/06/01 21:44:54 minskim Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--without-dbus
 ###
 ### Support SVG
 ###
-.  if !empty(PKG_OPTIONS:Msvg)
+.  if !empty(PKG_OPTIONS:Msvg) && empty(PKG_OPTIONS:Mnextstep)
 .include "../../graphics/librsvg/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-rsvg
diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa
index febdb6f8e5d..945f0ddc303 100644
--- a/editors/emacs/patches/patch-aa
+++ b/editors/emacs/patches/patch-aa
@@ -1,17 +1,39 @@
-$NetBSD: patch-aa,v 1.16 2009/10/07 10:56:40 obache Exp $
+$NetBSD: patch-aa,v 1.17 2010/06/01 21:44:54 minskim Exp $
 
---- configure.in.orig	2009-07-30 00:09:49.000000000 +0900
-+++ configure.in
-@@ -329,9 +329,9 @@ dnl see the `changequote' comment above.
-     case "${canonical}" in
-       alpha*-*-netbsd*)	machine=alpha ;;
-       i[3456]86-*-netbsd*) machine=intel386 ;;
--      mips-*-netbsd*)	machine=pmax ;;
--      mipsel-*-netbsd*)	machine=pmax ;;
--      mipseb-*-netbsd*)	machine=pmax ;;
-+      mips-*-netbsd*)	machine=mips ;;
-+      mipsel-*-netbsd*)	machine=mips ;;
-+      mipseb-*-netbsd*)	machine=mips ;;
-       powerpc-*-netbsd*) machine=macppc ;;
-       sparc*-*-netbsd*)	machine=sparc ;;
-       vax-*-netbsd*)	machine=vax ;;
+--- work/emacs-23.2/configure.in~	2010-05-08 12:09:12.000000000 +0900
++++ ./configure.in	2010-05-12 20:23:07.000000000 +0900
+@@ -39,7 +39,7 @@
+ docdir='${datadir}/emacs/${version}/etc'
+ gamedir='${localstatedir}/games/emacs'
+ 
+-gameuser=games
++gameuser=${GAMEOWN}
+ 
+ dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
+ dnl Create a new --with option that defaults to being disabled.
+@@ -387,6 +387,14 @@
+       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
+     esac
+   ;;
++  ## DragonFly ports
++  *-*-dragonfly*)
++    opsys=dragonfly
++    case "${canonical}" in
++      i[3456]86-*-dragonfly*)     machine=intel386 ;;
++      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
++    esac
++  ;;
+ 
+   ## FreeBSD kernel + glibc based userland
+   *-*-kfreebsd*gnu* )
+@@ -1391,9 +1399,9 @@
+   window_system=nextstep
+   with_xft=no
+   # set up packaging dirs
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+      prefix=${ns_appresdir}
+   fi
+ fi
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index 01398ecaded..3b51be24b7a 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.28 2009/10/07 10:56:40 obache Exp $
+$NetBSD: patch-ab,v 1.29 2010/06/01 21:44:54 minskim Exp $
 
---- configure.orig	2009-07-30 00:12:00.000000000 +0900
-+++ configure
-@@ -1856,7 +1856,7 @@ archlibdir='${libexecdir}/emacs/${versio
+--- work/emacs-23.2/configure.orig	2010-05-08 12:10:16.000000000 +0900
++++ configure	2010-05-12 20:32:23.000000000 +0900
+@@ -1995,7 +1995,7 @@
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,10 +11,10 @@ $NetBSD: patch-ab,v 1.28 2009/10/07 10:56:40 obache Exp $
  
  
  
-@@ -2406,6 +2406,15 @@ case "${canonical}" in
+@@ -2652,6 +2652,14 @@
+       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
      esac
    ;;
- 
 +  ## DragonFly ports
 +  *-*-dragonfly*)
 +    opsys=dragonfly
@@ -23,32 +23,17 @@ $NetBSD: patch-ab,v 1.28 2009/10/07 10:56:40 obache Exp $
 +      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
 +    esac
 +  ;;
-+
+ 
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
-     opsys=gnu-kfreebsd
-@@ -2434,9 +2443,9 @@ _ACEOF
-     case "${canonical}" in
-       alpha*-*-netbsd*)	machine=alpha ;;
-       i[3456]86-*-netbsd*) machine=intel386 ;;
--      mips-*-netbsd*)	machine=pmax ;;
--      mipsel-*-netbsd*)	machine=pmax ;;
--      mipseb-*-netbsd*)	machine=pmax ;;
-+      mips-*-netbsd*)	machine=mips ;;
-+      mipsel-*-netbsd*)	machine=mips ;;
-+      mipseb-*-netbsd*)	machine=mips ;;
-       powerpc-*-netbsd*) machine=macppc ;;
-       sparc*-*-netbsd*)	machine=sparc ;;
-       vax-*-netbsd*)	machine=vax ;;
-@@ -9408,9 +9417,9 @@ if test "${HAVE_NS}" = yes; then
+@@ -9849,9 +9857,9 @@
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
       prefix=${ns_appresdir}
    fi
  fi
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
deleted file mode 100644
index e920835781f..00000000000
--- a/editors/emacs/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2009/10/07 10:56:40 obache Exp $
-
---- src/m/alpha.h.orig	2009-06-21 13:38:20.000000000 +0900
-+++ src/m/alpha.h
-@@ -95,7 +95,7 @@ NOTE-END
- 
- #undef UNEXEC
- #define UNEXEC unexelf.o
--#ifndef GNU_LINUX
-+#if !defined(GNU_LINUX) && !defined(__NetBSD__)
- #define DATA_START    0x140000000
- #endif
- 
diff --git a/editors/emacs/patches/patch-ad b/editors/emacs/patches/patch-ad
new file mode 100644
index 00000000000..4fc80f319de
--- /dev/null
+++ b/editors/emacs/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.9 2010/06/01 21:44:54 minskim Exp $
+
+--- lisp/cus-dep.el.orig	2010-04-03 22:26:07.000000000 +0000
++++ lisp/cus-dep.el
+@@ -59,6 +59,7 @@ Usage: emacs -batch -l ./cus-dep.el -f c
+             (unless (or (string-match custom-dependencies-no-scan-regexp file)
+                         (string-match preloaded file)
+                         (not (file-exists-p file)))
++	      (message file)
+               (erase-buffer)
+               (insert-file-contents file)
+               (goto-char (point-min))
diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae
index cd7dc819fe6..a4f6f79dc4e 100644
--- a/editors/emacs/patches/patch-ae
+++ b/editors/emacs/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.13 2009/08/06 04:46:04 minskim Exp $
+$NetBSD: patch-ae,v 1.14 2010/06/01 21:44:54 minskim Exp $
 
---- Makefile.in.orig	2009-06-20 21:36:54.000000000 -0700
-+++ Makefile.in
-@@ -141,7 +141,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.
+--- Makefile.in.orig	2010-04-04 07:26:08.000000000 +0900
++++ Makefile.in	2010-05-14 21:51:03.000000000 +0900
+@@ -141,7 +141,7 @@
  infodir=@infodir@
  INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse	\
-            ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc	\
--           flymake forms gnus idlwave info mairix-el message mh-e	\
-+           flymake forms gnus idlwave mairix-el message mh-e	\
-            newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember	\
-            sasl sc ses sieve smtpmail speedbar tramp url vip viper	\
-            widget woman
-@@ -403,7 +403,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP
+            ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
+-	   eshell eudc flymake forms gnus idlwave info mairix-el	\
++	   eshell eudc flymake forms gnus idlwave mairix-el	\
+ 	   message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc	\
+ 	   reftex remember sasl sc semantic ses sieve smtpmail speedbar \
+ 	   tramp url vip viper widget woman
+@@ -403,7 +403,7 @@
  install: all install-arch-indep install-arch-dep install-leim blessmail
  	@true
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.13 2009/08/06 04:46:04 minskim Exp $
  
  ### Install the executables that were compiled specifically for this machine.
  ### It would be nice to do something for a parallel make
-@@ -572,21 +572,11 @@ install-arch-indep: mkdir info install-e
+@@ -574,21 +574,11 @@
  	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
  	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
  	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
@@ -38,8 +38,8 @@ $NetBSD: patch-ae,v 1.13 2009/08/06 04:46:04 minskim Exp $
 -	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 -	  done; \
 -	else true; fi
--	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
-+	chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
+-	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
++	chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
  	thisdir=`/bin/pwd`; \
  	cd ${mansrcdir}; \
  	for page in ${MAN_PAGES}; do \
diff --git a/editors/emacs/patches/patch-af b/editors/emacs/patches/patch-af
deleted file mode 100644
index ca981d7ae9f..00000000000
--- a/editors/emacs/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.13 2009/10/07 10:56:40 obache Exp $
-
---- src/m/mips.h.orig	2009-06-21 13:38:20.000000000 +0900
-+++ src/m/mips.h
-@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see <http
-    USUAL-OPSYS="note"
- 
- NOTE-START
--This is only used on GNU/Linux.
-+This is used on GNU/Linux and netbsd.
- NOTE-END  */
- 
- /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-@@ -50,7 +50,7 @@ NOTE-END  */
- 
- #define TEXT_START      0x00400000
- 
--#ifndef GNU_LINUX
-+#if !defined(GNU_LINUX) && !defined(__NetBSD__)
- #define DATA_START      0x10000000
- #endif
- 
diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk
index d3d6de831ef..348753cdaa5 100644
--- a/editors/emacs/version.mk
+++ b/editors/emacs/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.3 2009/08/05 22:04:50 minskim Exp $
+# $NetBSD: version.mk,v 1.4 2010/06/01 21:44:54 minskim Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23
 
 _EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	1
+_EMACS_VERSION_MINOR=	2