Clean things up a bit. Support arm32. Fix install failures.

5 files changed, 178 insertions, 156 deletions

diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa
index 0e2b587aed5..42a67ed6a2a 100644
--- a/editors/emacs/patches/patch-aa
+++ b/editors/emacs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 1998/08/31 20:29:28 tron Exp $
+$NetBSD: patch-aa,v 1.6 1998/09/01 20:04:34 mellon Exp $
 
 --- ./man/widget.texi.orig    Sat Oct 11 04:47:03 1997
 +++ ./man/widget.texi Sat Oct 11 04:46:38 1997
@@ -152,35 +152,3 @@ $NetBSD: patch-aa,v 1.5 1998/08/31 20:29:28 tron Exp $
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  @comment @setchapternewpage odd !! we don't want blank pages !!
  @comment %**end of header (This is for running Texinfo on a region)
---- man/Makefile.in.orig	Sat May 16 21:00:22 1998
-+++ man/Makefile.in	Mon Aug 31 00:53:10 1998
-@@ -14,7 +14,7 @@
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/customize \
- 	        ../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  customize.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
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index 305ae966f1f..711d2c52a68 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,32 +1,110 @@
-$NetBSD: patch-ab,v 1.4 1998/08/31 20:29:28 tron Exp $
-
---- lib-src/Makefile.in.orig	Sun Aug  2 02:22:55 1998
-+++ lib-src/Makefile.in	Mon Aug 31 20:50:30 1998
-@@ -278,7 +278,7 @@
-         if [ `(cd ${archlibdir} && /bin/pwd)` \
-              != `(cd ${srcdir} && /bin/pwd)` ]; then \
- 	  for file in ${SCRIPTS}; do \
--	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
- 	  done ; \
- 	fi
+--- ./configure.orig	Fri Aug 28 13:38:44 1998
++++ ./configure	Sun Aug 16 03:48:36 1998
+@@ -759,6 +748,7 @@
+       ns32k-*-netbsd*)	machine=ns32000 ;;
+       sparc-*-netbsd*)	machine=sparc ;;
+       vax-*-netbsd*)	machine=vax ;;
++      arm*-*-netbsd*)	machine=arm ;;
+     esac
+   ;;
  
