Update emacs-snapshot to 20110224.

- Reorganize icon directories and files.
- Obsolete packages: pc-mode, pc-select, pgg, spell, and sregex.
- Import modules from gnulib: filemode, crypto/md5, stdint,
  getloadavg, and strftime.

7 files changed, 120 insertions, 90 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 732272fa4b3..a4177cbaaf7 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2011/01/13 13:53:25 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/03/01 04:12:45 minskim Exp $
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
 .include "../../editors/emacs-snapshot/Makefile.common"
-PKGREVISION=	1
 
 .include "options.mk"
 
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index b268f36e2e6..ad9c6de07b5 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.22 2010/12/08 22:00:11 minskim Exp $
+# $NetBSD: Makefile.common,v 1.23 2011/03/01 04:12:45 minskim Exp $
 
-DISTNAME=	emacs-snapshot_20101204.orig
+DISTNAME=	emacs-snapshot_20110224.orig
 PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=	editors
-MASTER_SITES=	http://emacs.orebokech.com/pool/main/e/emacs-snapshot/
-EXTRACT_SUFX=	.tar.lzma
+MASTER_SITES=	http://emacs.naquadah.org/unstable/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
@@ -20,11 +20,11 @@ CONFLICTS+=	emacs-nox11-[0-9]*
 GNU_CONFIGURE=	yes
 INFO_FILES=	yes
 USE_TOOLS+=	gmake makeinfo gzip
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/\.[0-9]*$//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
 
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN}
+CONFIGURE_ARGS+=	--with-gameuser=${GAMEOWN}
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index 7dc5a56dc5d..4ef25d19f64 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/12/08 22:00:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/03/01 04:12:45 minskim Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -27,6 +27,7 @@ info/emacs-mime
 info/emacs
 info/epa
 info/erc
+info/ert
 info/eshell
 info/eudc
 info/flymake
@@ -445,6 +446,50 @@ share/emacs/${EMACS_VERSION}/etc/images/help.xpm
 share/emacs/${EMACS_VERSION}/etc/images/home.pbm
 share/emacs/${EMACS_VERSION}/etc/images/home.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/README
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/hicolor/128x128/apps/emacs.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/hicolor/16x16/apps/emacs.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/hicolor/16x16/apps/emacs22.png
@@ -880,8 +925,11 @@ share/emacs/${EMACS_VERSION}/etc/srecode/template.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/test.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/texi.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/wisent.srt
+share/emacs/${EMACS_VERSION}/etc/themes/light-blue-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/tango-dark-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/tango-theme.el
+share/emacs/${EMACS_VERSION}/etc/themes/tsdh-dark-theme.el
+share/emacs/${EMACS_VERSION}/etc/themes/tsdh-light-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/wheatgrass-theme.el
 share/emacs/${EMACS_VERSION}/etc/tutorials/TUTORIAL
 share/emacs/${EMACS_VERSION}/etc/tutorials/TUTORIAL.bg
@@ -910,30 +958,23 @@ share/emacs/${EMACS_VERSION}/etc/yow.lines
 share/emacs/${EMACS_VERSION}/leim/ja-dic/ja-dic.el.gz
 share/emacs/${EMACS_VERSION}/leim/ja-dic/ja-dic.elc
 share/emacs/${EMACS_VERSION}/leim/leim-list.el
-share/emacs/${EMACS_VERSION}/leim/quail/4Corner.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/4Corner.elc
-share/emacs/${EMACS_VERSION}/leim/quail/ARRAY30.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/ARRAY30.elc
+share/emacs/${EMACS_VERSION}/leim/quail/4Corner.el
+share/emacs/${EMACS_VERSION}/leim/quail/ARRAY30.el
 share/emacs/${EMACS_VERSION}/leim/quail/CCDOSPY.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/CCDOSPY.elc
 share/emacs/${EMACS_VERSION}/leim/quail/CTLau-b5.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/CTLau-b5.elc
 share/emacs/${EMACS_VERSION}/leim/quail/CTLau.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/CTLau.elc
