Index: Makefile.common
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/Makefile.common,v
retrieving revision 1.25
diff -u -r1.25 Makefile.common
--- Makefile.common	21 Mar 2011 00:07:45 -0000	1.25
+++ Makefile.common	16 Apr 2011 22:41:05 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.25 2011/03/21 00:07:45 minskim Exp $
 
-DISTNAME=	emacs-snapshot_20110316.orig
+DISTNAME=	emacs-snapshot_20110408.orig
 PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=	editors
 MASTER_SITES=	http://emacs.naquadah.org/unstable/
@@ -19,7 +19,7 @@
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	yes
-USE_TOOLS+=	gmake makeinfo gzip
+USE_TOOLS+=	automake autoconf gmake makeinfo gzip
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
 
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
@@ -28,6 +28,8 @@
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
+BUILD_DEFS+=		GAMES_USER
+BUILD_DEFS+=		GAMES_GROUP
 PLIST_SRC+=		../../editors/emacs-snapshot/PLIST
 
 .include "../../editors/emacs-snapshot/version.mk"
@@ -72,3 +74,6 @@
 	cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 	${CHMOD} -R go-w ${WRKSRC}
+
+pre-configure:
+	(cd ${WRKSRC}; ./autogen.sh)
Index: PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- PLIST	10 Mar 2011 01:28:48 -0000	1.19
+++ PLIST	16 Apr 2011 22:37:05 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2011/03/10 01:28:48 minskim Exp $
+@comment $NetBSD$
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -7,57 +7,57 @@
 bin/etags
 bin/grep-changelog
 bin/rcs-checkin
-info/ada-mode
-info/auth
-info/autotype
-info/calc
-info/ccmode
-info/cl
-info/dbus
-info/dired-x
-info/ebrowse
-info/ede
-info/ediff
-info/edt
-info/efaq
-info/eieio
-info/eintr
-info/elisp
-info/emacs-mime
-info/emacs
-info/epa
-info/erc
-info/ert
-info/eshell
-info/eudc
-info/flymake
-info/forms
-info/gnus
-info/idlwave
-info/mairix-el
-info/message
-info/mh-e
-info/newsticker
-info/nxml-mode
-info/org
-info/pcl-cvs
-info/pgg
-info/rcirc
-info/reftex
-info/remember
-info/sasl
-info/sc
-info/semantic
-info/ses
-info/sieve
-info/smtpmail
-info/speedbar
-info/tramp
-info/url
-info/vip
-info/viper
-info/widget
-info/woman
+info/ada-mode.gz
+info/auth.gz
+info/autotype.gz
+info/calc.gz
+info/ccmode.gz
+info/cl.gz
+info/dbus.gz
+info/dired-x.gz
+info/ebrowse.gz
+info/ede.gz
+info/ediff.gz
+info/edt.gz
+info/efaq.gz
+info/eieio.gz
+info/eintr.gz
+info/elisp.gz
+info/emacs-mime.gz
+info/emacs.gz
+info/epa.gz
+info/erc.gz
+info/ert.gz
+info/eshell.gz
+info/eudc.gz
+info/flymake.gz
+info/forms.gz
+info/gnus.gz
+info/idlwave.gz
+info/mairix-el.gz
+info/message.gz
+info/mh-e.gz
+info/newsticker.gz
+info/nxml-mode.gz
+info/org.gz
+info/pcl-cvs.gz
+info/pgg.gz
+info/rcirc.gz
+info/reftex.gz
+info/remember.gz
+info/sasl.gz
+info/sc.gz
+info/semantic.gz
+info/ses.gz
+info/sieve.gz
+info/smtpmail.gz
+info/speedbar.gz
+info/tramp.gz
+info/url.gz
+info/vip.gz
+info/viper.gz
+info/widget.gz
+info/woman.gz
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/fakemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/movemail
@@ -926,6 +926,7 @@
 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/misterioso-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
@@ -1067,8 +1068,6 @@
 share/emacs/${EMACS_VERSION}/lisp/README
 share/emacs/${EMACS_VERSION}/lisp/abbrev.el.gz
 share/emacs/${EMACS_VERSION}/lisp/abbrev.elc
-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
@@ -1649,6 +1648,8 @@
 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/cconv.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cconv.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
@@ -1687,8 +1688,6 @@
 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
@@ -1757,6 +1756,8 @@
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.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/tabulated-list.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tabulated-list.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-ses.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-ses.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-unsafep.el.gz
@@ -2128,6 +2129,8 @@
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gravatar.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gravatar.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/gssapi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/gssapi.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/html2text.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/html2text.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/ietf-drums.el.gz
@@ -2228,10 +2231,10 @@
 share/emacs/${EMACS_VERSION}/lisp/gnus/nnweb.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/pop3.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/pop3.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/proto-stream.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/proto-stream.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/qp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/qp.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/registry.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/registry.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc1843.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc1843.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2045.el.gz
@@ -2697,6 +2700,8 @@
 share/emacs/${EMACS_VERSION}/lisp/net/net-utils.elc
 share/emacs/${EMACS_VERSION}/lisp/net/netrc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/netrc.elc
+share/emacs/${EMACS_VERSION}/lisp/net/network-stream.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/network-stream.elc
 share/emacs/${EMACS_VERSION}/lisp/net/newst-backend.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/newst-backend.elc
 share/emacs/${EMACS_VERSION}/lisp/net/newst-plainview.el.gz
@@ -2824,6 +2829,8 @@
 share/emacs/${EMACS_VERSION}/lisp/nxml/xmltok.elc
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.el.gz
Index: distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- distinfo	21 Mar 2011 00:07:45 -0000	1.30
+++ distinfo	16 Apr 2011 22:11:12 -0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.30 2011/03/21 00:07:45 minskim Exp $
 
-SHA1 (emacs-snapshot_20110316.orig.tar.xz) = adfed1a39c8211c982c77212e52512122f465b51
-RMD160 (emacs-snapshot_20110316.orig.tar.xz) = f7057bcd7ceca704aa8b93763dd523e95b575f94
-Size (emacs-snapshot_20110316.orig.tar.xz) = 23060948 bytes
+SHA1 (emacs-snapshot_20110408.orig.tar.xz) = 2cfc069868ca62f672c8deb970c5d1aaf888fb2a
+RMD160 (emacs-snapshot_20110408.orig.tar.xz) = fcff524894c3da6896be00a85c4b8be0de9e8f0c
+Size (emacs-snapshot_20110408.orig.tar.xz) = 23120960 bytes
 SHA1 (patch-aa) = 052ea84f7e3b35d1aba08bd641d7250ec07d09aa
-SHA1 (patch-ab) = 51614c9337f77e39dab410faf78b95d8b9b6e381
+SHA1 (patch-ab) = 6a07065ea75c9fe5a482285988c7077964800463
 SHA1 (patch-ac) = cbc72f45d6648b3ab7f76af8d5a2156fd154b16a
 SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
 SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
Index: patches/patch-ab
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patches/patch-ab	1 Mar 2011 04:12:45 -0000	1.4
+++ patches/patch-ab	16 Apr 2011 22:10:59 -0000
@@ -1,7 +1,7 @@
 $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
++++ autogen/configure
 @@ -3158,6 +3158,14 @@ case "${canonical}" in
        sparc64-*)        machine=sparc ;;
      esac