-@@ -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) $${file} ${bindir}/$${file} ; \
-+          else \
-+            $(INSTALL_PROGRAM) $${file} ${bindir}/emacs-$${file} ; \
-+          fi ; \
- 	done
- 	for file in ${INSTALLABLE_SCRIPTS} ; do \
--	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
--	  chmod a+rx ${bindir}/$${file}; \
-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
- 	done
- 
- uninstall:
+--- /dev/null	Fri Aug 28 13:20:16 1998
++++ ./src/m/arm.h	Sun Aug 16 03:48:25 1998
+@@ -0,0 +1,97 @@
++/* Machine description file for Acorn RISCiX machines.
++   Copyright (C) 1994 Free Software Foundation, Inc.
++
++This file is part of GNU Emacs.
++
++GNU Emacs is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU Emacs is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GNU Emacs; see the file COPYING.  If not, write to
++the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++
++
++/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
++   is the most significant byte.  */
++
++#undef WORDS_BIG_ENDIAN
++
++/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
++ * group of arguments and treat it as an array of the arguments.  We can't
++ * do this on the arm with gcc, since the first 4 args are in registers.  */
++
++#ifdef __GNUC__
++#define NO_ARG_ARRAY
++#else
++#undef NO_ARG_ARRAY
++#endif
++
++/* Define WORD_MACHINE if addresses and such have
++ * to be corrected before they can be used as byte counts.  */
++
++#undef WORD_MACHINE
++
++/* Define how to take a char and sign-extend into an int.
++   On machines where char is signed, this is a no-op.  */
++
++/* ARM note - The RISCiX Norcroft C Compiler has ALL
++   non-32-bit types as unsigned */
++
++#define SIGN_EXTEND_CHAR(c) (((int)(c) << 24) >> 24)
++
++/* Now define a symbol for the cpu type, if your compiler
++   does not define it automatically:
++   Ones defined so far include vax, m68000, ns16000, pyramid,
++   orion, tahoe, APOLLO and many others */
++
++/* ARM note - this is done by the Norcroft compiler - symbol is `__arm' */
++
++/* Use type int rather than a union, to represent Lisp_Object */
++/* This is desirable for most machines.  */
++
++#define NO_UNION_TYPE
++
++/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
++   the 24-bit bit field into an int.  In other words, if bit fields
++   are always unsigned.
++
++   If you use NO_UNION_TYPE, this flag does not matter.  */
++
++#define EXPLICIT_SIGN_EXTEND
++
++/* Define CANNOT_DUMP on machines where unexec does not work.
++   Then the function dump-emacs will not be defined
++   and temacs will do (load "loadup") automatically unless told otherwise.  */
++
++#undef CANNOT_DUMP
++
++#ifdef __GNUC__
++
++/* Use builtin alloca. Also be sure that no other ones are tried out. */
++#define alloca __builtin_alloca
++#define HAVE_ALLOCA
++
++#else
++#define C_ALLOCA
++#undef HAVE_ALLOCA
++#endif  /* __GNUC__ */
++
++/* Define NO_REMAP if memory segmentation makes it not work well
++   to change the boundary between the text section and data section
++   when Emacs is dumped.  If you define this, the preloaded Lisp
++   code will not be sharable; but that's better than failing completely.  */
++
++#define NO_REMAP
++
++
++/* For the portable alloca */
++#define STACK_DIRECTION -1
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
index 30d1f8d7757..85cc9af39f3 100644
--- a/editors/emacs/patches/patch-ac
+++ b/editors/emacs/patches/patch-ac
@@ -1,63 +1,7 @@
-$NetBSD: patch-ac,v 1.5 1998/08/07 10:40:31 agc Exp $
-
---- src/s/netbsd.h.orig	Tue Jun 10 21:09:55 1997
-+++ src/s/netbsd.h	Mon Mar 16 01:25:54 1998
-@@ -14,8 +14,6 @@
- #undef LDAV_SYMBOL
- #define HAVE_GETLOADAVG
- 
--#define HAVE_UNION_WAIT
--
- #define SIGNALS_VIA_CHARACTERS
- 
- #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-@@ -31,9 +29,13 @@
- #define NO_TERMIO
- 
- #define LIBS_DEBUG
--/* -lutil is not needed for NetBSD >0.9.  */
--/* #define LIBS_SYSTEM -lutil */
-+#define LIBS_SYSTEM -lutil
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#else
- #define LIBS_TERMCAP -ltermcap
-+#endif
- 
- #define NEED_ERRNO
- #define SYSV_SYSTEM_DIR
-@@ -65,6 +67,33 @@
- #define NO_MATHERR
- 
- #define AMPERSAND_FULL_NAME
+--- /dev/null	Fri Aug 28 10:35:45 1998
++++ lisp/site-load.el	Fri Aug 28 12:51:28 1998
+@@ -0,0 +1,4 @@
++;; MH files from nmh package are at an unexpected location.
 +
-+/* Don't close pty in process.c to make it as controlling terminal.
-+   It is already a controlling terminal of subprocess, because we did
-+   ioctl TIOCSCTTY.  */
-+#define DONT_REOPEN_PTY
-+
-+/* We have a function to do all the right magic.  */
-+#undef FIRST_PTY_LETTER
-+#define PTY_ITERATION		for (i = 0; i < 1; i++) /* ick */
-+#define PTY_NAME_SPRINTF	/* none */
-+#define PTY_TTY_NAME_SPRINTF	/* none */
-+#define PTY_OPEN					\
-+  do							\
-+    {							\
-+      int slave;					\
-+      SIGMASKTYPE mask;					\
-+      mask = sigblock (sigmask (SIGCHLD));		\
-+      if (-1 == openpty (&fd, &slave, pty_name, 0, 0))	\
-+	fd = -1;					\
-+      else						\
-+	close (slave);					\
-+      sigsetmask (mask);				\
-+    }							\
-+  while (0)
-+
-+/* Use POSIX signal interface.  */
-+#define POSIX_SIGNALS
- 
- #ifdef __ELF__
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
++(setq mh-progs "/usr/pkg/bin")
++(setq mh-lib "/usr/pkg/libexec/nmh")
diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae
index 3e6be5e0bf2..36c58851a83 100644
--- a/editors/emacs/patches/patch-ae
+++ b/editors/emacs/patches/patch-ae
@@ -1,33 +1,8 @@
-$NetBSD: patch-ae,v 1.3 1998/08/31 20:29:28 tron Exp $
+$NetBSD: patch-ae,v 1.4 1998/09/01 20:04:34 mellon Exp $
 
