Re-import of Emacs 20, which has settled down in editors/emacs.

2003-04-11 00:31:43 +00:00 · 2003-04-11 00:31:43 +00:00 · e3a2a0b56b
commit e3a2a0b56b
parent b29032496c
34 changed files with 4146 additions and 0 deletions
--- a/editors/emacs20/DESCR
+++ b/editors/emacs20/DESCR
@ -0,0 +1,13 @@
+GNU Emacs is a self-documenting, customizable, extensible real-time
+display editor.
+
+Users new to Emacs will be able to use basic features fairly rapidly
+by studying the tutorial and using the self-documentation features.
+Emacs also has an extensive interactive manual browser.  It is easily
+extensible since its editing commands are written in Lisp.
+
+GNU Emacs's many special packages handle mail reading (RMail) and
+sending (Mail), outline editing (Outline), compiling (Compile),
+running subshells within Emacs windows (Shell), running a Lisp
+read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
+(Doctor :-) and many more.
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@ -0,0 +1,70 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 00:31:43 uebayasi Exp $
+
+DISTNAME=	emacs-20.7
+PKGREVISION=	2
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
+		${MASTER_SITE_LOCAL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
+
+# Mule enhancement (back port) patch by Satoshi Yatagawa
+PATCH_SITES=		http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/
+PATCHFILES=		emacs-20.7-mule-4.1b.patch
+# XIM fix patch by Seiichiro Inoue
+PATCH_SITES+=		http://home.catv.ne.jp/pp/ginoue/software/emacs-xim/
+PATCHFILES+=		emacs20-xim-20000713.diff
+PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
+COMMENT=	GNU editing macros (editor)
+
+CONFLICTS=	mule-[0-9]*
+
+USE_BUILDLINK2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+GNU_ARCH.mipsbe= mips
+
+BUILD_DEFS+=	USE_INET6 EMACS_USE_POP EMACS_USE_X EMACS_USE_X_TOOLKIT
+
+.include "../../mk/bsd.prefs.mk"
+
+EMACS_USE_POP?=	yes
+.if (defined(EMACS_USE_POP) && \
+    (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
+CONFIGURE_ARGS+=--with-pop
+.endif
+USE_X11=	yes
+CONFIGURE_ARGS+=--with-x=yes
+.if defined(EMACS_USE_X_TOOLKIT)
+CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
+.endif
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ARGS+=--with-ipv6
+.else
+CONFIGURE_ARGS+=--without-ipv6
+.endif
+MAKE_ENV+=	INSTALL_STRIP=${_STRIPFLAG_INSTALL}
+INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
+		    ccmode message widget reftex forms
+
+INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+
+pre-install:
+	@${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM} -f
+
+post-install:
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
+
+.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "athena"
+.include "../../mk/xaw.buildlink2.mk"
+.endif
+.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "motif"
+.include "../../mk/motif.buildlink2.mk"
+.endif
+
+.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@ -0,0 +1,40 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/04/11 00:31:43 uebayasi Exp $
+
+SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
+Size (emacs-20.7.tar.gz) = 15043428 bytes
+SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
+Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
+SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
+Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
+SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
+Size (emacs20-xim-20000713.diff) = 21296 bytes
+SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
+SHA1 (patch-ab) = eb16c1ab30e8aac6e6877e8c0f9388961b8003b2
+SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
+SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
+SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
+SHA1 (patch-af) = c35816b47a46d4a3d8381a20e593fa29297e1f4d
+SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
+SHA1 (patch-ah) = 2cfb03c57fad97db9eaaf9cda610f5d6c906aa4a
+SHA1 (patch-ai) = d1e5bb8fe797761f63fad42dbfb48834284f4533
+SHA1 (patch-aj) = 34490603ca6985fb6e02879c6fe50337d9ce31dd
+SHA1 (patch-ak) = 604f80fbf7d24ec7b732c7ac3cc99a07fb4a2eb6
+SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
+SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
+SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
+SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
+SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
+SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
+SHA1 (patch-bf) = 8a55b30ec5992e0408b3693b4f31f7d9e931d731
+SHA1 (patch-bg) = f76d459f0fbcadb0b7df4991c1d5d244accc0748
+SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
+SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c
+SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
+SHA1 (patch-bk) = 7582e915a5bd9778259961e7fa842d5cdce3e85c
+SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
+SHA1 (patch-bm) = 148b3148587a31ec7a0674c5c1a359e8f09d952f
+SHA1 (patch-bn) = 247c04ae1accf3bc6b07b22767eb3cf2cdb55013
+SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e
+SHA1 (patch-bp) = bb7b824378b25ab1229fe21bd888170f023a774c
+SHA1 (patch-bq) = 142a3b447560b617c5d20a40d38e24b6530bf4ba
+SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
--- a/editors/emacs20/patches/patch-aa
+++ b/editors/emacs20/patches/patch-aa
@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/04/11 00:31:44 uebayasi Exp $
+
+--- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
+++ man/Makefile.in	Fri Aug  6 08:34:06 1999
+@@ -14,7 +14,7 @@
+ MAKEINFO = makeinfo
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+-		../info/info ../info/message ../info/mh-e ../info/reftex \
+		../info/message ../info/mh-e ../info/reftex \
+ 		../info/sc ../info/vip ../info/viper ../info/widget
+ DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi \
+ 		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+@@ -70,6 +70,7 @@
+ 	${srcdir}/glossary.texi \
+ 	${srcdir}/ack.texi
+ 
+all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
+@@ -78,12 +79,6 @@
+ # in srcdir.  There is no provision for Info files
+ # to exist in the build directory.
+ # In a distribution of Emacs, the Info files should be up to date.
+-
+-../info/info: ${INFOSOURCES}
+-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
+-
+-info.dvi: ${INFOSOURCES}
+-	$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+ 
+ ../info/emacs: ${EMACSSOURCES}
+ 	cd $(srcdir); $(MAKEINFO) emacs.texi
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
--- a/editors/emacs20/patches/patch-ac
+++ b/editors/emacs20/patches/patch-ac
@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+--- config.sub.orig	Sat Oct  6 22:14:24 2001
+++ config.sub	Sat Oct  6 22:15:18 2001
+@@ -168,7 +168,7 @@
+ 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ 		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+ 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipseb | mipsel | mips64el \
+ 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+ 		| mips64vr5000 | miprs64vr5000el \
+@@ -201,7 +201,7 @@
+ 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ 	      | clipper-* | orion-* \
+ 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipseb-* | mipsel-* \
+ 	      | mips64el-* | mips64orion-* | mips64orionel-* \
+ 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ 	      | mipstx39-* | mipstx39el-* \
--- a/editors/emacs20/patches/patch-ad
+++ b/editors/emacs20/patches/patch-ad
@ -0,0 +1,7 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- etc/ctags.1.orig	Fri Jul 17 18:58:29 1992
+++ etc/ctags.1	Sat Feb 21 20:59:45 1998
+@@ -1 +1 @@
+-.so man1/etags.1
+.so man1/emacs-etags.1
--- a/editors/emacs20/patches/patch-ae
+++ b/editors/emacs20/patches/patch-ae
@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- Makefile.in.orig	Sat Apr 10 04:16:24 1999
+++ Makefile.in	Sat Aug  7 15:24:03 1999
+@@ -386,27 +386,23 @@
+ 	      chmod a+r ${infodir}/dir); \
+ 	   fi; \
+ 	   cd ${srcdir}/info ; \
+-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* reftex* sc* vip* widget*; do \
+ 	     (cd $${thisdir}; \
+-	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
+-	      chmod a+r ${infodir}/$$f); \
+	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
+ 	   done); \
+ 	else true; fi
+-	-thisdir=`/bin/pwd`; \
+-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+-	then \
+-	  for f in ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget; do \
+-	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+-	  done; \
+-	else true; fi
+ 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
+ 	thisdir=`/bin/pwd`; \
+ 	cd ${srcdir}/etc; \
+ 	for page in emacs etags ctags ; do \
+ 	  (cd $${thisdir}; \
+-	   ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
+-	   chmod a+r ${man1dir}/$${page}${manext}); \
+	   if [ $${page} = emacs ]; then \
+	     ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
+	     chmod a+r ${man1dir}/$${page}${manext}; \
+	   else \
+	     ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/emacs-$${page}${manext}; \
+	     chmod a+r ${man1dir}/emacs-$${page}${manext}; \
+	   fi) \
+ 	done
+ 
+ ### Install LEIM files.  Although they are machine-independent, we
+@@ -458,7 +454,7 @@
+ 	    esac ;					\
+ 	  fi ;						\
+ 	done
+-	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
+ 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
+ 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
+ 
--- a/editors/emacs20/patches/patch-af
+++ b/editors/emacs20/patches/patch-af
@ -0,0 +1,47 @@
+$NetBSD: patch-af,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/Makefile.in.orig	Thu Jan 16 19:08:48 2003
+++ src/Makefile.in
+@@ -329,7 +329,7 @@
+ #ifdef USE_X_TOOLKIT
+ #define @X_TOOLKIT_TYPE@
+ #if defined (LUCID) || defined (ATHENA)
+-LIBW= -lXaw
+LIBW= -lXaw @LIBXPM@
+ #endif
+ #ifdef MOTIF
+ #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
+@@ -402,7 +402,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
+#define LINKER $(CC) -nostartfiles
+ #endif
+ 
+ #ifndef LIB_GCC
+@@ -457,7 +457,7 @@
+ #endif /* not ORDINARY_LINK */
+ 
+ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
+-	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)
+	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
+ 
+ /* A macro which other sections of Makefile can redefine to munge the
+    flags before they're passed to LD.  This is helpful if you have
+@@ -804,14 +804,7 @@
+ #define OBJECTS_MACHINE
+ #endif
+ 
+-all: emacs bytecomp OTHER_FILES
+-
+-bytecomp: emacs
+-	./emacs -batch -q -f batch-byte-compile \
+-	${lispsource}ange-ftp.el ${lispsource}international/ccl.el \
+-	${lispsource}international/mule-cmds.el \
+-	${lispsource}international/mule.el \
+-	${lispsource}international/titdic-cnv.el
+all: emacs OTHER_FILES
+ 
+ emacs: temacs ${etc}DOC ${lisp}
+ #ifdef CANNOT_DUMP
--- a/editors/emacs20/patches/patch-ag
+++ b/editors/emacs20/patches/patch-ag
@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/config.in.orig	Sat May 20 23:58:21 2000
+++ src/config.in	Sun Jun 18 09:00:34 2000
+@@ -236,6 +236,7 @@
+ #undef HAVE_STRFTIME
+ #undef HAVE_GRANTPT
+ #undef HAVE_GETPT
+#undef HAVE_GETADDRINFO
+ 
+ #undef LOCALTIME_CACHE
+ #undef HAVE_INET_SOCKETS
--- a/editors/emacs20/patches/patch-ah
+++ b/editors/emacs20/patches/patch-ah
@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/fileio.c.orig	Tue May 16 20:02:13 2000
+++ src/fileio.c	Sun Jun 18 09:19:08 2000
+@@ -3252,8 +3252,11 @@
+   return value;
+ }
+ 
+-#ifdef unix
+#ifdef __NetBSD__
+#define unix 42
+#endif
+ 
+#ifdef unix
+ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
+   "Tell Unix to finish all pending disk updates.")
+   ()
--- a/editors/emacs20/patches/patch-ai
+++ b/editors/emacs20/patches/patch-ai
@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/sysdep.c.orig	Wed May 24 22:59:14 2000
+++ src/sysdep.c	Sun Jun 18 09:19:44 2000
+@@ -2134,6 +2134,7 @@
+  *
+  */
+ 
+#if !(defined (__NetBSD__) && defined (__ELF__))
+ #ifndef HAVE_TEXT_START
+ char *
+ start_of_text ()
+@@ -2151,6 +2152,7 @@
+ #endif /* TEXT_START */
+ }
+ #endif /* not HAVE_TEXT_START */
+#endif
+ 
+ /*
+  *	Return the address of the start of the data segment prior to
--- a/editors/emacs20/patches/patch-aj
+++ b/editors/emacs20/patches/patch-aj
@ -0,0 +1,163 @@
+$NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/process.c.orig	Wed May 24 04:10:16 2000
+++ src/process.c	Mon Sep  4 14:15:19 2000
+@@ -1,7 +1,18 @@
+/*
+ * Locally hacked process.c to add ipv6 support. -wsr
+ *
+ * The configure.in file should define "HAVE_GETADDRINFO" if it is found 
+ * in libc.
+ * 
+ */
+
+ /* Asynchronous subprocess control for GNU Emacs.
+    Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998
+       Free Software Foundation, Inc.
+ 
+   ipv6 changes are
+   Copyright (C) 1999 Wolfgang S. Rupprecht
+
+ This file is part of GNU Emacs.
+ 
+ GNU Emacs is free software; you can redistribute it and/or modify
+@@ -1810,15 +1821,21 @@
+ {
+   Lisp_Object proc;
+   register int i;
+#ifdef HAVE_GETADDRINFO
+  struct addrinfo hints, *res, *lres;
+  int ret = 0;
+  int xerrno = 0;
+  char *portstring, portbuf [128];
+#else /* HAVE_GETADDRINFO */
+   struct sockaddr_in address;
+   struct servent *svc_info;
+   struct hostent *host_info_ptr, host_info;
+   char *(addr_list[2]);
+   IN_ADDR numeric_addr;
+-  int s, outch, inch;
+-  char errstring[80];
+-  int port;
+   struct hostent host_info_fixed;
+  int port;
+#endif /* HAVE_GETADDRINFO */
+  int s = -1, outch, inch;
+   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+   int retry = 0;
+   int count = specpdl_ptr - specpdl;
+@@ -1831,6 +1848,22 @@
+   GCPRO4 (name, buffer, host, service);
+   CHECK_STRING (name, 0);
+   CHECK_STRING (host, 0);
+
+#ifdef HAVE_GETADDRINFO
+  /*
+   * caution: service can either be a string or int.
+   * Convert to a C string for later use by getaddrinfo.
+   */
+  if (INTEGERP (service)) {
+      snprintf (portbuf, sizeof (portbuf), "%d", XINT (service));
+      portstring = portbuf;
+  }
+  else
+    {
+      CHECK_STRING (service, 0);
+      portstring = XSTRING (service)->data;
+    }
+#else /* HAVE_GETADDRINFO */
+   if (INTEGERP (service))
+     port = htons ((unsigned short) XINT (service));
+   else
+@@ -1841,6 +1874,7 @@
+ 	error ("Unknown service \"%s\"", XSTRING (service)->data);
+       port = svc_info->s_port;
+     }
+#endif /* HAVE_GETADDRINFO */
+ 
+   /* Slow down polling to every ten seconds.
+      Some kernels have a bug which causes retrying connect to fail
+@@ -1850,6 +1884,75 @@
+ #endif
+ 
+ #ifndef TERM
+#ifdef HAVE_GETADDRINFO               /* We have a modern OS. -wsr */
+  immediate_quit = 1;
+  QUIT;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags = 0;
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+  ret = getaddrinfo(XSTRING (host)->data, portstring, &hints, &res);
+  if (ret)
+    error("%s/%s %s", XSTRING (host)->data, portstring, gai_strerror(ret));
+  immediate_quit = 0;
+
+  for (lres = res; lres ; lres = lres->ai_next)
+    {
+      s = socket(lres->ai_family, lres->ai_socktype, lres->ai_protocol);
+      if (s < 0)
+	{
+	  xerrno = errno;
+	  continue;
+	}
+
+      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
+	 when connect is interrupted.  So let's not let it get interrupted.
+	 Note we do not turn off polling, because polling is only used
+	 when not interrupt_input, and thus not normally used on the systems
+	 which have this bug.  On systems which use polling, there's no way
+	 to quit if polling is turned off.  */
+      if (interrupt_input)
+        unrequest_sigio ();
+
+    loop:
+      immediate_quit = 1;
+      QUIT;
+
+      if (connect(s, lres->ai_addr, lres->ai_addrlen) == 0 ||
+	  errno == EISCONN)
+	break;
+
+      xerrno = errno;
+      immediate_quit = 0;
+
+      if (errno == EINTR)
+	goto loop;
+      if (errno == EADDRINUSE && retry < 20)
+	{
+	  /* A delay here is needed on some FreeBSD systems,
+	     and it is harmless, since this retrying takes time anyway
+	     and should be infrequent.  */
+	  Fsleep_for (make_number (1), Qnil);
+	  retry++;
+	  goto loop;
+	}
+      
+      close(s);
+      s = -1;
+    }
+
+  freeaddrinfo(res);
+  if (s < 0)
+    {
+      if (interrupt_input)
+        request_sigio ();
+      
+      errno = xerrno;
+      report_file_error ("connection failed",
+			 Fcons (host, Fcons (name, Qnil)));
+    }
+#else /* HAVE_GETADDRINFO */
+   while (1)
+     {
+ #ifdef TRY_AGAIN
+@@ -1940,6 +2043,7 @@
+       report_file_error ("connection failed",
+ 			 Fcons (host, Fcons (name, Qnil)));
+     }
+#endif /* HAVE_GETADDRINFO */
+ 
+   immediate_quit = 0;
+ 
--- a/editors/emacs20/patches/patch-ak
+++ b/editors/emacs20/patches/patch-ak
@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/Makefile.in.orig	Sun Aug  2 02:22:55 1998
+++ lib-src/Makefile.in	Fri Sep  4 01:40:32 1998
+@@ -286,12 +286,14 @@
+ 	@echo
+ 	@echo "Installing utilities for users to run."
+ 	for file in ${INSTALLABLES} ; do \
+-	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
+	  if [ $${file} = emacsclient ] ; then \
+	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+	  else \
+	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/emacs-$${file} ; \
+	  fi ; \
+ 	done
+ 	for file in ${INSTALLABLE_SCRIPTS} ; do \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
+	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
+ 	done
+ 
+ uninstall:
--- a/editors/emacs20/patches/patch-al
+++ b/editors/emacs20/patches/patch-al
@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/xfaces.c.orig	Wed Nov 18 02:36:41 1998
+++ src/xfaces.c	Sun Sep  1 15:35:41 2002
+@@ -20,6 +20,10 @@
+ 
+ /* This is derived from work by Lucid (some parts very loosely so).  */
+ 
+#ifdef __sun__
+#include <strings.h>
+#endif
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
--- a/editors/emacs20/patches/patch-am
+++ b/editors/emacs20/patches/patch-am
@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/xfns.c.orig	Thu Jul  1 02:09:39 1999
+++ src/xfns.c	Sun Sep  1 15:36:55 2002
+@@ -22,6 +22,10 @@
+ 
+ /* Rewritten for X11 by Joseph Arceneaux */
+ 
+#ifdef __sun__
+#include <strings.h>
+#endif
+
+ #include <signal.h>
+ #include <config.h>
+ 
--- a/editors/emacs20/patches/patch-ax
+++ b/editors/emacs20/patches/patch-ax
@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/mips.h-orig	Mon Jun 23 03:49:57 1997
+++ src/m/mips.h	Sat Jan 30 14:28:48 1999
+@@ -149,8 +149,10 @@
+ #define LD_SWITCH_MACHINE -D 800000
+ #define LIBS_DEBUG
+ 
+#if defined (__NetBSD__) || defined (__OpenBSD__)
+#else  /* bsd with elf */
+ #define LINKER /bsd43/bin/ld
+-  
+#endif /* bsd with elf */
+ #else /* not BSD_SYSTEM */
+ 
+ #if defined(__GNUC__) && defined(_ABIN32)
--- a/editors/emacs20/patches/patch-ay
+++ b/editors/emacs20/patches/patch-ay
@ -0,0 +1,25 @@
+$NetBSD: patch-ay,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/pmax.h.orig	Sun Sep  7 01:23:09 1997
+++ src/m/pmax.h	Fri Feb 18 18:45:03 2000
+@@ -30,9 +30,8 @@
+ #if defined (__NetBSD__) || defined (__OpenBSD__)
+ #undef START_FILES
+ #undef RUN_TIME_REMAP
+-#define START_FILES pre-crt0.o /usr/lib/crt0.o
+-#define CANNOT_DUMP
+ #undef UNEXEC
+#define UNEXEC unexelf.o
+ #endif /* NetBSD || OpenBSD */
+ 
+ /* Supposedly the following will overcome a kernel bug.  */
+@@ -51,7 +50,9 @@
+ #endif
+ 
+ /* Override what mips.h says about this.  */
+#if !defined (__NetBSD__)
+ #undef LINKER
+#endif
+ 
+ #ifdef ultrix
+ /* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
--- a/editors/emacs20/patches/patch-az
+++ b/editors/emacs20/patches/patch-az
@ -0,0 +1,171 @@
+$NetBSD: patch-az,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/unexelf.c.orig	Mon May 15 01:14:02 2000
+++ src/unexelf.c	Tue Sep 26 14:18:05 2000
+@@ -470,7 +470,7 @@
+ /*
+  * NetBSD does not have normal-looking user-land ELF support.
+  */
+-# ifdef __alpha__
+# if defined(__alpha__) || defined(__sparc_v9__)
+ #  define ELFSIZE	64
+ # else
+ #  define ELFSIZE	32
+@@ -479,6 +479,7 @@
+ 
+ # ifndef PT_LOAD
+ #  define PT_LOAD	Elf_pt_load
+#  define SHT_PROGBITS	Elf_sht_progbits
+ #  define SHT_SYMTAB	Elf_sht_symtab
+ #  define SHT_DYNSYM	Elf_sht_dynsym
+ #  define SHT_NULL	Elf_sht_null
+@@ -495,9 +496,14 @@
+ #  include <sys/exec_ecoff.h>
+ #  define HDRR		struct ecoff_symhdr
+ #  define pHDRR		HDRR *
+-# endif
+# endif /* __alpha__ */
+ #endif /* __NetBSD__ */
+ 
+# ifdef __mips__
+#  define SHT_MIPS_DEBUG	DT_MIPS_FLAGS
+#  define HDRR		struct Elf_Shdr
+# endif /* __mips__ */
+
+ #ifdef __OpenBSD__
+ # include <sys/exec_elf.h>
+ #endif
+@@ -512,7 +518,7 @@
+ # else
+ #  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
+ # endif
+-# ifdef _LP64
+# if defined (_LP64) || defined(__alpha__)
+ #  define ELFSIZE 64
+ # else
+ #  define ELFSIZE 32
+@@ -522,6 +528,14 @@
+ # define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
+ #endif
+ 
+#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
+# define HAVE_MIPS_SBSS
+#endif
+
+#if defined (__mips__) && (defined(__NetBSD__) || defined(__OpenBSD__))
+# define HAVE_MIPS_SBSS
+#endif
+
+ #ifndef ELF_BSS_SECTION_NAME
+ #define ELF_BSS_SECTION_NAME ".bss"
+ #endif
+@@ -613,12 +627,53 @@
+       if (noerror)
+ 	return -1;
+       else
+-	fatal ("Can't find %s in %s.\n", name, file_name, 0);
+	fatal ("Can't find %s in %s.\n", name, file_name);
+     }
+ 
+   return idx;
+ }
+ 
+#if defined(__alpha__) || (defined ( __sony_news) && defined (_SYSTYPE_SYSV))
+/* We are using  ECOFF symbols embedded in ELF. */
+
+void
+relocate_ecoff_symhdr(symhdr, diff)
+    HDRR *symhdr;
+    ElfW(Word) diff;
+{
+  symhdr->cbLineOffset += diff;
+  symhdr->cbDnOffset   += diff;
+  symhdr->cbPdOffset   += diff;
+  symhdr->cbSymOffset  += diff;
+  symhdr->cbOptOffset  += diff;
+  symhdr->cbAuxOffset  += diff;
+  symhdr->cbSsOffset   += diff;
+  symhdr->cbSsExtOffset += diff;
+  symhdr->cbFdOffset   += diff;
+  symhdr->cbRfdOffset  += diff;
+  symhdr->cbExtOffset  += diff;
+}
+#endif /* __alpha__ or __sony_news and systype_sysv */
+
+#ifdef notyet
+void
+relocate_elf_proghdr(p, diff)
+    HDRR *symhdr;
+    Elfw(Word) diff;
+{
+	phdr->sh_name  += diff;
+	phdr->sh_type  += diff;
+	phdr->sh_flags += diff;
+	phdr->sh_addr  += diff;
+	phdr->sh_offset += diff;
+	phdr->sh_size  += diff;
+	phdr->sh_link  += diff;
+	phdr->sh_info  += diff;
+	phdr->sh_addralign += diff;
+	phdr->sh_entsize += diff;
+};
+#endif /* notyet */
+
+ /* ****************************************************************
+  * unexec
+  *
+@@ -1005,22 +1060,11 @@
+ 	  == 0)
+ 	{
+ 	  pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
+-
+-	  symhdr->cbLineOffset += new_data2_size;
+-	  symhdr->cbDnOffset += new_data2_size;
+-	  symhdr->cbPdOffset += new_data2_size;
+-	  symhdr->cbSymOffset += new_data2_size;
+-	  symhdr->cbOptOffset += new_data2_size;
+-	  symhdr->cbAuxOffset += new_data2_size;
+-	  symhdr->cbSsOffset += new_data2_size;
+-	  symhdr->cbSsExtOffset += new_data2_size;
+-	  symhdr->cbFdOffset += new_data2_size;
+-	  symhdr->cbRfdOffset += new_data2_size;
+-	  symhdr->cbExtOffset += new_data2_size;
+	  relocate_ecoff_symhdr(symhdr, new_data2_size);
+ 	}
+ #endif /* __alpha__ */
+ 
+-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#ifdef HAVE_MIPS_SBSS
+       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
+ 	  && old_mdebug_index != -1) 
+         {
+@@ -1030,20 +1074,17 @@
+ 
+ 	  if (diff)
+ 	    {
+-	      phdr->cbLineOffset += diff;
+-	      phdr->cbDnOffset   += diff;
+-	      phdr->cbPdOffset   += diff;
+-	      phdr->cbSymOffset  += diff;
+-	      phdr->cbOptOffset  += diff;
+-	      phdr->cbAuxOffset  += diff;
+-	      phdr->cbSsOffset   += diff;
+-	      phdr->cbSsExtOffset += diff;
+-	      phdr->cbFdOffset   += diff;
+-	      phdr->cbRfdOffset  += diff;
+-	      phdr->cbExtOffset  += diff;
+#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
+	      relocate_ecoff_symhdr(phdr, diff);
+#else
+	      /* xxxBSD with  GNU binutils has .mdebug, but not ecoff(???)  */
+#ifdef DEBUG
+	      printf("Dont know how to relocate mdebug syms by %0x\n", diff);
+#endif
+#endif
+ 	    }
+ 	}
+-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* HAVE_MIPS_SBSS */
+ 
+ #if __sgi
+       /* Adjust  the HDRR offsets in .mdebug and copy the 
--- a/editors/emacs20/patches/patch-bc
+++ b/editors/emacs20/patches/patch-bc
@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- /dev/null	Fri Mar 26 07:52:59 1999
+++ lisp/site-init.el	Wed Mar 24 09:37:17 1999
+@@ -0,0 +1,7 @@
+;; NetBSD puts info files in /usr/share.
+(setq Info-default-directory-list
+      (cons "/usr/share/info/"
+	    Info-default-directory-list))
+
+(autoload 'send-pr "/usr/share/gnats/send-pr.el" 
+  "Command to create and send a problem report." t)
--- a/editors/emacs20/patches/patch-bf
+++ b/editors/emacs20/patches/patch-bf
@ -0,0 +1,30 @@
+$NetBSD: patch-bf,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/s/netbsd.h.orig	Sat Apr 11 20:15:19 1998
+++ src/s/netbsd.h	Sat Jan 22 20:22:29 2000
+@@ -57,7 +57,7 @@
+ #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
+ #define N_TRELOFF(x) N_RELOFF(x)
+ #endif
+-#endif /* not NO_SHARED_LIBS */
+#endif /* not NO_SHARED_LIBS and not ELF */
+ 
+ #define HAVE_WAIT_HEADER
+ #define WAIT_USE_INT
+@@ -66,11 +66,15 @@
+ 
+ #define AMPERSAND_FULL_NAME
+ 
+-#ifdef __ELF__
+ /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
+    says where to find X windows at run time.  We convert it to a -rpath option
+    which is what OSF1 uses.  */
+ #define LD_SWITCH_SYSTEM `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+
+#ifdef __ELF__
+#define HAVE_TEXT_START		/* No need to define `start_of_text'.  */
+#define UNEXEC unexelf.o
+#define ORDINARY_LINK
+ #endif /* __ELF__ */
+ 
+ /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
--- a/editors/emacs20/patches/patch-bg
+++ b/editors/emacs20/patches/patch-bg
@ -0,0 +1,54 @@
+$NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- configure.in.orig	Mon Jun  5 17:42:49 2000
+++ configure.in	Tue Oct 22 15:59:01 2002
+@@ -66,6 +66,8 @@
+ 	  esac
+ 	  with_x_toolkit=$val
+ ])
+AC_ARG_WITH(ipv6,
+[  --with-ipv6             support IPv6 stack])
+ 
+ #### Make srcdir absolute, if it isn't already.  It's important to
+ #### avoid running the path through pwd unnecessary, since pwd can
+@@ -158,9 +160,13 @@
+ 			machine=hp9000s300 ;;
+       powerpc-apple-netbsd*) machine=macppc ;;
+       mips-*-netbsd*)	machine=pmax ;;
+      mipsel-*-netbsd*)	machine=pmax ;;
+      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
+       ns32k-*-netbsd*)	machine=ns32000 ;;
+-      sparc-*-netbsd*)	machine=sparc ;;
+      powerpc-*-netbsd*) machine=macppc ;;
+      sparc*-*-netbsd*)	machine=sparc ;;
+       vax-*-netbsd*)	machine=vax ;;
+      arm*-*-netbsd*)	machine=arm ;;
+     esac
+   ;;
+ 
+@@ -1594,6 +1600,14 @@
+     LIBS="-lXt $LIBS"
+   fi
+   AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
+  if test x$HAVE_X11XTR6 = xyes; then
+dnl Check if Xaw needs Xpm
+    LIBS="$LIBS -lXpm"
+    AC_CHECK_LIB(Xaw, XawPixmapsInitialize, [ LIBXPM="-lXpm" ], [ LIBXPM=""])
+  else
+    LIBXPM=""
+  fi
+  AC_SUBST(LIBXPM)
+   LIBS="$OLDLIBS"
+ fi
+ 
+@@ -1747,6 +1761,10 @@
+   AC_DEFINE(HAVE_AIX_SMT_EXP)
+ fi
+ 
+if test "x$with_ipv6" = xyes; then
+  AC_CHECK_FUNCS(getaddrinfo)
+fi
+
+ # Set up the CFLAGS for real compilation, so we can substitute it.
+ CFLAGS="$REAL_CFLAGS"
+ 
--- a/editors/emacs20/patches/patch-bh
+++ b/editors/emacs20/patches/patch-bh
@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/frame.h.orig	Sat Apr 25 16:17:34 1998
+++ ./src/frame.h	Tue Sep 26 09:38:18 2000
+@@ -186,7 +186,7 @@
+      it is defined in xterm.h.  
+      struct w32_output is used for W32 window frames;
+      it is defined in w32term.h.  */
+-  union output_data { struct x_output *x; struct w32_output *w32; int nothing; } output_data;
+  union output_data { struct x_output *x; struct w32_output *w32; EMACS_INT nothing; } output_data;
+ 
+ #ifdef MULTI_KBOARD
+   /* A pointer to the kboard structure associated with this frame.
--- a/editors/emacs20/patches/patch-bi
+++ b/editors/emacs20/patches/patch-bi
@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/gmalloc.c.orig	Mon Feb 21 05:21:51 2000
+++ ./src/gmalloc.c	Tue Sep 26 09:44:47 2000
+@@ -371,7 +371,7 @@
+ /* Are you experienced?  */
+ int __malloc_initialized;
+ 
+-__malloc_size_t __malloc_extra_blocks;
+__malloc_size_t __malloc_extra_blocks = 0;
+ 
+ void (*__malloc_initialize_hook) PP ((void));
+ void (*__after_morecore_hook) PP ((void));
--- a/editors/emacs20/patches/patch-bj
+++ b/editors/emacs20/patches/patch-bj
@ -0,0 +1,104 @@
+$NetBSD: patch-bj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/lisp.h.orig	Sun Jan  3 08:31:23 1999
+++ ./src/lisp.h	Tue Sep 26 09:48:10 2000
+@@ -123,25 +123,25 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
+    long int i;
+ 
+     struct
+       {
+-	int val: VALBITS;
+-	int type: GCTYPEBITS+1;
+	long int val: VALBITS;
+	long int type: GCTYPEBITS+1;
+       } s;
+     struct
+       {
+-	unsigned int val: VALBITS;
+-	int type: GCTYPEBITS+1;
+	long unsigned int val: VALBITS;
+	long int type: GCTYPEBITS+1;
+       } u;
+     struct
+       {
+-	unsigned int val: VALBITS;
+	long unsigned int val: VALBITS;
+ 	enum Lisp_Type type: GCTYPEBITS;
+ 	/* The markbit is not really part of the value of a Lisp_Object,
+ 	   and is always zero except during garbage collection.  */
+-	unsigned int markbit: 1;
+	long unsigned int markbit: 1;
+       } gu;
+   }
+ Lisp_Object;
+@@ -153,17 +153,17 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
+    long int i;
+ 
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	int val: VALBITS;
+	long int type: GCTYPEBITS+1;
+	long int val: VALBITS;
+       } s;
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	unsigned int val: VALBITS;
+	long int type: GCTYPEBITS+1;
+	long unsigned int val: VALBITS;
+       } u;
+     struct
+       {
+@@ -171,7 +171,7 @@
+ 	   and is always zero except during garbage collection.  */
+ 	unsigned int markbit: 1;
+ 	enum Lisp_Type type: GCTYPEBITS;
+-	unsigned int val: VALBITS;
+	long unsigned int val: VALBITS;
+       } gu;
+   }
+ Lisp_Object;
+@@ -270,14 +270,14 @@
+ /* Extract the value of a Lisp_Object as a signed integer.  */
+ 
+ #ifndef XINT   /* Some machines need to do this differently.  */
+-#define XINT(a) (((a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
+#define XINT(a) (EMACS_INT) (((a) << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #endif
+ 
+ /* Extract the value as an unsigned integer.  This is a basis
+    for extracting it as a pointer to a structure in storage.  */
+ 
+ #ifndef XUINT
+-#define XUINT(a) ((a) & VALMASK)
+#define XUINT(a) (EMACS_UINT) ((a) & VALMASK)
+ #endif
+ 
+ #ifndef XPNTR
+@@ -358,7 +358,7 @@
+ 
+ #ifdef EXPLICIT_SIGN_EXTEND
+ /* Make sure we sign-extend; compilers have been known to fail to do so.  */
+-#define XINT(a) (((a).i << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
+#define XINT(a) (((a).i << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #else
+ #define XINT(a) ((a).s.val)
+ #endif /* EXPLICIT_SIGN_EXTEND */
+@@ -367,7 +367,7 @@
+ #define XPNTR(a) ((a).u.val)
+ 
+ #define XSET(var, vartype, ptr) \
+-   (((var).s.type = ((char) (vartype))), ((var).s.val = ((int) (ptr))))
+   (((var).s.type = ((char) (vartype))), ((var).s.val = ((EMACS_INT) (ptr))))
+ 
+ extern Lisp_Object make_number ();
+ 
--- a/editors/emacs20/patches/patch-bk
+++ b/editors/emacs20/patches/patch-bk
@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./lib-src/sorted-doc.c.orig	Tue Mar 30 11:07:02 1999
+++ ./lib-src/sorted-doc.c	Tue Sep 26 09:32:51 2000
+@@ -7,6 +7,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+#include <string.h>
+ 
+ extern char *malloc ();
+ char *xmalloc ();
--- a/editors/emacs20/patches/patch-bl
+++ b/editors/emacs20/patches/patch-bl
@ -0,0 +1,40 @@
+$NetBSD: patch-bl,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/m/sparc.h.orig	Sat Sep  6 11:51:04 1997
+++ ./src/m/sparc.h	Tue Sep 26 12:36:05 2000
+@@ -117,3 +117,35 @@
+ #define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
+ 
+ #endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
+
+#ifdef __arch64__		/* GCC, 64-bit ABI.  */
+#define EMACS_INT long
+#define BITS_PER_LONG 64
+#define BITS_PER_EMACS_INT BITS_PER_LONG
+#define EMACS_UINT unsigned long
+#define SPECIAL_EMACS_INT
+
+/* On the 64 bit architecture, we can use 60 bits for addresses */
+
+#define VALBITS         60
+
+/* This definition of MARKBIT is necessary because of the comparison of
+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
+
+#define MARKBIT         0x8000000000000000L
+
+/* Define XINT and XUINT so that they can take arguments of type int */
+
+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
+#define XUINT(a) ((long) (a) & VALMASK)
+
+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+
+#define XPNTR(a) XUINT (a)
+
+#define PNTR_COMPARISON_TYPE unsigned long
+#ifndef _LP64
+#define _LP64			/* Done on Alpha -- not sure if it
+				   should be here.  -- fx */
+#endif
+#endif
--- a/editors/emacs20/patches/patch-bm
+++ b/editors/emacs20/patches/patch-bm
@ -0,0 +1,19 @@
+$NetBSD: patch-bm,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/alloc.c.orig	Thu Sep 16 00:20:15 1999
+++ ./src/alloc.c	Tue Sep 26 11:54:24 2000
+@@ -53,12 +53,13 @@
+ 
+ #if defined (__STDC__) && __STDC__
+ #include <stddef.h>
+#include <malloc.h>
+ #define	__malloc_size_t		size_t
+ #else
+ #define	__malloc_size_t		unsigned int
+ #endif
+ extern __malloc_size_t _bytes_used;
+-extern int __malloc_extra_blocks;
+extern __malloc_size_t __malloc_extra_blocks;
+ #endif /* !defined(DOUG_LEA_MALLOC) */
+ 
+ #define max(A,B) ((A) > (B) ? (A) : (B))
--- a/editors/emacs20/patches/patch-bn
+++ b/editors/emacs20/patches/patch-bn
@ -0,0 +1,17 @@
+$NetBSD: patch-bn,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/cvtmail.c.orig	Tue Jul 16 22:08:02 1996
+++ lib-src/cvtmail.c	Fri Jul 19 02:34:38 2002
+@@ -35,10 +35,8 @@
+ 
+ 
+ #include <stdio.h>
+-
+-char *malloc ();
+-char *realloc ();
+-char *getenv ();
+#include <string.h>
+#include <stdlib.h>
+ 
+ char *xmalloc ();
+ char *xrealloc ();
--- a/editors/emacs20/patches/patch-bo
+++ b/editors/emacs20/patches/patch-bo
@ -0,0 +1,22 @@
+$NetBSD: patch-bo,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/yow.c.orig	Fri Feb 26 11:30:08 1999
+++ lib-src/yow.c	Fri Jul 19 02:33:37 2002
+@@ -12,6 +12,8 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+ #include <../src/epaths.h>      /* For PATH_DATA.  */
+ 
+ #define BUFSIZE  80
+@@ -32,8 +34,6 @@
+     strcpy (p + 4, rel);\
+     &res;})
+ #endif
+-
+-char *malloc(), *realloc();
+ 
+ void yow();
+ void setup_yow();
--- a/editors/emacs20/patches/patch-bp
+++ b/editors/emacs20/patches/patch-bp
@ -0,0 +1,15 @@
+$NetBSD: patch-bp,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lwlib/lwlib.c.orig	Mon Apr  6 10:24:33 1998
+++ lwlib/lwlib.c	Fri Jul 19 02:38:04 2002
+@@ -29,10 +29,8 @@
+ #include "lwlib-utils.h"
+ #include <X11/StringDefs.h>
+ 
+-#ifdef __osf__
+ #include <string.h>
+ #include <stdlib.h>
+-#endif
+ extern long *xmalloc();
+ 
+ #if defined (USE_LUCID)
--- a/editors/emacs20/patches/patch-bq
+++ b/editors/emacs20/patches/patch-bq
@ -0,0 +1,14 @@
+$NetBSD: patch-bq,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/callproc.c.orig	Wed May 24 13:58:24 2000
+++ src/callproc.c	Fri Jul 19 02:40:39 2002
+@@ -24,6 +24,9 @@
+ 
+ #include <config.h>
+ #include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+ 
+ extern int errno;
+ extern char *strerror ();
--- a/editors/emacs20/patches/patch-br
+++ b/editors/emacs20/patches/patch-br
@ -0,0 +1,15 @@
+$NetBSD: patch-br,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/alpha.h.orig	Fri Feb  4 12:25:47 2000
+++ src/m/alpha.h	Fri Jul 19 02:56:24 2002
+@@ -147,7 +147,9 @@
+    GNU libc, __malloc_initialized would normally be resolved to the
+    shared library's .bss section, which is fatal.  */
+ # ifdef __GNUC__
+-#  define C_SWITCH_MACHINE	-fno-common
+#  ifndef __NetBSD__
+#   define C_SWITCH_MACHINE	-fno-common
+#  endif
+ # else
+ #  error What gives?  Fix me if DEC Unix supports ELF now.
+ # endif