-share/emacs/${EMACS_VERSION}/leim/quail/ECDICT.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/ECDICT.elc
-share/emacs/${EMACS_VERSION}/leim/quail/ETZY.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/ETZY.elc
-share/emacs/${EMACS_VERSION}/leim/quail/PY-b5.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/PY-b5.elc
+share/emacs/${EMACS_VERSION}/leim/quail/ECDICT.el
+share/emacs/${EMACS_VERSION}/leim/quail/ETZY.el
+share/emacs/${EMACS_VERSION}/leim/quail/PY-b5.el
 share/emacs/${EMACS_VERSION}/leim/quail/PY.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/PY.elc
-share/emacs/${EMACS_VERSION}/leim/quail/Punct-b5.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/Punct-b5.elc
+share/emacs/${EMACS_VERSION}/leim/quail/Punct-b5.el
 share/emacs/${EMACS_VERSION}/leim/quail/Punct.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/Punct.elc
-share/emacs/${EMACS_VERSION}/leim/quail/QJ-b5.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/QJ-b5.elc
+share/emacs/${EMACS_VERSION}/leim/quail/QJ-b5.el
 share/emacs/${EMACS_VERSION}/leim/quail/QJ.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/QJ.elc
 share/emacs/${EMACS_VERSION}/leim/quail/SW.el.gz
@@ -942,8 +983,7 @@ share/emacs/${EMACS_VERSION}/leim/quail/TONEPY.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/TONEPY.elc
 share/emacs/${EMACS_VERSION}/leim/quail/ZIRANMA.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/ZIRANMA.elc
-share/emacs/${EMACS_VERSION}/leim/quail/ZOZY.el.gz
-share/emacs/${EMACS_VERSION}/leim/quail/ZOZY.elc
+share/emacs/${EMACS_VERSION}/leim/quail/ZOZY.el
 share/emacs/${EMACS_VERSION}/leim/quail/arabic.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/arabic.elc
 share/emacs/${EMACS_VERSION}/leim/quail/croatian.el.gz
@@ -1030,6 +1070,8 @@ share/emacs/${EMACS_VERSION}/lisp/abbrevlist.el.gz
 share/emacs/${EMACS_VERSION}/lisp/abbrevlist.elc
 share/emacs/${EMACS_VERSION}/lisp/align.el.gz
 share/emacs/${EMACS_VERSION}/lisp/align.elc
+share/emacs/${EMACS_VERSION}/lisp/allout-widgets.el.gz
+share/emacs/${EMACS_VERSION}/lisp/allout-widgets.elc
 share/emacs/${EMACS_VERSION}/lisp/allout.el.gz
 share/emacs/${EMACS_VERSION}/lisp/allout.elc
 share/emacs/${EMACS_VERSION}/lisp/ansi-color.el.gz
@@ -1515,6 +1557,8 @@ share/emacs/${EMACS_VERSION}/lisp/chistory.el.gz
 share/emacs/${EMACS_VERSION}/lisp/chistory.elc
 share/emacs/${EMACS_VERSION}/lisp/cmuscheme.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cmuscheme.elc
+share/emacs/${EMACS_VERSION}/lisp/color.el.gz
+share/emacs/${EMACS_VERSION}/lisp/color.elc
 share/emacs/${EMACS_VERSION}/lisp/comint.el.gz
 share/emacs/${EMACS_VERSION}/lisp/comint.elc
 share/emacs/${EMACS_VERSION}/lisp/completion.el.gz
@@ -1660,6 +1704,10 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elint.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elint.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ert-x.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ert-x.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ert.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ert.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ewoc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ewoc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/find-func.el.gz
@@ -1706,8 +1754,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-ses.el.gz
@@ -1748,10 +1794,6 @@ share/emacs/${EMACS_VERSION}/lisp/emulation/edt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/edt.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/pc-mode.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/pc-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/pc-select.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/pc-select.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-extras.el.gz
@@ -1983,8 +2025,6 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/auth-source.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/auth-source.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/canlock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/canlock.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/color.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/color.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/compface.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/compface.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/deuglify.el.gz
@@ -2207,10 +2247,10 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/rtree.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/rtree.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/score-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/score-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/shr.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/shr.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/shr-color.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/shr-color.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/shr.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/shr.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/sieve-manage.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/sieve-manage.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/sieve-mode.el.gz
@@ -2648,8 +2688,6 @@ 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
@@ -2694,6 +2732,10 @@ share/emacs/${EMACS_VERSION}/lisp/net/secrets.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/secrets.elc
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/net/soap-client.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/soap-client.elc
+share/emacs/${EMACS_VERSION}/lisp/net/soap-inspect.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/soap-inspect.elc
 share/emacs/${EMACS_VERSION}/lisp/net/socks.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/socks.elc
 share/emacs/${EMACS_VERSION}/lisp/net/telnet.el.gz
