diff options
| -rw-r--r-- | editors/emacs22/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs22/patches/patch-ax | 226 |
2 files changed, 228 insertions, 1 deletions
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo index ec625c9a341..361e00c309c 100644 --- a/editors/emacs22/distinfo +++ b/editors/emacs22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2009/09/13 02:12:28 jun Exp $ +$NetBSD: distinfo,v 1.4 2009/09/21 10:10:58 jun Exp $ SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 @@ -20,4 +20,5 @@ SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7 SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7 SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1 +SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec SHA1 (patch-xx) = 3b66bbad50cef9d248a6f1d49b9d31150e14d6e1 diff --git a/editors/emacs22/patches/patch-ax b/editors/emacs22/patches/patch-ax new file mode 100644 index 00000000000..e142156610e --- /dev/null +++ b/editors/emacs22/patches/patch-ax @@ -0,0 +1,226 @@ +$NetBSD: patch-ax,v 1.1 2009/09/21 10:10:58 jun Exp $ + +--- src/m/mips.h.orig 2008-01-08 13:04:32.000000000 +0900 ++++ src/m/mips.h +@@ -1,13 +1,13 @@ + /* m- file for Mips machines. +- Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, +- 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, ++ 2007, 2008, 2009 Free Software Foundation, Inc. + + This file is part of GNU Emacs. + +-GNU Emacs is free software; you can redistribute it and/or modify ++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 3, or (at your option) +-any later version. ++the Free Software Foundation, either version 3 of the License, 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 +@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICU + 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., 51 Franklin Street, Fifth Floor, +-Boston, MA 02110-1301, USA. */ ++along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ + + + /* The following line tells the configuration script what sort of +@@ -25,8 +23,7 @@ Boston, MA 02110-1301, USA. */ + USUAL-OPSYS="note" + + NOTE-START +-Use mips4.h for RISCOS version 4; use s-bsd4-3.h with the BSD world. +-Note that the proper m file for the Decstation is pmax.h. ++This is used on GNU/Linux and netbsd. + NOTE-END */ + + /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word +@@ -41,24 +38,6 @@ NOTE-END */ + + #define NO_ARG_ARRAY + +-/* 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. */ +- +-#define SIGN_EXTEND_CHAR(c) ((signed char)(c)) +- +-/* 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 */ +-#ifndef mips +-# define mips +-#endif +- + /* Use type int rather than a union, to represent Lisp_Object */ + /* This is desirable for most machines. */ + +@@ -72,97 +51,20 @@ NOTE-END */ + + #define EXPLICIT_SIGN_EXTEND + +-/* Data type of load average, as read out of kmem. */ +- +-#define LOAD_AVE_TYPE long +- +-/* Convert that into an integer that is 100 for a load average of 1.0 */ +- +-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0) +- +-/* CDC EP/IX 1.4.3 uses /unix */ +- +-#ifndef __linux__ +-#undef KERNEL_FILE +-#define KERNEL_FILE "/unix" +-#endif /* not __linux__ */ +- +-/* 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 +- +-/* Define VIRT_ADDR_VARIES if the virtual addresses of +- pure and impure space as loaded can vary, and even their +- relative order cannot be relied on. +- +- Otherwise Emacs assumes that text space precedes data space, +- numerically. */ +- +-/* #define VIRT_ADDR_VARIES */ +- +-/* 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 +- +-/* This machine requires completely different unexec code +- which lives in a separate file. Specify the file name. */ +- +-#if !defined(__linux__) && !defined(__NetBSD__) +-#undef UNEXEC +-#define UNEXEC unexmips.o +-#endif /* not __linux__ && not __NetBSD__ */ +- + /* Describe layout of the address space in an executing process. */ + +-#ifdef __linux__ + #define TEXT_START 0x00400000 +-#define DATA_START 0x10000000 +-#define DATA_SEG_BITS 0x10000000 +-#else /* not __linux__ */ +-#define TEXT_START 0x400000 +-#define DATA_START 0x800000 +-#endif /* __linux__ */ +- +-/* Alter some of the options used when linking. */ +- +-#if !defined(NEWSOS5) && !defined(__linux__) +-#ifdef BSD_SYSTEM +- +-/* DECstations don't have this library. +- #define LIBS_MACHINE -lmld */ + +-#define LD_SWITCH_MACHINE -D 800000 +-#define LIBS_DEBUG +- +-#if defined (__NetBSD__) || defined (__OpenBSD__) +-#else /* bsd with elf */ +-#define LINKER /bsd43/bin/ld +- +-#define LD_SWITCH_MACHINE -D 800000 -g3 +-#define START_FILES pre-crt0.o /usr/lib/crt1.o +-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o +-#define LIBS_TERMCAP -lcurses +- +-#define C_SWITCH_MACHINE -I/usr/include/bsd +-#define C_DEBUG_SWITCH -O -g3 +- +-#endif /* bsd with elf */ +-#else /* not BSD_SYSTEM */ +- +-#if defined(__GNUC__) && defined(_ABIN32) +-#define LIBS_MACHINE +-#else +-#define LIBS_MACHINE -lmld ++#if !defined(GNU_LINUX) && !defined(__NetBSD__) ++#define DATA_START 0x10000000 + #endif + +-#endif /* not BSD_SYSTEM */ +-#endif /* not NEWSOS5 && not __linux__ */ + ++#if 0 /* These definitions were advantageous when not using ++ USE_LSB_TAG. With that, they get ignored but cause errors. */ ++ ++#define DATA_SEG_BITS 0x10000000 ++ + /* The standard definitions of these macros would work ok, + but these are faster because the constants are short. */ + +@@ -172,48 +74,9 @@ NOTE-END */ + ((var) = \ + ((int)(type) << VALBITS) \ + + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))) +- +-#if !defined (NEWSOS5) && !defined (__linux__) +-#ifdef USG +- +-/* Cancel certain parts of standard sysV support. */ +-#undef NONSYSTEM_DIR_LIBRARY +-#define SYSV_SYSTEM_DIR +-#undef static +- +-/* Don't try to use SIGIO or FIONREAD even though they are defined. */ +-#define BROKEN_SIGIO +-#define BROKEN_FIONREAD +- +-/* Describe special kernel features. */ +- +-#define HAVE_SYSVIPC +- +-#if defined(emacs) && !defined(INHIBIT_BSD_TIME) +-#include <bsd/sys/time.h> +-#endif +- +-/* The `select' in the system won't work for pipes, so don't use it. */ +-#undef HAVE_SELECT /* override configuration decision */ +- +-#define HAVE_PTYS +-#define HAVE_SOCKETS +- +-#undef NOMULTIPLEJOBS +- +-/* ??? */ +-#define IRIS +- +-#endif /* USG */ +- +-#ifdef BSD_SYSTEM +-#define COFF +-#define TERMINFO +-#undef MAIL_USE_FLOCK /* Someone should check this. */ +-#undef HAVE_UNION_WAIT +-#endif /* BSD_SYSTEM */ +- +-#endif /* not NEWSOS5 && not __linux__ */ + + /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee + (do not change this comment) */ ++ ++#endif /* 0 */ ++ |