---- Makefile.in.orig	Sun Aug  2 02:21:22 1998
-+++ Makefile.in	Mon Aug 31 00:38:50 1998
-@@ -188,7 +188,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
--SUBDIR = lib-src src leim
-+SUBDIR = lib-src src leim man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
-@@ -376,14 +376,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then true; \
--	   else	\
--	     (cd $${thisdir}; \
--	      ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
--	      chmod a+r ${infodir}/dir); \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
-+	   for f in ccmode* cl* customize* 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); \
-@@ -402,8 +396,13 @@
+--- Makefile.in.orig	Tue Sep 16 22:23:57 1997
++++ Makefile.in	Sat Feb 21 23:49:32 1998
+@@ -374,8 +368,13 @@
  	cd ${srcdir}/etc; \
  	for page in emacs etags ctags ; do \
  	  (cd $${thisdir}; \
@@ -43,7 +18,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/31 20:29:28 tron Exp $
  	done
  
  ### Install LEIM files.  Although they are machine-independent, we
-@@ -451,7 +450,7 @@
+@@ -421,7 +420,7 @@
  	    esac ;					\
  	  fi ;						\
  	done
diff --git a/editors/emacs/patches/patch-ag b/editors/emacs/patches/patch-ag
new file mode 100644
index 00000000000..9df3301c500
--- /dev/null
+++ b/editors/emacs/patches/patch-ag
@@ -0,0 +1,57 @@
+--- info/customize~	Mon Sep 15 03:56:06 1997
++++ info/customize	Fri Aug 28 22:11:30 1998
+@@ -1,6 +1,11 @@
+ This is Info file ../info/customize, produced by Makeinfo version 1.68
+ from the input file customize.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Customize: (customize).	The GNU Emacs customization tool.
++END-INFO-DIR-ENTRY
++
+ Distribution
+ ************
+ 
+--- info/info~	Thu May 28 14:14:49 1998
++++ info/info	Fri Aug 28 22:12:46 1998
+@@ -1,6 +1,11 @@
+ This is Info file ../info/info, produced by Makeinfo version 1.68 from
+ the input file info.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Info: (info).		The on-line, menu-driven GNU documentation system.
++END-INFO-DIR-ENTRY
++
+    This file describes how to use Info, the on-line, menu-driven GNU
+ documentation system.
+ 
+--- info/reftex~	Sun Apr 26 15:19:42 1998
++++ info/reftex	Fri Aug 28 22:13:45 1998
+@@ -1,6 +1,12 @@
+ This is Info file ../info/reftex, produced by Makeinfo version 1.68
+ from the input file reftex.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* RefTeX: (reftex).	Labels, references and citations for LaTeX
++			documents with Emacs.
++END-INFO-DIR-ENTRY
++
+    This file documents RefTeX, a package to do labels, references and
+ citations for LaTeX documents with Emacs.
+ 
+--- info/widget~	Mon Mar 30 00:12:27 1998
++++ info/widget	Fri Aug 28 22:14:36 1998
+@@ -1,6 +1,11 @@
+ This is Info file ../info/widget, produced by Makeinfo version 1.68
+ from the input file widget.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Widget: (widget).	The GNU Emacs text widget package.
++END-INFO-DIR-ENTRY
++
+ 
+ File: widget,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
+