Index: emacs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/Makefile,v
retrieving revision 1.124
diff -u -r1.124 Makefile
--- emacs/Makefile	26 Aug 2009 19:58:43 -0000	1.124
+++ emacs/Makefile	4 Oct 2009 11:14:23 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.124 2009/08/26 19:58:43 sno Exp $
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
Index: emacs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- emacs/distinfo	6 Aug 2009 04:46:04 -0000	1.41
+++ emacs/distinfo	4 Oct 2009 11:14:23 -0000
@@ -3,5 +3,8 @@
 SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51
 RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4
 Size (emacs-23.1.tar.gz) = 42904117 bytes
-SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a
+SHA1 (patch-aa) = 3e65b93fad3fb436ec573148e5681333d1c58e3a
+SHA1 (patch-ab) = dcd6903d62b58b5c587001b26f0d300bcb54fe6d
+SHA1 (patch-ac) = 9afbc10d2bd0f32cdfde8ae6a32236182dbac558
 SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6
+SHA1 (patch-af) = c888cd3863e533d38f437292d9f800bcd3159529
Index: emacs/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/patches/patch-ab,v
retrieving revision 1.27
diff -u -r1.27 patch-ab
--- emacs/patches/patch-ab	6 Aug 2009 04:46:04 -0000	1.27
+++ emacs/patches/patch-ab	4 Oct 2009 11:14:23 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.27 2009/08/06 04:46:04 minskim Exp $
+$NetBSD$
 
---- configure.orig	2009-06-04 20:29:50 +0300
-+++ configure	2009-06-07 21:41:16 +0300
-@@ -1979,7 +1979,7 @@ archlibdir='${libexecdir}/emacs/${versio
+--- configure.orig	2009-07-30 00:12:00.000000000 +0900
++++ configure
+@@ -1856,7 +1856,7 @@ archlibdir='${libexecdir}/emacs/${versio
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,7 +11,7 @@
  
  
  
-@@ -2529,6 +2529,15 @@ case "${canonical}" in
+@@ -2406,6 +2406,15 @@ case "${canonical}" in
      esac
    ;;
  
@@ -27,7 +27,20 @@
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
      opsys=gnu-kfreebsd
-@@ -9605,9 +9614,9 @@ if test "${HAVE_NS}" = yes; then
+@@ -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
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
--- /dev/null	2009-10-04 20:13:36.000000000 +0900
+++ emacs/patches/patch-aa	2009-10-03 21:10:36.000000000 +0900
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- 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 ;;
--- /dev/null	2009-10-04 20:13:36.000000000 +0900
+++ emacs/patches/patch-ac	2009-10-03 21:10:36.000000000 +0900
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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
+ 
--- /dev/null	2009-10-04 20:13:36.000000000 +0900
+++ emacs/patches/patch-af	2009-10-03 21:10:36.000000000 +0900
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- 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
+ 
Index: emacs-nox11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs-nox11/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- emacs-nox11/Makefile	5 Aug 2009 22:04:51 -0000	1.29
+++ emacs-nox11/Makefile	4 Oct 2009 11:14:23 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.29 2009/08/05 22:04:51 minskim Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
+PKGREVISION=	1
 
 CONFLICTS+=	emacs-[0-9]*
 
Index: emacs22/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs22/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emacs22/Makefile	13 Sep 2009 02:12:28 -0000	1.3
+++ emacs22/Makefile	4 Oct 2009 11:14:23 -0000
@@ -4,7 +4,7 @@
 COMMENT?=	GNU editing macros (editor)
 
 DISTNAME=	emacs-22.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
Index: emacs22/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs22/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- emacs22/distinfo	21 Sep 2009 10:10:58 -0000	1.4
+++ emacs22/distinfo	4 Oct 2009 11:14:23 -0000
@@ -5,6 +5,7 @@
 Size (emacs-22.3.tar.gz) = 39587396 bytes
 SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337
 SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492
+SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
--- /dev/null	2009-10-04 20:13:36.000000000 +0900
+++ emacs22/patches/patch-ac	2009-10-03 21:19:34.000000000 +0900
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/m/alpha.h.orig	2008-01-08 13:04:36.000000000 +0900
++++ src/m/alpha.h
+@@ -106,7 +106,7 @@ NOTE-END
+ #ifdef __ELF__
+ #undef UNEXEC
+ #define UNEXEC unexelf.o
+-#ifndef LINUX
++#if !defined(LINUX) && !defined(__NetBSD__)
+ #define DATA_START    0x140000000
+ #endif
+ #endif
Index: emacs22-nox11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs22-nox11/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- emacs22-nox11/Makefile	5 Aug 2009 10:32:54 -0000	1.1.1.1
+++ emacs22-nox11/Makefile	4 Oct 2009 11:14:23 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2009/08/05 10:32:54 minskim Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
+PKGREVISION=	1
 
 FILESDIR=	${.CURDIR}/../../editors/emacs22/files
 PATCHDIR=	${.CURDIR}/../../editors/emacs22/patches