diff options
Diffstat (limited to 'editors/emacs22/files')
27 files changed, 495 insertions, 1211 deletions
diff --git a/editors/emacs22/files/emacs.sh b/editors/emacs22/files/emacs.sh deleted file mode 100644 index c6976c1b8a18..000000000000 --- a/editors/emacs22/files/emacs.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -case "$1" in -start) - if [ -d /var/run/emacs/lock ] - then - rm -f /var/run/emacs/lock/* - else - mkdir -p /var/run/emacs/lock - fi - chmod 1777 /var/run/emacs/lock - ;; -stop) - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 diff --git a/editors/emacs22/files/patch-Makefile.in b/editors/emacs22/files/patch-Makefile.in new file mode 100644 index 000000000000..63b440560094 --- /dev/null +++ b/editors/emacs22/files/patch-Makefile.in @@ -0,0 +1,17 @@ +--- Makefile.in.orig Thu Mar 7 00:13:23 2002 ++++ Makefile.in Thu Mar 7 00:14:30 2002 +@@ -348,14 +348,6 @@ + ## as a workaround for a bug in tar on Ultrix 4.2. + install-arch-indep: mkdir info + -set ${COPYDESTS} ; \ +- unset CDPATH; \ +- for dir in ${COPYDIR} ; do \ +- if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ +- rm -rf $$1 ; \ +- fi ; \ +- shift ; \ +- done +- -set ${COPYDESTS} ; \ + mkdir ${COPYDESTS} ; \ + chmod ugo+rx ${COPYDESTS} ; \ + unset CDPATH; \ diff --git a/editors/emacs22/files/patch-aa b/editors/emacs22/files/patch-aa deleted file mode 100644 index 8e32af2fb6a6..000000000000 --- a/editors/emacs22/files/patch-aa +++ /dev/null @@ -1,235 +0,0 @@ ---- ./man/vip.texi.org Fri Jun 16 15:31:11 1995 -+++ ./man/vip.texi Tue May 20 01:28:33 1997 -@@ -2,6 +2,10 @@ - - @setfilename ../info/vip - @settitle VIP -+@dircategory The Emacs editor and associated tools -+@direntry -+* VIP: (vip). A VI-emulation for Emacs. -+@end direntry - - @iftex - @finalout ---- ./man/emacs.texi.org Mon Aug 19 21:15:12 1996 -+++ ./man/emacs.texi Tue May 20 01:20:11 1997 -@@ -49,6 +49,11 @@ - @settitle GNU Emacs Manual - @setfilename ../info/emacs - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Emacs: (emacs). The extensible self-documenting text editor. -+@end direntry -+ - @c - @c in general, keep the following line commented out, unless doing a - @c copy of this manual that will be published. the manual should go ---- ./man/viper.texi.org Wed Aug 7 10:59:45 1996 -+++ ./man/viper.texi Tue May 20 01:29:17 1997 -@@ -4,6 +4,10 @@ - \input texinfo - - @setfilename ../info/viper -+@dircategory The Emacs editor and associated tools -+@direntry -+* VIPER: (viper). The new VI-emulation mode in Emacs-19.29. -+@end direntry - - @iftex - @finalout ---- ./man/forms.texi.org Sat Mar 23 06:42:27 1996 -+++ ./man/forms.texi Tue May 20 01:22:37 1997 -@@ -9,6 +9,11 @@ - @syncodeindex vr cp - @syncodeindex fn cp - @syncodeindex ky cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Forms: (forms). Emacs package for editing data bases -+ by filling in forms. -+@end direntry - @iftex - @finalout - @setchapternewpage odd ---- ./man/gnus.texi.org Wed Jun 26 14:49:29 1996 -+++ ./man/gnus.texi Tue May 20 01:23:15 1997 -@@ -5,6 +5,11 @@ - @synindex fn cp - @synindex vr cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* GNUS: (gnus). The news reader GNUS. -+@end direntry -+ - @iftex - @finalout - @end iftex ---- ./man/mh-e.texi.org Sun Aug 4 00:00:29 1996 -+++ ./man/mh-e.texi Tue May 20 01:23:49 1997 -@@ -4,6 +4,10 @@ - @setfilename ../info/mh-e - @settitle mh-e - @c %**end of header -+@dircategory The Emacs editor and associated tools -+@direntry -+* MH-E: (mh-e). Emacs interface to the MH mail system. -+@end direntry - - @setchapternewpage odd - ---- ./man/cl.texi.org Mon Apr 15 21:36:53 1996 -+++ ./man/cl.texi Tue May 20 01:24:18 1997 -@@ -2,6 +2,12 @@ - @setfilename ../info/cl - @settitle Common Lisp Extensions - -+@dircategory The Emacs editor and associated tools -+@direntry -+* CL: (cl). Partial Common Lisp support for Emacs Lisp. -+@end direntry -+ -+ - @iftex - @finalout - @end iftex ---- ./man/sc.texi.org Thu Jan 4 12:55:23 1996 -+++ ./man/sc.texi Tue May 20 01:25:13 1997 -@@ -3,6 +3,12 @@ - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename ../info/sc - @settitle Supercite Version 3.1 User's Manual -+@dircategory The Emacs editor and associated tools -+@direntry -+* SC: (sc). Supercite lets you cite parts of messages -+ you're replying to, in flexible ways. -+@end direntry -+ - @iftex - @finalout - @end iftex ---- ./man/dired-x.texi.org Thu Jan 4 12:54:19 1996 -+++ ./man/dired-x.texi Tue May 20 01:25:55 1997 -@@ -18,6 +18,11 @@ - @setfilename ../info/dired-x - @c dired-x.el REVISION NUMBER - @settitle Dired Extra Version 2 User's Manual -+@dircategory The Emacs editor and associated tools -+@direntry -+* Dired-X: (dired-x). Dired Extra Features. -+@end direntry -+ - @iftex - @finalout - @end iftex ---- ./man/ediff.texi.org Fri Jun 21 20:00:04 1996 -+++ ./man/ediff.texi Tue May 20 01:26:29 1997 -@@ -10,6 +10,11 @@ - @synindex vr cp - @synindex fn cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Ediff: (ediff). A comprehensive visual interface to diff -+ and patch. -+@end direntry - @iftex - @finalout - @end iftex ---- ./man/cc-mode.texi.org Sun Aug 4 21:56:21 1996 -+++ ./man/cc-mode.texi Tue May 20 01:27:18 1997 -@@ -9,6 +9,12 @@ - @settitle CC-MODE Version 4 Documentation - @footnotestyle end - -+@dircategory The Emacs editor and associated tools -+@direntry -+* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, -+ Objective-C and Java code. -+@end direntry -+ - @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - @comment @setchapternewpage odd !! we don't want blank pages !! - @comment %**end of header (This is for running Texinfo on a region) ---- ./man/message.texi.org Wed Jun 26 14:49:43 1996 -+++ ./man/message.texi Sat Dec 13 17:46:31 1997 -@@ -5,6 +5,10 @@ - @synindex fn cp - @synindex vr cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Message: (message). Editing mail and news messages. -+@end direntry - @iftex - @finalout - @end iftex ---- ./Makefile.in.org Mon Aug 19 21:12:19 1996 -+++ ./Makefile.in Tue Apr 15 00:15:28 1997 -@@ -184,7 +184,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 -+SUBDIR = lib-src src man - - # The makefiles of the directories in $SUBDIR. - SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile -@@ -368,14 +368,8 @@ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ - then \ - (cd ${infodir}; \ -- if [ -f dir ]; then \ -- if [ ! -f dir.old ]; then mv -f dir dir.old; \ -- else mv -f dir dir.bak; fi; \ -- fi; \ - cd ${srcdir}/info ; \ -- (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ -- (cd $${thisdir}; chmod a+r ${infodir}/dir); \ -- for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \ -+ for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \ - (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ - chmod a+r ${infodir}/$$f); \ -@@ -426,7 +420,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)) - ---- ./man/Makefile.in.org Thu Jun 27 15:27:19 1996 -+++ ./man/Makefile.in Tue Apr 15 00:29:52 1997 -@@ -13,7 +13,7 @@ - # The makeinfo program is part of the Texinfo distribution. - MAKEINFO = makeinfo - INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \ -- ../info/ediff ../info/forms ../info/gnus ../info/info \ -+ ../info/ediff ../info/forms ../info/gnus \ - ../info/mh-e ../info/sc ../info/vip ../info/viper \ - ../info/message - DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \ -@@ -66,6 +66,7 @@ - ${srcdir}/gnu1.texi \ - ${srcdir}/glossary.texi - -+all: info - info: $(INFO_TARGETS) - - dvi: $(DVI_TARGETS) -@@ -74,12 +75,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} -- TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi - - ../info/emacs: ${EMACSSOURCES} - cd $(srcdir); $(MAKEINFO) emacs.texi diff --git a/editors/emacs22/files/patch-ab b/editors/emacs22/files/patch-ab deleted file mode 100644 index 16aee5fa323f..000000000000 --- a/editors/emacs22/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/xrdb.c.org Sat Apr 8 21:54:08 1995 -+++ ./src/xrdb.c Mon Sep 11 21:53:29 1995 -@@ -361,7 +361,7 @@ - - /* Producing databases for individual sources. */ - --#define X_DEFAULT_SEARCH_PATH "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" -+#define X_DEFAULT_SEARCH_PATH "/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S" - - static XrmDatabase - get_system_app (class) diff --git a/editors/emacs22/files/patch-ac b/editors/emacs22/files/patch-ac deleted file mode 100644 index dfad53e9e187..000000000000 --- a/editors/emacs22/files/patch-ac +++ /dev/null @@ -1,82 +0,0 @@ ---- src/s/freebsd.h.orig Mon Jun 10 05:14:32 1996 -+++ src/s/freebsd.h Tue Jul 11 16:44:14 2000 -@@ -1,5 +1,15 @@ - /* s/ file for freebsd system. */ - -+/* Get the correct __FreeBSD_version, even if this is before that was -+ defined. */ -+#ifndef __FreeBSD__ -+#define __FreeBSD_version 199401 -+#elif __FreeBSD__ == 1 -+#define __FreeBSD_version 199405 -+#else -+#include <osreldate.h> -+#endif -+ - /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up. - Earlier versions do not have shared libraries, so inhibit them. - You can inhibit them on newer systems if you wish -@@ -33,8 +43,9 @@ - - #define LIBS_DEBUG - #define LIBS_SYSTEM -lutil -+#if __FreeBSD_version < 400000 - #define LIBS_TERMCAP -ltermcap --#define LIB_GCC -lgcc -+#endif - - #define SYSV_SYSTEM_DIR - -@@ -42,12 +53,33 @@ - #undef BSD_PGRPS - #define GETPGRP_NO_ARG - -+#ifdef __ELF__ -+ -+#define LD_SWITCH_SYSTEM -+#ifdef i386 -+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o -+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o -+#else -+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o -+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o -+#endif -+#define UNEXEC unexelf.o -+#undef LIB_GCC -+#define LIB_GCC -+ -+#else /* not __ELF__ */ -+ - #ifndef NO_SHARED_LIBS - #define LD_SWITCH_SYSTEM -e start -dc -dp - #define HAVE_TEXT_START /* No need to define `start_of_text'. */ -+#if __FreeBSD_version >= 300002 -+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o -+#else /* __FreeBSD_version < 300002 */ - #define START_FILES pre-crt0.o /usr/lib/crt0.o --#define UNEXEC unexsunos4.o -+#endif /* __FreeBSD_version < 300002 */ -+#define UNEXEC unexfreebsd.o - #define RUN_TIME_REMAP -+#define LIB_GCC -lgcc - - #ifndef N_TRELOFF - #define N_PAGSIZ(x) __LDPGSZ -@@ -63,6 +95,8 @@ - #endif /* __FreeBSD__ */ - #endif /* NO_SHARED_LIBS */ - -+#endif /* not __ELF__ */ -+ - #define HAVE_WAIT_HEADER - #define HAVE_GETLOADAVG - /*#define HAVE_GETPAGESIZE /* configure now puts this in config.h */ -@@ -80,6 +114,8 @@ - #define BSD 199103 - #elif __FreeBSD__ == 2 - #define BSD 199306 -+#elif __FreeBSD__ >= 3 -+#define BSD 199506 - #endif - - #define WAITTYPE int diff --git a/editors/emacs22/files/patch-ad b/editors/emacs22/files/patch-ad deleted file mode 100644 index f2013a374044..000000000000 --- a/editors/emacs22/files/patch-ad +++ /dev/null @@ -1,695 +0,0 @@ ---- src/unexfreebsd.c.orig Wed Dec 3 17:28:14 1997 -+++ src/unexfreebsd.c Wed Dec 3 17:34:02 1997 -@@ -0,0 +1,692 @@ -+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic. -+ Derived from unexnetbsd.c, which was derived from unexsunos4.c -+ Copyright (C) 1992, 1993 Free Software Foundation, Inc. -+ -+This file is part of XEmacs. -+ -+XEmacs 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. -+ -+XEmacs 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 XEmacs; see the file COPYING. If not, write to -+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+/* Synched up with: Not in FSF? */ -+ -+/* -+Created 29-Oct-92 by Harlan Sexton -+Tweaked 06-Aug-93 by Dean Michaels to work with sun3. -+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries. -+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries. -+*/ -+ -+/********************** Included .h Files **************************/ -+ -+#include <config.h> -+ -+#include <stdarg.h> -+#include <sys/param.h> -+#include <sys/mman.h> -+#include <sys/file.h> -+#include <sys/stat.h> -+#include <sys/types.h> -+#include <string.h> -+#include <stdio.h> -+#include <a.out.h> -+#include <unistd.h> -+#include <ctype.h> -+#include <stab.h> -+#include <dirent.h> -+#include <link.h> -+ -+/********************** Macros *************************************/ -+ -+#define SYS_ERR strerror(errno) -+ -+#define MASK_UP(x,p_of_two) \ -+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1))) -+ -+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1))) -+ -+/********************** Typedefs and Structs ***********************/ -+ -+struct translation_struct -+{ -+ long txtaddr; -+ long txtoff; -+ long dataddr; -+ long datoff; -+ long bssaddr; -+ long endaddr; -+}; -+ -+/********************** Function Prototypes/Declarations ***********/ -+ -+static void unexec_error (const char *m, int use_errno, ...); -+static int unexec_open (char *filename, int flag, int mode); -+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags); -+static long unexec_seek (int fd, long position); -+static void unexec_read (int fd, long position, char *buf, int bytes); -+static void unexec_write (int fd, long position, char *buf, int bytes); -+static void unexec_pad (int fd, int bytes); -+static void unexec_fstat (int fd, struct stat *statptr); -+static void unexec_fchmod (int fd, int mode); -+static long unexec_addr_to_offset (long addr, struct translation_struct *ts); -+static void copy_relocation_site (struct relocation_info *ri, -+ caddr_t from_base_addr, -+ caddr_t to_base_addr, -+ struct translation_struct *ts); -+static void reset_symtab (struct nlist *start, struct nlist *end, -+ char *strtab, long edata_value, long end_value, -+ int shlib_image); -+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, -+ char *strtab, long edata_value, long end_value, -+ int shlib_image); -+int run_time_remap (char *dummy); -+ -+/********************** Variables **********************************/ -+ -+/* for reporting error messages from system calls */ -+extern int errno; -+extern int _DYNAMIC; -+extern char **environ; -+ -+static unsigned long sbrk_of_0_at_unexec; -+ -+/*******************************************************************/ -+ -+static void -+unexec_error (const char *fmt, int use_errno, ...) -+{ -+ const char *err_msg = SYS_ERR; -+ va_list args; -+ -+ fprintf (stderr, "unexec - "); -+ va_start (args, use_errno); -+ vfprintf (stderr, fmt, args); -+ va_end (args); -+ -+ if (use_errno) -+ fprintf (stderr, ": %s", err_msg); -+ fprintf (stderr, "\n"); -+ exit (1); -+ return; -+} -+ -+static int -+unexec_open (char *filename, int flag, int mode) -+{ -+ int fd; -+ -+ errno = 0; -+ -+ fd = open (filename, flag, mode); -+ -+ if (fd < 0) -+ unexec_error ("Failure opening file %s", 1, filename); -+ return fd; -+} -+ -+static caddr_t -+unexec_mmap (int fd, size_t len, int prot, int flags) -+{ -+ caddr_t return_val; -+ -+ unexec_seek (fd, 0); -+ errno = 0; -+ return_val = mmap (0, len, prot, flags, fd, 0); -+ -+ if (return_val == (caddr_t) -1) -+ unexec_error ("Failure mmap'ing file", 1); -+ return return_val; -+} -+ -+ -+static long -+unexec_seek (int fd, long position) -+{ -+ long seek_value; -+ -+ if (fd <= 0) -+ unexec_error ("No file open in which to seek", 0); -+ -+ errno = 0; -+ -+ if (position < 0) -+ seek_value = (long) lseek (fd, 0, L_INCR); -+ else -+ seek_value = (long) lseek (fd, position, L_SET); -+ -+ if (seek_value < 0) -+ unexec_error ("Failed to do a seek to 0x%x in %s", 1, -+ position, "unexec() output file"); -+ -+ return seek_value; -+} -+ -+static void -+unexec_read (int fd, long position, char *buf, int bytes) -+{ -+ int n_read; -+ int remains = bytes; -+ position = unexec_seek (fd, position); -+ -+ if (bytes < 0) -+ unexec_error ("Attempted read of %d bytes", 0, bytes); -+ -+ errno = 0; -+ -+ while (remains > 0) -+ { -+ n_read = read (fd, buf, remains); -+ if (n_read <= 0) -+ unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s", -+ 1, bytes, position, "unexec() output file"); -+ buf += n_read; -+ remains -= n_read; -+ } -+ -+ return; -+} -+ -+static void -+unexec_write (int fd, long position, char *buf, int bytes) -+{ -+ int n_written; -+ int remains = bytes; -+ position = unexec_seek (fd, position); -+ -+ if (bytes < 0) -+ unexec_error ("Attempted write of %d bytes in %s", -+ 0, bytes, "unexec() output file"); -+ -+ errno = 0; -+ -+ while (remains > 0) -+ { -+ n_written = write (fd, buf, remains); -+ if (n_written <= 0) -+ unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s", -+ 1, bytes, position, "unexec() output file"); -+ buf += n_written; -+ remains -= n_written; -+ } -+ -+ return; -+} -+ -+static void -+unexec_pad (int fd, int bytes) -+{ -+ if (bytes > 0) -+ { -+ char buf[1024]; -+ int remaining = bytes; -+ -+ memset (buf, 0, sizeof (buf)); -+ -+ while (remaining > 0) -+ { -+ int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining; -+ unexec_write (fd, -1, buf, this_write); -+ remaining -= this_write; -+ } -+ } -+} -+ -+static void -+unexec_fstat (int fd, struct stat *statptr) -+{ -+ errno = 0; -+ if (-1 == fstat (fd, statptr)) -+ unexec_error ("fstat() failed for descriptor %d", 1, fd); -+ return; -+} -+ -+static void -+unexec_fchmod (int fd, int mode) -+{ -+ errno = 0; -+ if (-1 == fchmod (fd, mode)) -+ unexec_error ("fchmod() failed for descriptor %d", 1, fd); -+ return; -+} -+ -+static long -+unexec_addr_to_offset (long addr, struct translation_struct *ts) -+ -+{ -+ if ((addr < ts->txtaddr) || (addr >= ts->bssaddr)) -+ return -1; -+ else if (addr >= ts->dataddr) -+ return ((long) ((addr - ts->dataddr) + ts->datoff)); -+ else -+ return ((long) ((addr - ts->txtaddr) + ts->txtoff)); -+} -+ -+ -+/* -+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS -+ */ -+ -+static void -+copy_relocation_site (struct relocation_info *ri, -+ caddr_t from_base_addr, -+ caddr_t to_base_addr, -+ struct translation_struct *ts) -+{ -+ long offset; -+ caddr_t from, to; -+ -+ /* We can get relocation sites in the bss region, for objects whose -+ contents are copied from a shared library. We don't need or want -+ to restore these at present. */ -+#ifndef sparc -+ if (ri->r_copy) -+ return; -+#else -+ /* Struct relocation_info_sparc doesn't have member r_copy. -+ Instead, we use the address to check if this is run-time-copied. */ -+ if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr) -+ return; -+#endif -+ -+ offset = unexec_addr_to_offset (ri->r_address, ts); -+ if (offset == -1) -+ unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address, -+ ((long *)ri)[1]); -+ -+ from = from_base_addr + offset; -+ to = to_base_addr + offset; -+ /* This stuff should be in a md_ file somewhere... */ -+#ifndef sparc -+ switch (ri->r_length) -+ { -+ case 0: -+ *((char *) to) = *((char *) from); -+ break; -+ case 1: -+ *((short *) to) = *((short *) from); -+ break; -+ case 2: -+ *((long *) to) = *((long *) from); -+ break; -+ default: -+ unexec_error ("unknown reloc length %d seen during unexec()", -+ 0, ri->r_length); -+ break; -+ } -+#else /* sparc */ -+ switch (ri->r_type) -+ { -+ case RELOC_8: -+ case RELOC_DISP8: -+ *((char *) to) = *((char *) from); -+ break; -+ case RELOC_16: -+ case RELOC_DISP16: -+ *((short *) to) = *((short *) from); -+ break; -+ case RELOC_LO10: -+ case RELOC_13: -+ case RELOC_22: -+ case RELOC_HI22: -+ case RELOC_WDISP22: -+ case RELOC_WDISP30: -+ case RELOC_32: -+ case RELOC_DISP32: -+ case RELOC_GLOB_DAT: -+ *((long *) to) = *((long *) from); -+ break; -+ case RELOC_JMP_SLOT: -+ { -+ long *target = (long *) to; -+ long *source = (long *) from; -+ *target = *source; -+ target++; -+ source++; -+ *target = *source; -+ target++; -+ source++; -+ *target = *source; -+ } -+ break; -+ default: -+ unexec_error ("unknown reloc type %d seen during unexec()", -+ 0, ri->r_type); -+ break; -+ } -+#endif /* sparc */ -+} -+ -+static void -+reset_symtab (struct nlist *start, struct nlist *end, char *strtab, -+ long edata_value, long end_value, int shlib_image) -+{ -+ struct nlist *tmp = start; -+ int found_edata = 0; -+ int found_end = 0; -+ -+ while (tmp < end) -+ { -+ int type = tmp->n_type; -+ -+ if ((type == (N_UNDF | N_EXT)) && -+ (tmp->n_value != 0)) -+ unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!", -+ 0); -+ -+ if (!(type & N_STAB)) -+ { -+ if (!found_edata && -+ (type == (N_EXT | N_DATA)) && -+ tmp->n_un.n_strx && -+ !strcmp ("_edata", strtab + tmp->n_un.n_strx)) -+ { -+ tmp->n_value = edata_value; -+ found_edata = 1; -+ } -+ -+ -+ if ((type & N_TYPE) == N_BSS) -+ { -+ if (!found_end && -+ (type == (N_EXT | N_BSS)) && -+ tmp->n_un.n_strx && -+ !strcmp ("_end", strtab + tmp->n_un.n_strx)) -+ { -+ tmp->n_value = end_value; -+ found_end = 1; -+ } -+ else if (type & N_EXT) -+ tmp->n_type = N_DATA | N_EXT; -+ else -+ tmp->n_type = N_DATA; -+ } -+ -+ /* the way things are being handled here, having sbrk() in the -+ image is fatal for an image linked with shared lib's (although -+ the code could be modified to support it), but this should -+ never happen anyway */ -+ if (shlib_image && -+ (type == (N_EXT | N_TEXT)) && -+ tmp->n_un.n_strx && -+ !strcmp ("_sbrk", strtab + tmp->n_un.n_strx)) -+ unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!", -+ 0); -+ } -+ -+ tmp++; -+ } -+} -+ -+static void -+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab, -+ long edata_value, long end_value, int shlib_image) -+{ -+ struct nzlist *tmp = start; -+ int found_edata = 0; -+ int found_end = 0; -+ -+ while (tmp < end) { -+ int type = tmp->nz_type; -+/* -+ * the following code breaks under FreeBSD-1.1-BETA, but everything -+ * seems to work perfectly if it's commented out. This did not break -+ * anything until the changes to ld.so were made. -+ */ -+/* -+ if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0)) -+ unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0); -+*/ -+ if (!(type & N_STAB)) { -+ if (!found_edata && -+ (type == (N_EXT | N_DATA)) && -+ !strcmp ("_edata", strtab + tmp->nz_strx)) { -+ tmp->nz_value = edata_value; -+ found_edata = 1; -+ } -+ -+ if ((type & N_TYPE) == N_BSS) { -+ if (!found_end && -+ (type == (N_EXT | N_BSS)) && -+ !strcmp ("_end", strtab + tmp->nz_strx)) { -+ tmp->nz_value = end_value; -+ found_end = 1; -+ } else if (type & N_EXT) -+ tmp->nz_type = N_DATA | N_EXT; -+ else -+ tmp->nz_type = N_DATA; -+ } -+ -+ /* the way things are being handled here, having sbrk() in the -+ image is fatal for an image linked with shared lib's (although -+ the code could be modified to support it), but this should -+ never happen anyway */ -+ if (shlib_image && -+ (type == (N_EXT | N_TEXT)) && -+ !strcmp ("_sbrk", strtab + tmp->nz_strx)) -+ unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0); -+ } -+ tmp++; -+ } -+} -+ -+extern int getpagesize (void); -+ -+/* -+ * EXPORTED FUNCTIONS -+ */ -+ -+/* this has to be a global variable to prevent the optimizers from -+ * assuming that it can not be 0. -+*/ -+static void *dynamic_addr = (void *) &_DYNAMIC; -+ -+int -+unexec (char *new_name, char *old_name, -+ unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2) -+{ -+ /* ld.so data */ -+ struct _dynamic *ld = 0; -+ struct section_dispatch_table *ld2 = 0; -+ /* old and new state */ -+ int old_fd; -+ int new_fd; -+ caddr_t old_base_addr; -+ caddr_t new_base_addr; -+ struct exec old_hdr; -+ struct exec new_hdr; -+ struct stat old_buf; -+ struct stat new_buf; -+ /* some process specific "constants" */ -+ unsigned long n_pagsiz, new_edata; -+ long page_size = getpagesize (); -+ caddr_t plt_end; -+ caddr_t current_break = (caddr_t) sbrk (0); -+ -+ if (!page_size) -+ unexec_error ("unexec() failed because we can't get the size of a page!", -+ 0); -+ -+ /* see if this is a -Bdynamic image -- if so, find ld.so structures */ -+ if (dynamic_addr) -+ { -+ ld = (struct _dynamic *) dynamic_addr; -+ ld2 = ld->d_un.d_sdt; -+ if (ld->d_version < LD_VERSION_BSD) -+ unexec_error ("%s linked with obsolete version of ld -- we quit!", -+ 0, old_name); -+ } -+ -+ /* open the old and new files, figuring out how big the old one is -+ so that we can map it in */ -+ old_fd = unexec_open (old_name, O_RDONLY, 0); -+ new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666); -+ -+ /* setup the header and the statbuf for old_fd */ -+ unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr)); -+ unexec_fstat (old_fd, &old_buf); -+ -+ -+ /* set up some important constants */ -+ n_pagsiz = __LDPGSZ; -+ if (dynamic_addr) -+ plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double)); -+ else -+ plt_end = (caddr_t) N_DATADDR (old_hdr); -+ -+#if 0 -+ /* never write protect the variable "environ", defined in /lib/crt0.o, and -+ set in process.c and callproc.c */ -+ mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **); -+ /* never protect ABOVE the end of data emacs_edata specified */ -+ mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data); -+#endif -+ -+ /* Set up the image of the old file */ -+ old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ, -+ MAP_FILE | MAP_PRIVATE); -+ close (old_fd); -+ -+ /* set up the new exec */ -+ new_hdr = old_hdr; -+ new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz); -+ new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr)); -+ new_hdr.a_bss = 0; -+ -+ /* set up this variable, in case we want to reset "the break" -+ when restarting */ -+ sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz)); -+ -+ /* Write out the first approximation to the new file. The sizes of -+ each section will be correct, but there will be a number of -+ corrections that will need to be made. */ -+ { -+ long old_datoff = N_DATOFF (old_hdr); -+ long old_dataddr = N_DATADDR (old_hdr); -+ long new_treloff = N_RELOFF (new_hdr); -+ long old_treloff = N_RELOFF (old_hdr); -+ long ld_so_size = ((unsigned long) plt_end) - old_dataddr; -+ long real_data_size = current_break - plt_end; -+ long pad_size = -+ MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break); -+ -+ -+ /* First, write the text segment with new header -- copy everything until -+ the start of the data segment from the old file, and then go back and -+ write the new header. */ -+ unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size); -+ unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr)); -+ -+ /* Copy the rest of the data segment from the running image. */ -+ unexec_write (new_fd, old_datoff + ld_so_size, -+ plt_end, real_data_size); -+ -+ /* pad out the data segment */ -+ unexec_pad (new_fd, pad_size); -+ -+ /* Finally, copy the symbol table information from the old file. */ -+ unexec_write (new_fd, new_treloff, -+ old_base_addr + old_treloff, -+ old_buf.st_size - old_treloff); -+ } -+ -+ -+ /* Next, map in the output file so that we can jump around fixing it -+ up. We retain the old file so that we can refer to it. */ -+ unexec_fstat (new_fd, &new_buf); -+ new_base_addr = unexec_mmap (new_fd, -+ MASK_UP (new_buf.st_size, page_size), -+ PROT_READ | PROT_WRITE, -+ MAP_FILE | MAP_SHARED); -+ -+ -+ -+ /* We need to do 2 things. First, make sure that _edata and _end (and -+ hence, curbrk) are set to the correct values. At the same time, for -+ neatness and to help with debugging, mark all the types of all ld.so -+ and nm BSS symbols in the new file to be DATA, and make sure that -+ there are no COMMON symbols in the output file, as any references to -+ these can lose really big. Second, reset all of the ld.so "relocation -+ sites" in the new file to have the values that appear in the old file -+ -- the failure to do this was the biggest loser in the old version of -+ this code. */ -+ -+ /* STEP 1 */ -+ /* Reset the regular symbol table first. */ -+ reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)), -+ (struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) + -+ new_hdr.a_syms), -+ (char *) (new_base_addr + N_STROFF(new_hdr)), -+ new_edata, new_edata, -+ !!dynamic_addr); -+ -+ /* Now reset the ld.so symbol table. */ -+ if (dynamic_addr) -+ { -+ struct translation_struct ts; -+ struct relocation_info *tmp, *end; -+ caddr_t syms, strings; -+ -+ /* set up the structure that we use to translate addresses in the -+ old file into file offsets */ -+ ts.txtaddr = N_TXTADDR (old_hdr); -+ ts.txtoff = N_TXTOFF (old_hdr); -+ ts.dataddr = N_DATADDR (old_hdr); -+ ts.datoff = N_DATOFF (old_hdr); -+ ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data; -+ ts.endaddr = ts.bssaddr + old_hdr.a_bss; -+ -+ syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts); -+ strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts); -+ reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings, -+ (char *) strings, -+ new_edata, new_edata, -+ !!dynamic_addr); -+ -+ /* STEP 2 */ -+ tmp = (struct relocation_info *) -+ (old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts)); -+ end = (struct relocation_info *) -+ (old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts)); -+ while (tmp < end) -+ { -+ copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts); -+ tmp++; -+ } -+ } -+ -+ /* get rid of the mmap-ed file space and make the output file -+ executable -- then quit */ -+ munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size)); -+ munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size)); -+ unexec_fchmod (new_fd, 0755); -+ close (new_fd); -+ return 0; -+} -+ -+ -+int -+run_time_remap (char *dummy) -+{ -+ unsigned long current_sbrk = (unsigned long) sbrk (0); -+ -+ if (sbrk_of_0_at_unexec > current_sbrk) -+ { -+ errno = 0; -+ if (brk ((caddr_t) sbrk_of_0_at_unexec)) -+ fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", -+ sbrk_of_0_at_unexec, SYS_ERR); -+ } -+ -+ return 0; -+} diff --git a/editors/emacs22/files/patch-ae b/editors/emacs22/files/patch-ae deleted file mode 100644 index 82b5e69cad05..000000000000 --- a/editors/emacs22/files/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ ---- src/unexelf.c.orig Fri Oct 2 12:55:43 1998 -+++ src/unexelf.c Fri Oct 2 13:02:05 1998 -@@ -678,7 +678,8 @@ - if (n < 0) - fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0); - -- NEW_PROGRAM_H (n).p_filesz += new_data2_size; -+/* NEW_PROGRAM_H (n).p_filesz += new_data2_size; */ -+ NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */ - NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz; - - #if 0 /* Maybe allow section after data2 - does this ever happen? */ -@@ -845,7 +846,9 @@ - - for (; symp < symendp; symp ++) - if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0 -- || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0) -+ || strcmp ((char *) (symnames + symp->st_name), "end") == 0 -+ || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0 -+ || strcmp ((char *) (symnames + symp->st_name), "edata") == 0) - memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr)); - } diff --git a/editors/emacs22/files/patch-af b/editors/emacs22/files/patch-af deleted file mode 100644 index 23092a4a8ca0..000000000000 --- a/editors/emacs22/files/patch-af +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig Tue Aug 20 13:11:26 1996 -+++ configure Sat Jan 16 23:18:54 1999 -@@ -756,6 +756,10 @@ - machine=alpha opsys=gnu-linux - ;; - -+ alpha-*-freebsd* ) -+ machine=alpha opsys=freebsd -+ ;; -+ - ## Altos 3068 - m68*-altos-sysv* ) - machine=altos opsys=usg5-2 diff --git a/editors/emacs22/files/patch-ag b/editors/emacs22/files/patch-ag deleted file mode 100644 index a556bd24f5eb..000000000000 --- a/editors/emacs22/files/patch-ag +++ /dev/null @@ -1,34 +0,0 @@ ---- src/m/alpha.h.orig Sat Aug 10 07:03:36 1996 -+++ src/m/alpha.h Sat Jan 16 22:34:10 1999 -@@ -234,7 +234,11 @@ - - #ifndef NOT_C_CODE - /* We need these because pointers are larger than the default ints. */ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #include <alloca.h> -+#else -+#include <stdlib.h> -+#endif - - /* Hack alert! For reasons unknown to mankind the string.h file insists - on defining bcopy etc. as taking char pointers as arguments. With -@@ -299,10 +303,18 @@ - termio and struct termios are mutually incompatible. */ - #define NO_TERMIO - --#ifdef LINUX -+#if defined(LINUX) || \ -+ defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) - # define TEXT_END ({ extern int _etext; &_etext; }) - # ifndef __ELF__ - # define COFF - # define DATA_END ({ extern int _EDATA; &_EDATA; }) - # endif /* notdef __ELF__ */ - #endif -+ -+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \ -+ && defined (__ELF__) -+#define HAVE_TEXT_START -+#endif -+ -+ diff --git a/editors/emacs22/files/patch-ah b/editors/emacs22/files/patch-ah deleted file mode 100644 index 3f990e4b5970..000000000000 --- a/editors/emacs22/files/patch-ah +++ /dev/null @@ -1,54 +0,0 @@ ---- src/unexelf1.c.orig Sat Aug 10 06:56:52 1996 -+++ src/unexelf1.c Sun Jan 17 00:28:21 1999 -@@ -423,12 +423,50 @@ - #include <elf.h> - #include <sys/mman.h> - --#ifdef __alpha__ -+#if defined(__alpha__) && defined(__osf__) - # include <sym.h> /* get COFF debugging symbol table declaration */ -+#else if defined(__alpha__) -+typedef struct { -+ short magic; -+ short vstamp; -+ int ilineMax; -+ int idnMax; -+ int ipdMax; -+ int isymMax; -+ int ioptMax; -+ int iauxMax; -+ int issMax; -+ int issExtMax; -+ int ifdMax; -+ int crfd; -+ int iextMax; -+ long cbLine; -+ long cbLineOffset; -+ long cbDnOffset; -+ long cbPdOffset; -+ long cbSymOffset; -+ long cbOptOffset; -+ long cbAuxOffset; -+ long cbSsOffset; -+ long cbSsExtOffset; -+ long cbFdOffset; -+ long cbRfdOffset; -+ long cbExtOffset; -+} HDRR, *pHDRR; -+#define cbHDRR sizeof(HDRR) -+#define hdrNil ((pHDRR)0) - #endif - - #if __GNU_LIBRARY__ - 0 >= 6 - # include <link.h> /* get ElfW etc */ -+#endif -+ -+#ifdef __FreeBSD__ -+# ifdef __STDC__ -+# define ElfW(type) Elf_##type -+# else -+# define ElfW(type) Elf_/**/type -+# endif - #endif - - #ifndef ElfW diff --git a/editors/emacs22/files/patch-ai b/editors/emacs22/files/patch-ai deleted file mode 100644 index 57da8f14f8fd..000000000000 --- a/editors/emacs22/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/Makefile.in.orig Sun Apr 4 13:04:19 1999 -+++ lib-src/Makefile.in Sun Apr 4 13:04:48 1999 -@@ -364,7 +364,7 @@ - $(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail - - fakemail: ${srcdir}/fakemail.c ../src/config.h -- $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail -+ $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -lcompat -o fakemail - - yow: ${srcdir}/yow.c ../src/paths.h - $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow diff --git a/editors/emacs22/files/patch-ba b/editors/emacs22/files/patch-ba deleted file mode 100644 index c9f637aa3ba4..000000000000 --- a/editors/emacs22/files/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ ---- lib-src/emacsclient.c.old Tue Jul 23 23:18:33 1996 -+++ lib-src/emacsclient.c Thu Oct 8 22:34:54 1998 -@@ -94,6 +94,8 @@ - struct stat statbfr; - - gethostname (system_name, sizeof (system_name)); -+ system_name[sizeof (system_name) - 1] = '\0'; -+ /* system_name must be null-terminated string */ - sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); - - if (stat (server.sun_path, &statbfr) == -1) ---- lib-src/emacsserver.c.old Wed Jul 17 07:09:29 1996 -+++ lib-src/emacsserver.c Thu Oct 8 22:35:08 1998 -@@ -115,6 +115,8 @@ - server.sun_family = AF_UNIX; - #ifndef SERVER_HOME_DIR - gethostname (system_name, sizeof (system_name)); -+ system_name[sizeof (system_name) - 1] = '\0'; -+ /* system_name must be null-terminated string */ - sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); - - if (unlink (server.sun_path) == -1 && errno != ENOENT) diff --git a/editors/emacs22/files/patch-bb b/editors/emacs22/files/patch-bb deleted file mode 100644 index 1d6fcf08137e..000000000000 --- a/editors/emacs22/files/patch-bb +++ /dev/null @@ -1,11 +0,0 @@ ---- src/emacs.c.orig Fri Sep 6 17:15:38 2002 -+++ src/emacs.c Fri Sep 6 17:16:33 2002 -@@ -427,8 +427,6 @@ - { - char stack_bottom_variable; - int skip_args = 0; -- extern int errno; -- extern sys_nerr; - - #ifdef LINUX_SBRK_BUG - __sbrk (1); diff --git a/editors/emacs22/files/patch-configure.in b/editors/emacs22/files/patch-configure.in new file mode 100644 index 000000000000..6a3bd7899d58 --- /dev/null +++ b/editors/emacs22/files/patch-configure.in @@ -0,0 +1,37 @@ +--- configure.in.orig Sun Mar 16 17:06:05 2003 ++++ configure.in Thu Mar 18 13:31:10 2004 +@@ -179,6 +179,18 @@ + machine='' opsys='' unported=no + case "${canonical}" in + ++ ## FreeBSD ports ++ *-*-freebsd* ) ++ opsys=freebsd ++ case "${canonical}" in ++ alpha*-*-freebsd*) machine=alpha ;; ++ amd64-*-freebsd*) machine=amd64 ;; ++ ia64-*-freebsd*) machine=ia64 ;; ++ i[3456]86-*-freebsd*) machine=intel386 ;; ++ sparc64-*-freebsd*) machine=sparc ;; ++ esac ++ ;; ++ + ## NetBSD ports + *-*-netbsd* ) + opsys=netbsd +@@ -1032,7 +1044,6 @@ + ;; + *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; + *-386bsd* ) opsys=386bsd ;; +- *-freebsd* ) opsys=freebsd ;; + *-nextstep* ) opsys=nextstep ;; + ## Otherwise, we'll fall through to the generic opsys code at the bottom. + esac +@@ -2050,6 +2061,7 @@ + # Solaris requires -lintl if you want strerror (which calls dgettext) + # to return localized messages. + AC_CHECK_LIB(intl, dgettext) ++AC_CHECK_LIB(xpg4, _xpg4_setrunelocale) + + AC_MSG_CHECKING(whether localtime caches TZ) + AC_CACHE_VAL(emacs_cv_localtime_cache, diff --git a/editors/emacs22/files/patch-lib-src:Makefile.in b/editors/emacs22/files/patch-lib-src:Makefile.in new file mode 100644 index 000000000000..4226f59f9f96 --- /dev/null +++ b/editors/emacs22/files/patch-lib-src:Makefile.in @@ -0,0 +1,27 @@ +--- lib-src/Makefile.in.orig Wed Aug 30 02:12:42 2000 ++++ lib-src/Makefile.in Thu Oct 11 01:54:10 2001 +@@ -85,6 +85,7 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + # By default, we uphold the dignity of our programs. + INSTALL_STRIP = + +@@ -278,7 +279,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 + +@@ -290,7 +291,7 @@ + chmod a+rx ${bindir}/$${file}; \ + done + for file in ${INSTALLABLE_SCRIPTS} ; do \ +- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ ++ $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \ + chmod a+rx ${bindir}/$${file}; \ + done diff --git a/editors/emacs22/files/patch-lisp:vc-hooks.el b/editors/emacs22/files/patch-lisp:vc-hooks.el new file mode 100644 index 000000000000..8675c85f9e37 --- /dev/null +++ b/editors/emacs22/files/patch-lisp:vc-hooks.el @@ -0,0 +1,24 @@ +--- lisp/vc-hooks.el.orig Mon Nov 12 23:37:38 2001 ++++ lisp/vc-hooks.el Tue Nov 13 12:56:08 2001 +@@ -475,10 +475,9 @@ + (if regexp + (concat (regexp-quote (file-name-nondirectory file)) + "\\.~[0-9.]+" (unless manual "\\.") "~") +- (expand-file-name (concat (file-name-nondirectory file) +- ".~" (or rev (vc-workfile-version file)) +- (unless manual ".") "~") +- (file-name-directory file)))) ++ (concat (make-backup-file-name-1 file) ++ ".~" (or rev (vc-workfile-version file)) ++ (unless manual ".") "~"))) + + (defun vc-delete-automatic-version-backups (file) + "Delete all existing automatic version backups for FILE." +@@ -509,6 +508,7 @@ + (vc-up-to-date-p file) + (eq (vc-checkout-model file) 'implicit) + (vc-call make-version-backups-p file) ++ vc-make-backup-files + (vc-make-version-backup file)))) + + (defun vc-after-save () diff --git a/editors/emacs22/files/patch-lisp_dired.el b/editors/emacs22/files/patch-lisp_dired.el new file mode 100644 index 000000000000..93a4f6f3188a --- /dev/null +++ b/editors/emacs22/files/patch-lisp_dired.el @@ -0,0 +1,19 @@ +--- lisp/dired.el.orig Fri Feb 7 20:48:13 2003 ++++ lisp/dired.el Fri Mar 21 18:08:54 2003 +@@ -1535,6 +1535,7 @@ + "\\|" yyyy s s "?" + "\\|" s "?" yyyy + "\\)")) ++ (freebsd-ja (concat s mm "\\(" s "\\|/\\)" dd s "\\(" HH:MM "\\|" s yyyy "\\)")) + (japanese + (concat mm k "?" s dd k "?" s "+" + "\\(" HH:MM "\\|" yyyy k "?" "\\)"))) +@@ -1546,7 +1547,7 @@ + ;; This avoids recognizing `jservice 10 1024' as a date in the line: + ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host + (concat ".*[0-9][kKMGTPEZY]?" +- s "\\(" western "\\|" japanese "\\|" iso "\\)" s)) ++ s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s)) + "Regular expression to match up to the file name in a directory listing. + The default value is designed to recognize dates and times + regardless of the language.") diff --git a/editors/emacs22/files/patch-man:Makefile.in b/editors/emacs22/files/patch-man:Makefile.in new file mode 100644 index 000000000000..23e59c2673f6 --- /dev/null +++ b/editors/emacs22/files/patch-man:Makefile.in @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Thu Apr 26 02:17:33 2001 ++++ man/Makefile.in Mon Oct 22 20:43:45 2001 +@@ -31,7 +31,7 @@ + + + # The makeinfo program is part of the Texinfo distribution. +-MAKEINFO = makeinfo ++MAKEINFO = makeinfo --no-split + 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 \ diff --git a/editors/emacs22/files/patch-src:Makefile.in b/editors/emacs22/files/patch-src:Makefile.in new file mode 100644 index 000000000000..d0e31255cc3b --- /dev/null +++ b/editors/emacs22/files/patch-src:Makefile.in @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig Mon Dec 17 23:09:32 2001 ++++ src/Makefile.in Mon Oct 21 13:37:26 2002 +@@ -155,6 +155,10 @@ + /* This holds special options for linking temacs + that should be used for linking anything else. */ + #ifndef LD_SWITCH_SYSTEM_TEMACS ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042) ++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc ++#else + #define LD_SWITCH_SYSTEM_TEMACS ++#endif + #endif + diff --git a/editors/emacs22/files/patch-src:alloc.c b/editors/emacs22/files/patch-src:alloc.c new file mode 100644 index 000000000000..0ae9270b0d1f --- /dev/null +++ b/editors/emacs22/files/patch-src:alloc.c @@ -0,0 +1,14 @@ +--- src/alloc.c.orig Thu Sep 12 13:50:01 2002 ++++ src/alloc.c Thu Sep 12 13:48:11 2002 +@@ -3723,7 +3723,11 @@ + /* This trick flushes the register windows so that all the state of + the process is contained in the stack. */ + #ifdef sparc ++#ifdef __sparc64__ ++ asm ("flushw"); ++#else + asm ("ta 3"); ++#endif + #endif + + /* Save registers that we need to see on the stack. We need to see diff --git a/editors/emacs22/files/patch-src:m:alpha.h b/editors/emacs22/files/patch-src:m:alpha.h new file mode 100644 index 000000000000..080a33650114 --- /dev/null +++ b/editors/emacs22/files/patch-src:m:alpha.h @@ -0,0 +1,11 @@ +--- src/m/alpha.h.orig Mon Oct 2 23:30:39 2000 ++++ src/m/alpha.h Wed Feb 13 09:05:57 2002 +@@ -198,7 +198,7 @@ + + #ifndef NOT_C_CODE + /* We need these because pointers are larger than the default ints. */ +-#if !defined(__NetBSD__) && !defined(__OpenBSD__) ++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + #include <alloca.h> + #endif + diff --git a/editors/emacs22/files/patch-src:m:amd64.h b/editors/emacs22/files/patch-src:m:amd64.h new file mode 100644 index 000000000000..3129433e59b5 --- /dev/null +++ b/editors/emacs22/files/patch-src:m:amd64.h @@ -0,0 +1,184 @@ +--- src/m/amd64.h~ Wed Dec 31 18:00:00 1969 ++++ src/m/amd64.h Thu Dec 18 00:21:51 2003 +@@ -0,0 +1,181 @@ ++/* machine description file For the amd64 chip. ++ Copyright (C) 1994, 1997, 1999 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 1, 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. */ ++ ++ ++/* The following line tells the configuration script what sort of ++ operating system this machine is likely to run. ++ USUAL-OPSYS="note" ++ ++NOTE-START ++Use -opsystem=freebsd ++NOTE-END ++ ++*/ ++ ++#define BITS_PER_LONG 64 ++#define BITS_PER_EMACS_INT 64 ++#ifndef _LP64 ++#define _LP64 ++#endif ++ ++/* 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. */ ++ ++#define NO_ARG_ARRAY ++ ++/* 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 */ ++ ++/* __amd64__ defined automatically */ ++ ++ ++/* Use type EMACS_INT rather than a union, to represent Lisp_Object */ ++/* This is desirable for most machines. */ ++ ++#define NO_UNION_TYPE ++ ++/* Define the type to use. */ ++#define EMACS_INT long ++#define EMACS_UINT unsigned long ++#define SPECIAL_EMACS_INT ++ ++/* 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. */ ++ ++#undef 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 / FSCALE) ++ ++/* Define C_ALLOCA if this machine does not support a true alloca ++ and the one written in C should be used instead. ++ Define HAVE_ALLOCA to say that the system provides a properly ++ working alloca function and it should be used. ++ Define neither one if an assembler-language alloca ++ in the file alloca.s should be used. */ ++ ++#define HAVE_ALLOCA ++ ++/* GNU malloc and the relocating allocator do not work together ++ with X. [Who wrote that?] */ ++ ++/* May 1995: reportedly [Rainer Schoepf <schoepf at uni-mainz.de>] both the ++ system and the gnu malloc system work with "alpha-dec-osf3.0" and ++ "alpha-dec-osf3.2". */ ++ ++/* May 1995: it seems to me [Morten Welinder <terra at diku.dk>] that both ++ mallocs work with "alpha-dec-osf2.0", but I daren't break anything ++ right now. Feel free to play if you want. */ ++ ++/* #define SYSTEM_MALLOC */ ++ ++#ifdef __ELF__ ++/* With ELF, make sure that all common symbols get allocated to in the ++ data section. Otherwise, the dump of temacs may miss variables in ++ the shared library that have been initialized. For example, with ++ 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 ++# else ++# error What gives? Fix me if DEC Unix supports ELF now. ++# endif ++#endif ++ ++#if defined(__OpenBSD__) ++#define ORDINARY_LINK ++#endif ++ ++#ifdef __ELF__ ++#undef UNEXEC ++#define UNEXEC unexelf.o ++#endif ++ ++#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6 ++/* This controls a conditional in main. */ ++#define LINUX_SBRK_BUG ++#endif ++ ++ ++#define PNTR_COMPARISON_TYPE unsigned long ++ ++/* 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) ++ ++#ifndef NOT_C_CODE ++/* We need these because pointers are larger than the default ints. */ ++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) ++#include <alloca.h> ++#endif ++#endif /* not NOT_C_CODE */ ++ ++/* On the Alpha it's best to avoid including TERMIO since struct ++ termio and struct termios are mutually incompatible. */ ++/* #define NO_TERMIO */ ++ ++#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) ++# define TEXT_END ({ extern int _etext; &_etext; }) ++# ifndef __ELF__ ++# define COFF ++# define DATA_END ({ extern int _EDATA; &_EDATA; }) ++# endif /* notdef __ELF__ */ ++#endif ++ ++#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) ++#define HAVE_TEXT_START ++#endif ++ ++/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN: ++ they generate code that uses a signaling NaN instead of DBL_MIN. ++ Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: ++ this avoids the assembler bug. */ ++/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */ diff --git a/editors/emacs22/files/patch-src:m:ia64.h b/editors/emacs22/files/patch-src:m:ia64.h new file mode 100644 index 000000000000..34f7a1eec276 --- /dev/null +++ b/editors/emacs22/files/patch-src:m:ia64.h @@ -0,0 +1,11 @@ +--- src/m/ia64.h.orig Fri Sep 29 06:00:37 2000 ++++ src/m/ia64.h Thu Nov 20 13:44:02 2003 +@@ -147,7 +147,7 @@ + + #ifndef NOT_C_CODE + /* We need these because pointers are larger than the default ints. */ +-# if !defined(__NetBSD__) && !defined(__OpenBSD__) ++# if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + # include <alloca.h> + # else + # include <stdlib.h> diff --git a/editors/emacs22/files/patch-src:m:sparc.h b/editors/emacs22/files/patch-src:m:sparc.h new file mode 100644 index 000000000000..8d594f5b5cef --- /dev/null +++ b/editors/emacs22/files/patch-src:m:sparc.h @@ -0,0 +1,11 @@ +--- src/m/sparc.h.orig Thu Sep 12 02:25:09 2002 ++++ src/m/sparc.h Thu Sep 12 12:33:36 2002 +@@ -89,7 +89,7 @@ + #define PURESIZE 130000 + #endif + +-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) ++#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) + /* This really belongs in s/sun.h. */ + + /* Say that the text segment of a.out includes the header; diff --git a/editors/emacs22/files/patch-src:mem-limits.h b/editors/emacs22/files/patch-src:mem-limits.h new file mode 100644 index 000000000000..c58dd778e2ec --- /dev/null +++ b/editors/emacs22/files/patch-src:mem-limits.h @@ -0,0 +1,11 @@ +--- src/mem-limits.h.~1~ Wed Mar 8 12:49:46 2000 ++++ src/mem-limits.h Wed Dec 17 03:15:24 2003 +@@ -98,7 +98,7 @@ + static POINTER data_space_start; + + /* Number of bytes of writable memory we can expect to be able to get */ +-static unsigned long lim_data; ++static rlim_t lim_data; + + #ifdef NO_LIM_DATA + static void diff --git a/editors/emacs22/files/patch-src:process.c b/editors/emacs22/files/patch-src:process.c new file mode 100644 index 000000000000..d55970c9bd02 --- /dev/null +++ b/editors/emacs22/files/patch-src:process.c @@ -0,0 +1,91 @@ +--- src/process.c.orig Mon Mar 17 07:06:56 2003 ++++ src/process.c Tue Aug 12 01:17:12 2003 +@@ -1850,6 +1850,7 @@ + for (lres = res; lres; lres = lres->ai_next) + { + s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol); ++ + if (s < 0) + { + xerrno = errno; +@@ -1882,19 +1883,43 @@ + It'd be nice to be able to control the connect timeout + though. Would non-blocking connect calls be portable? */ + turn_on_atimers (0); ++ + ret = connect (s, lres->ai_addr, lres->ai_addrlen); + xerrno = errno; + turn_on_atimers (1); + +- if (ret == 0 || xerrno == EISCONN) ++ if (ret == 0 || xerrno == EISCONN ) + /* The unwind-protect will be discarded afterwards. + Likewise for immediate_quit. */ + break; + + immediate_quit = 0; + +- if (xerrno == EINTR) +- goto loop; ++#if 1 ++ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ ++ fd_set fds; ++ int e; ++ struct timeval tv; ++ tv.tv_sec =60; ++ tv.tv_usec = 0; ++ FD_ZERO(&fds); ++ FD_SET(s, &fds); ++ resel: ++ e = select(s+1, NULL, &fds, NULL, &tv); ++ ++ if( e == -1){ ++ if(errno == EINTR) ++ goto resel; ++ else ++ xerrno = ETIMEDOUT; ++ } ++ else { ++ xerrno = 0; ++ break; ++ } ++ } ++#endif ++ + if (xerrno == EADDRINUSE && retry < 20) + { + /* A delay here is needed on some FreeBSD systems, +@@ -2000,11 +2025,30 @@ + && errno != EISCONN) + { + int xerrno = errno; +- ++ + immediate_quit = 0; + +- if (errno == EINTR) +- goto loop; ++#if 1 ++ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ ++ fd_set fds; ++ int e; ++ struct timeval tv; ++ tv.tv_sec =60; ++ tv_tv_usec = 0; ++ FD_CLEAR(&fds); ++ FD_SET(s, &fds); ++ resel: ++ e = select(s+1, NULL, fds, NULL, &tv); ++ if( e != 0){ ++ if(errno == EINTR) ++ goto resel; ++ else ++ xerrno = ETIMEDOUT; ++ } ++ else ++ xerrno = 0; ++ } ++#endif + if (errno == EADDRINUSE && retry < 20) + { + /* A delay here is needed on some FreeBSD systems, diff --git a/editors/emacs22/files/patch-src:s:freebsd.h b/editors/emacs22/files/patch-src:s:freebsd.h new file mode 100644 index 000000000000..2eb9ea8823ee --- /dev/null +++ b/editors/emacs22/files/patch-src:s:freebsd.h @@ -0,0 +1,14 @@ +--- src/s/freebsd.h.orig Tue Feb 20 19:52:17 2001 ++++ src/s/freebsd.h Mon Feb 18 11:51:50 2002 +@@ -68,6 +68,11 @@ + #define LIBS_SYSTEM -lutil + #if __FreeBSD_version < 400000 + #define LIBS_TERMCAP -ltermcap ++#else ++#ifdef HAVE_LIBNCURSES ++#define TERMINFO ++#define LIBS_TERMCAP -lncurses ++#endif + #endif + + #define SYSV_SYSTEM_DIR |