@@ -2712,8 +2754,6 @@ 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-loaddefs.el
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-sh.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-sh.elc
@@ -2812,12 +2852,32 @@ 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
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-select.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-select.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-def.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-def.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-gpg.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-gpg.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-parse.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-parse.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-pgp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-pgp.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-pgp5.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg-pgp5.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/pgg.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/resume.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/resume.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/spell.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/spell.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sregex.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sregex.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
@@ -2924,6 +2984,8 @@ 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-complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-complete.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-ctags.el.gz
@@ -3036,18 +3098,6 @@ share/emacs/${EMACS_VERSION}/lisp/pcmpl-unix.el.gz
 share/emacs/${EMACS_VERSION}/lisp/pcmpl-unix.elc
 share/emacs/${EMACS_VERSION}/lisp/pcomplete.el.gz
 share/emacs/${EMACS_VERSION}/lisp/pcomplete.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg-def.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg-def.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg-gpg.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg-gpg.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg-parse.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg-parse.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg-pgp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg-pgp.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg-pgp5.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg-pgp5.elc
-share/emacs/${EMACS_VERSION}/lisp/pgg.el.gz
-share/emacs/${EMACS_VERSION}/lisp/pgg.elc
 share/emacs/${EMACS_VERSION}/lisp/play/5x5.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/5x5.elc
 share/emacs/${EMACS_VERSION}/lisp/play/animate.el.gz
@@ -3482,8 +3532,6 @@ share/emacs/${EMACS_VERSION}/lisp/textmodes/rst.el.gz
 share/emacs/${EMACS_VERSION}/lisp/textmodes/rst.elc
 share/emacs/${EMACS_VERSION}/lisp/textmodes/sgml-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/textmodes/sgml-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/textmodes/spell.el.gz
-share/emacs/${EMACS_VERSION}/lisp/textmodes/spell.elc
 share/emacs/${EMACS_VERSION}/lisp/textmodes/table.el.gz
 share/emacs/${EMACS_VERSION}/lisp/textmodes/table.elc
 share/emacs/${EMACS_VERSION}/lisp/textmodes/tex-mode.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index e59599beb0e..9c7d95a0eba 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.26 2010/12/08 22:00:11 minskim Exp $
+$NetBSD: distinfo,v 1.27 2011/03/01 04:12:45 minskim Exp $
 
-SHA1 (emacs-snapshot_20101204.orig.tar.lzma) = 42c65e8ebe0bebd0f33f15bc4b9fecb28877168e
-RMD160 (emacs-snapshot_20101204.orig.tar.lzma) = 05e5f869e3093cddddccb5cd58de335aca7e5d5f
-Size (emacs-snapshot_20101204.orig.tar.lzma) = 22875944 bytes
-SHA1 (patch-aa) = de76919bedcdfaffe567bc80633a9e908714ec2b
-SHA1 (patch-ab) = f40d65cdbce564de8f7f5a5f8ec64f9ab747d157
-SHA1 (patch-ac) = e3d87b7227054652fc84cc485c98e933e2a602b3
+SHA1 (emacs-snapshot_20110224.orig.tar.xz) = 252c326bca5cc4d34d52b97ed55cfcbd112cc433
+RMD160 (emacs-snapshot_20110224.orig.tar.xz) = 08bdf944aae915e428d3562c03e78e76e564758a
+Size (emacs-snapshot_20110224.orig.tar.xz) = 23023120 bytes
+SHA1 (patch-aa) = 052ea84f7e3b35d1aba08bd641d7250ec07d09aa
+SHA1 (patch-ab) = 51614c9337f77e39dab410faf78b95d8b9b6e381
+SHA1 (patch-ac) = cbc72f45d6648b3ab7f76af8d5a2156fd154b16a
 SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
