update to 23.3

Emacs 23.3 is primarily a bugfix release.  Also included are a number of
enhancements to VC and Rmail, and a new indentation library, smie.el.
For details, see the file etc/NEWS.

5 files changed, 38 insertions, 58 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 7e488096ee3..546e904bf8d 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2011/04/22 14:40:42 obache Exp $
-
-PKGREVISION=	6
+# $NetBSD: Makefile,v 1.137 2011/06/09 13:47:31 drochner Exp $
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index 336e1118215..3a8d9d3b620 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2010/06/01 21:44:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.25 2011/06/09 13:47:31 drochner Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -17,8 +17,8 @@ info/cl
 info/dbus
 info/dired-x
 info/ebrowse
-info/ediff
 info/ede
+info/ediff
 info/edt
 info/efaq
 info/eieio
@@ -47,9 +47,9 @@ info/reftex
 info/remember
 info/sasl
 info/sc
+info/semantic
 info/ses
 info/sieve
-info/semantic
 info/smtpmail
 info/speedbar
 info/tramp
@@ -76,18 +76,6 @@ 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
@@ -1226,16 +1214,24 @@ 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/auto.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/auto.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/base.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/base.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/custom.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/custom.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/generic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/generic.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
@@ -1632,8 +1628,6 @@ 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
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/checkdoc.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-compat.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-extra.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-extra.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-indent.el.gz
@@ -1704,8 +1698,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mode.elc
 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/macroexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map-ynp.el.gz
@@ -1724,6 +1716,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.elc
 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
@@ -2762,6 +2756,7 @@ 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
@@ -2806,13 +2801,14 @@ 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
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.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
+share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-acc.el.gz
@@ -2826,6 +2822,8 @@ 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/lmenu.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/lmenu.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
@@ -3310,9 +3308,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
@@ -3602,3 +3600,15 @@ 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 a326c70ed9d..f8cebc2a5b0 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.48 2011/01/14 10:32:28 wiz Exp $
+$NetBSD: distinfo,v 1.49 2011/06/09 13:47:31 drochner Exp $
 
-SHA1 (emacs-23.2.tar.gz) = 2f99c7111c232cf04410607698d2db842e305c82
-RMD160 (emacs-23.2.tar.gz) = 6d25f8d12cfa23e413ea353933ed871a3d3aa08e
-Size (emacs-23.2.tar.gz) = 46831697 bytes
+SHA1 (emacs-23.3.tar.gz) = 53bdfe584f98c13265caa3eea3cfdf79ca0f7584
+RMD160 (emacs-23.3.tar.gz) = e38a133735202c10bdd264e561d29dbbaaf558de
+Size (emacs-23.3.tar.gz) = 47664601 bytes
 SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
 SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
-SHA1 (patch-ac) = b34a86962c2d3dc684a80e2c67054ca51dba5a5a
 SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
deleted file mode 100644
index d6351bf0c40..00000000000
--- a/editors/emacs/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.20 2011/01/14 10:32:28 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/image.c.orig	2010-04-03 22:26:07.000000000 +0000
-+++ src/image.c
-@@ -5648,7 +5648,11 @@ my_png_error (png_ptr, msg)
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
-+#if (PNG_LIBPNG_VER < 10500)
-   longjmp (png_ptr->jmpbuf, 1);
-+#else
-+  png_longjmp (png_ptr, 1);
-+#endif
- }
- 
- 
-@@ -5824,7 +5828,7 @@ png_load (f, img)
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk
index ad7e53aa78c..a423b5ff52e 100644
--- a/editors/emacs/version.mk
+++ b/editors/emacs/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.6 2011/02/08 13:20:13 hiramatsu Exp $
+# $NetBSD: version.mk,v 1.7 2011/06/09 13:47:31 drochner Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23.2<24
 
 _EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	2
+_EMACS_VERSION_MINOR=	3