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.

6 files changed, 76 insertions, 92 deletions

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
-