+SHA1 (patch-ae) = 7c9d5dd240590446d82dfd35858c29f4387f87ed
 SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa
index 270d87db2ef..a7165f7b2f0 100644
--- a/editors/emacs-snapshot/patches/patch-aa
+++ b/editors/emacs-snapshot/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2010/06/07 22:44:01 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2011/03/01 04:12:45 minskim Exp $
 
 --- configure.in.orig	2010-06-02 16:53:45.000000000 +0000
 +++ configure.in
-@@ -45,7 +45,7 @@ archlibdir='${libexecdir}/emacs/${versio
- 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.
 @@ -403,6 +403,14 @@ case "${canonical}" in
        sparc64-*)        machine=sparc ;;
      esac
diff --git a/editors/emacs-snapshot/patches/patch-ab b/editors/emacs-snapshot/patches/patch-ab
index 786cc234883..0c4cb8407f8 100644
--- a/editors/emacs-snapshot/patches/patch-ab
+++ b/editors/emacs-snapshot/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2010/06/07 22:44:01 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2011/03/01 04:12:45 minskim Exp $
 
 --- configure.orig	2010-06-07 21:57:22.000000000 +0000
 +++ configure
-@@ -2523,7 +2523,7 @@ archlibdir='${libexecdir}/emacs/${versio
- docdir='${datadir}/emacs/${version}/etc'
- gamedir='${localstatedir}/games/emacs'
- 
--gameuser=games
-+gameuser=${GAMEOWN}
- 
- 
- 
 @@ -3158,6 +3158,14 @@ case "${canonical}" in
        sparc64-*)        machine=sparc ;;
      esac
diff --git a/editors/emacs-snapshot/patches/patch-ac b/editors/emacs-snapshot/patches/patch-ac
index 53abbf9dd82..22eb2d61f5a 100644
--- a/editors/emacs-snapshot/patches/patch-ac
+++ b/editors/emacs-snapshot/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2010/06/14 23:58:18 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2011/03/01 04:12:45 minskim Exp $
 
---- Makefile.in.orig	2010-06-12 12:32:17.000000000 +0000
+--- Makefile.in.orig	2011-02-24 08:45:25.000000000 +0000
 +++ Makefile.in
-@@ -135,7 +135,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.
+@@ -132,7 +132,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emac
  infodir=@infodir@
  INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse	\
             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	\
+-	   ert eshell eudc flymake forms gnus idlwave info mairix-el	\
++	   ert 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
-@@ -409,7 +409,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP
+@@ -455,7 +455,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP
  install: all install-arch-indep install-arch-dep install-leim blessmail
  	@true
  
@@ -20,15 +20,15 @@ $NetBSD: patch-ac,v 1.3 2010/06/14 23:58:18 minskim Exp $
  
  ### Install the executables that were compiled specifically for this machine.
  ### It would be nice to do something for a parallel make
-@@ -581,7 +581,6 @@ install-arch-indep: mkdir info install-e
- 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+@@ -621,7 +621,6 @@ install-arch-indep: mkdir info install-e
+ 	      test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
  	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
  	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
 -	        chmod a+r $(DESTDIR)${infodir}/$$f; \
  	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
  	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
  	          ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -590,16 +589,7 @@ install-arch-indep: mkdir info install-e
+@@ -630,16 +629,7 @@ install-arch-indep: mkdir info install-e
  	   done); \
  	else true; fi
  	-unset CDPATH; \
@@ -36,7 +36,7 @@ $NetBSD: patch-ac,v 1.3 2010/06/14 23:58:18 minskim Exp $
 -	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
 -	then \
 -	  for elt in $(INFO_FILES); do \
--	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+-	    test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
 -	    (cd $${thisdir}; \
 -	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 -	  done; \