diff options
Diffstat (limited to 'editors/emacs20/files')
28 files changed, 0 insertions, 700 deletions
diff --git a/editors/emacs20/files/patch-aa b/editors/emacs20/files/patch-aa deleted file mode 100644 index eb174b99eda3..000000000000 --- a/editors/emacs20/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Apr 10 04:16:24 1999 -+++ Makefile.in Sat Jul 24 01:03:43 1999 -@@ -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 diff --git a/editors/emacs20/files/patch-ac b/editors/emacs20/files/patch-ac deleted file mode 100644 index 7b2aa2c74e65..000000000000 --- a/editors/emacs20/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- man/widget.texi.orig Mon Oct 13 14:20:26 1997 -+++ man/widget.texi Mon Oct 13 14:21:25 1997 -@@ -3,6 +3,11 @@ - @c %**start of header - @setfilename ../info/widget - @settitle The Emacs Widget Library -+@dircategory The Emacs editor and associated tools -+@direntry -+* Widget: (widget). The Emacs Widget Library -+@end direntry -+ - @iftex - @afourpaper - @headings double diff --git a/editors/emacs20/files/patch-ad b/editors/emacs20/files/patch-ad deleted file mode 100644 index c702deff83dd..000000000000 --- a/editors/emacs20/files/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ ---- man/dired-x.texi.orig Sun May 17 03:52:28 1998 -+++ man/dired-x.texi Sat Jul 24 01:19:47 1999 -@@ -19,9 +19,9 @@ - @c dired-x.el REVISION NUMBER - @settitle Dired Extra Version 2 User's Manual - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* Dired-X: (dired-x). Dired Extra Features. -+* Dired-X: (dired-x). Dired Extra Features. - @end direntry - - @iftex diff --git a/editors/emacs20/files/patch-ag b/editors/emacs20/files/patch-ag deleted file mode 100644 index 127f1b628290..000000000000 --- a/editors/emacs20/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- man/Makefile.in.orig Sat Dec 5 08:33:16 1998 -+++ man/Makefile.in Sat Jul 24 01:25:06 1999 -@@ -11,7 +11,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 \ -@@ -70,6 +70,7 @@ - ${srcdir}/glossary.texi \ - ${srcdir}/ack.texi - -+all: info - info: $(INFO_TARGETS) - - dvi: $(DVI_TARGETS) diff --git a/editors/emacs20/files/patch-ah b/editors/emacs20/files/patch-ah deleted file mode 100644 index 5a24e77c253b..000000000000 --- a/editors/emacs20/files/patch-ah +++ /dev/null @@ -1,29 +0,0 @@ ---- lib-src/Makefile.in.orig Sat Aug 1 20:22:55 1998 -+++ lib-src/Makefile.in Sat Feb 13 17:30:37 1999 -@@ -218,7 +218,7 @@ - LIBMAIL=-lmail - #endif - --LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC -+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC -lcompat - - /* We need to #define emacs to get the right versions of some files. - Some other files - those shared with other GNU utilities - need -@@ -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 - -@@ -290,7 +290,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/emacs20/files/patch-ai b/editors/emacs20/files/patch-ai deleted file mode 100644 index c506c8761586..000000000000 --- a/editors/emacs20/files/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ ---- src/unexelf.c.orig Mon May 15 17:14:02 2000 -+++ src/unexelf.c Sat Jul 1 18:17:15 2000 -@@ -506,6 +506,14 @@ - # 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 - # ifdef __STDC__ - # define ElfBitsW(bits, type) Elf##bits##_##type diff --git a/editors/emacs20/files/patch-aj b/editors/emacs20/files/patch-aj deleted file mode 100644 index b11a244c6e41..000000000000 --- a/editors/emacs20/files/patch-aj +++ /dev/null @@ -1,31 +0,0 @@ ---- src/m/alpha.h.orig Wed Oct 29 16:47:37 1997 -+++ src/m/alpha.h Sun Jan 3 20:05:49 1999 -@@ -239,7 +239,7 @@ - - #ifndef NOT_C_CODE - /* We need these because pointers are larger than the default ints. */ --#if !defined(__NetBSD__) && !defined(__OpenBSD__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #include <alloca.h> - #else - #include <stdlib.h> -@@ -308,7 +308,8 @@ - termio and struct termios are mutually incompatible. */ - #define NO_TERMIO - --#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) -+#if defined (LINUX) || \ -+ defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) - # define TEXT_END ({ extern int _etext; &_etext; }) - # ifndef __ELF__ - # define COFF -@@ -316,7 +317,8 @@ - # endif /* notdef __ELF__ */ - #endif - --#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) -+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \ -+ && defined (__ELF__) - #define HAVE_TEXT_START - #endif - diff --git a/editors/emacs20/files/patch-al b/editors/emacs20/files/patch-al deleted file mode 100644 index 01116fb1af07..000000000000 --- a/editors/emacs20/files/patch-al +++ /dev/null @@ -1,17 +0,0 @@ ---- man/cc-mode.texi.orig Sun May 17 03:55:23 1998 -+++ man/cc-mode.texi Sat Jul 24 01:03:42 1999 -@@ -8,10 +8,10 @@ - @settitle CC MODE Version 5 Documentation - @footnotestyle end - --@dircategory Editors --@direntry --* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, Objective-C -- and Java code. -+@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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/editors/emacs20/files/patch-am b/editors/emacs20/files/patch-am deleted file mode 100644 index 678e11fd9cf6..000000000000 --- a/editors/emacs20/files/patch-am +++ /dev/null @@ -1,14 +0,0 @@ ---- man/cl.texi.orig Wed Apr 7 03:12:55 1999 -+++ man/cl.texi Sat Jul 24 01:03:42 1999 -@@ -2,9 +2,9 @@ - @setfilename ../info/cl - @settitle Common Lisp Extensions - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* CL: (cl). Partial Common Lisp support for Emacs Lisp. -+* CL: (cl). Partial Common Lisp support for Emacs Lisp. - @end direntry - - @iftex diff --git a/editors/emacs20/files/patch-an b/editors/emacs20/files/patch-an deleted file mode 100644 index e89d18a67d7f..000000000000 --- a/editors/emacs20/files/patch-an +++ /dev/null @@ -1,23 +0,0 @@ ---- man/emacs.texi.orig Tue Jun 13 04:12:20 2000 -+++ man/emacs.texi Tue Apr 9 22:47:39 2002 -@@ -11,9 +11,9 @@ - updated for Emacs version 20.7. - @c Please REMEMBER to update edition number in *three* places in this file. - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* Emacs: (emacs). The extensible self-documenting text editor. -+* Emacs: (emacs). The extensible self-documenting text editor. - @end direntry - - Published by the Free Software Foundation -@@ -119,7 +119,7 @@ - Emacs is the extensible, customizable, self-documenting real-time - display editor. This Info file describes how to edit with Emacs and - some of how to customize it; it corresponds to GNU Emacs version 20.7. --For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The -+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The - Emacs Lisp Reference Manual}. - @end ifinfo - diff --git a/editors/emacs20/files/patch-ao b/editors/emacs20/files/patch-ao deleted file mode 100644 index 4a39b602119d..000000000000 --- a/editors/emacs20/files/patch-ao +++ /dev/null @@ -1,26 +0,0 @@ ---- man/forms.texi.orig Mon Aug 24 18:43:18 1998 -+++ man/forms.texi Sat Jul 24 01:03:41 1999 -@@ -8,18 +8,17 @@ - @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 - @end iftex - @c @smallbook - @comment %**end of header (This is for running Texinfo on a region.) -- --@dircategory Editors --@direntry --* Forms: (forms). Emacs package for editing data bases -- by filling in forms. --@end direntry - - @ifinfo - This file documents Forms mode, a form-editing major mode for GNU Emacs. diff --git a/editors/emacs20/files/patch-ap b/editors/emacs20/files/patch-ap deleted file mode 100644 index 6ccf025d7f78..000000000000 --- a/editors/emacs20/files/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ ---- man/gnus.texi.orig Wed Apr 7 07:46:41 1999 -+++ man/gnus.texi Sat Jul 24 01:09:33 1999 -@@ -5,8 +5,9 @@ - @synindex fn cp - @synindex vr cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools - @direntry --* Gnus: (gnus). The newsreader Gnus. -+* Gnus: (gnus). The newsreader Gnus. - @end direntry - @iftex - @finalout diff --git a/editors/emacs20/files/patch-aq b/editors/emacs20/files/patch-aq deleted file mode 100644 index 207dde1ea0ec..000000000000 --- a/editors/emacs20/files/patch-aq +++ /dev/null @@ -1,20 +0,0 @@ ---- man/mh-e.texi.orig Sun May 17 03:51:15 1998 -+++ man/mh-e.texi Sat Jul 24 01:03:41 1999 -@@ -4,13 +4,12 @@ - @setfilename ../info/mh-e - @settitle mh-e - @c %**end of header -- --@setchapternewpage odd -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* MH-E: (mh-e). Emacs interface to the MH mail system. -+* MH-E: (mh-e). Emacs interface to the MH mail system. - @end direntry -+ -+@setchapternewpage odd - - @c Version variables. - @set EDITION 1.2 diff --git a/editors/emacs20/files/patch-ar b/editors/emacs20/files/patch-ar deleted file mode 100644 index c7c6cf9f0ea3..000000000000 --- a/editors/emacs20/files/patch-ar +++ /dev/null @@ -1,24 +0,0 @@ ---- man/sc.texi.orig Fri Jul 3 03:48:27 1998 -+++ man/sc.texi Sat Jul 24 01:03:42 1999 -@@ -3,15 +3,15 @@ - @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 -- --@dircategory Editors --@direntry --* SC: (sc). Supercite lets you cite parts of messages you're -- replying to, in flexible ways. --@end direntry - - @c @setchapternewpage odd % For book style double sided manual. - @comment %**end of header (This is for running Texinfo on a region.) diff --git a/editors/emacs20/files/patch-as b/editors/emacs20/files/patch-as deleted file mode 100644 index 621927bb0c03..000000000000 --- a/editors/emacs20/files/patch-as +++ /dev/null @@ -1,15 +0,0 @@ ---- man/vip.texi.orig Sun May 17 03:48:50 1998 -+++ man/vip.texi Sat Jul 24 01:03:40 1999 -@@ -2,10 +2,9 @@ - - @setfilename ../info/vip - @settitle VIP -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* VIP: (vip). An older VI-emulation for Emacs. -+* VIP: (vip). A VI-emulation for Emacs. - @end direntry - - @iftex diff --git a/editors/emacs20/files/patch-at b/editors/emacs20/files/patch-at deleted file mode 100644 index e85d00b27c04..000000000000 --- a/editors/emacs20/files/patch-at +++ /dev/null @@ -1,17 +0,0 @@ ---- man/viper.texi.orig Mon Nov 9 02:13:07 1998 -+++ man/viper.texi Sat Jul 24 01:03:41 1999 -@@ -5,12 +5,9 @@ - @comment @setfilename viper - @comment @setfilename viper.info - @setfilename ../info/viper -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* VIPER: (viper). The newest Emacs VI-emulation mode. -- (also, A VI Plan for Emacs Rescue -- or the VI PERil.) -+* VIPER: (viper). The new VI-emulation mode in Emacs-19.29. - @end direntry - - @iftex diff --git a/editors/emacs20/files/patch-au b/editors/emacs20/files/patch-au deleted file mode 100644 index 2e34ee0d8d9a..000000000000 --- a/editors/emacs20/files/patch-au +++ /dev/null @@ -1,14 +0,0 @@ ---- man/ediff.texi.orig Tue Jun 9 12:29:49 1998 -+++ man/ediff.texi Sat Jul 24 01:19:48 1999 -@@ -14,9 +14,9 @@ - @synindex fn cp - @synindex pg cp - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* Ediff: (ediff). A visual interface for comparing and merging programs. -+* Ediff: (ediff). A visual interface for comparing and merging programs. - @end direntry - - @iftex diff --git a/editors/emacs20/files/patch-av b/editors/emacs20/files/patch-av deleted file mode 100644 index f188e69269bf..000000000000 --- a/editors/emacs20/files/patch-av +++ /dev/null @@ -1,21 +0,0 @@ ---- man/message.texi.orig Wed Apr 7 07:48:28 1999 -+++ man/message.texi Sat Jul 24 01:23:30 1999 -@@ -5,15 +5,15 @@ - @synindex fn cp - @synindex vr cp - @synindex pg cp -+@ifinfo -+@dircategory The Emacs editor and associated tools - @direntry --* Message: (message). Mail and news composition mode that goes with Gnus. -+* Message: (message). Message, the Emacs message composition mode. - @end direntry - @iftex - @finalout - @end iftex - @setchapternewpage odd -- --@ifinfo - - This file documents Message, the Emacs message composition mode. - diff --git a/editors/emacs20/files/patch-aw b/editors/emacs20/files/patch-aw deleted file mode 100644 index 95c713864516..000000000000 --- a/editors/emacs20/files/patch-aw +++ /dev/null @@ -1,16 +0,0 @@ ---- man/reftex.texi.orig Sat Jul 24 02:31:43 1999 -+++ man/reftex.texi Sat Jul 24 02:33:26 1999 -@@ -2,10 +2,10 @@ - @c %**start of header - @setfilename ../info/reftex - @settitle RefTeX User Manual --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* reftex: (reftex). Support for LaTeX labels, references, and citations -- with Emacs. -+* reftex: (reftex). Support for LaTeX labels, references, -+ and citations with Emacs. - @end direntry - @synindex ky cp - @syncodeindex vr cp diff --git a/editors/emacs20/files/patch-bb b/editors/emacs20/files/patch-bb deleted file mode 100644 index 896c8fecaa12..000000000000 --- a/editors/emacs20/files/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ ---- man/info.texi.orig Fri Apr 17 10:12:19 1998 -+++ man/info.texi Wed Feb 10 00:18:56 1999 -@@ -2,6 +2,10 @@ - @comment %**start of header - @setfilename ../info/info - @settitle Info 1.0 -+@dircategory The Emacs editor and associated tools -+@direntry -+* Info: (info). GNU on-line hyper document system. -+@end direntry - @comment %**end of header - - @iftex diff --git a/editors/emacs20/files/patch-cb b/editors/emacs20/files/patch-cb deleted file mode 100644 index e0f8e199020e..000000000000 --- a/editors/emacs20/files/patch-cb +++ /dev/null @@ -1,24 +0,0 @@ ---- src/s/freebsd.h.orig Tue May 2 21:29:10 2000 -+++ src/s/freebsd.h Sun Jan 12 01:06:02 2003 -@@ -56,9 +56,20 @@ - #ifdef __ELF__ - - #define LD_SWITCH_SYSTEM -+ -+#if __FreeBSD_version >= 500000 -+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc -+#endif -+ -+#ifdef __alpha__ -+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o -+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o -+#else - #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o --#define UNEXEC unexelf.o - #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o -+#endif -+ -+#define UNEXEC unexelf.o - #undef LIB_GCC - #define LIB_GCC - diff --git a/editors/emacs20/files/patch-cc b/editors/emacs20/files/patch-cc deleted file mode 100644 index a8b400f7e6f9..000000000000 --- a/editors/emacs20/files/patch-cc +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.in.orig Tue Jun 6 00:42:49 2000 -+++ configure.in Sun Sep 23 06:53:04 2001 -@@ -147,6 +147,15 @@ - machine='' opsys='' unported=no - case "${canonical}" in - -+ ## FreeBSD ports -+ *-*-freebsd* ) -+ opsys=freebsd -+ case "${canonical}" in -+ alpha*-*-freebsd*) machine=alpha ;; -+ i[3456]86-*-freebsd*) machine=intel386 ;; -+ esac -+ ;; -+ - ## NetBSD ports - *-*-netbsd* ) - opsys=netbsd -@@ -958,7 +967,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 -@@ -1639,7 +1647,7 @@ - rename closedir mkdir rmdir sysinfo \ - random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \ - strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ --utimes setrlimit setpgid getcwd shutdown strftime) -+utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo) - - # UNIX98 PTYs. - AC_CHECK_FUNCS(grantpt) diff --git a/editors/emacs20/files/patch-cd b/editors/emacs20/files/patch-cd deleted file mode 100644 index f12adabb7d08..000000000000 --- a/editors/emacs20/files/patch-cd +++ /dev/null @@ -1,10 +0,0 @@ ---- src/config.in.orig Sat May 20 23:58:21 2000 -+++ src/config.in Sun Sep 23 05:33:27 2001 -@@ -236,6 +236,7 @@ - #undef HAVE_STRFTIME - #undef HAVE_GRANTPT - #undef HAVE_GETPT -+#undef HAVE_GETADDRINFO - - #undef LOCALTIME_CACHE - #undef HAVE_INET_SOCKETS diff --git a/editors/emacs20/files/patch-cg b/editors/emacs20/files/patch-cg deleted file mode 100644 index ad2a70850899..000000000000 --- a/editors/emacs20/files/patch-cg +++ /dev/null @@ -1,161 +0,0 @@ ---- 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; - diff --git a/editors/emacs20/files/patch-ch b/editors/emacs20/files/patch-ch deleted file mode 100644 index 02301bd363c5..000000000000 --- a/editors/emacs20/files/patch-ch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/process.c.original Fri Sep 23 11:49:02 2005 -+++ src/process.c Fri Sep 23 11:51:45 2005 -@@ -400,6 +400,14 @@ - - #ifdef HAVE_PTYS - -+char to_tty_char(int i) -+{ -+ if (i < 10) -+ return '0' + i; -+ else -+ return 'a' + i - 10; -+} -+ - /* Open an available pty, returning a file descriptor. - Return -1 on failure. - The file name of the terminal corresponding to the pty -@@ -423,13 +431,13 @@ - PTY_ITERATION - #else - for (c = FIRST_PTY_LETTER; c <= 'z'; c++) -- for (i = 0; i < 16; i++) -+ for (i = 0; i < 'z' - 'a' + 1 + 10; i++) - #endif - { - #ifdef PTY_NAME_SPRINTF - PTY_NAME_SPRINTF - #else -- sprintf (pty_name, "/dev/pty%c%x", c, i); -+ sprintf (pty_name, "/dev/pty%c%c", c, to_tty_char(i)); - #endif /* no PTY_NAME_SPRINTF */ - - #ifdef PTY_OPEN -@@ -446,7 +454,7 @@ - if (stat (pty_name, &stb) < 0) - { - failed_count++; -- if (failed_count >= 3) -+ if (failed_count >= 30) - return -1; - } - else -@@ -466,7 +474,7 @@ - #ifdef PTY_TTY_NAME_SPRINTF - PTY_TTY_NAME_SPRINTF - #else -- sprintf (pty_name, "/dev/tty%c%x", c, i); -+ sprintf (pty_name, "/dev/tty%c%c", c, to_tty_char(i)); - #endif /* no PTY_TTY_NAME_SPRINTF */ - #ifndef UNIPLUS - if (access (pty_name, 6) != 0) diff --git a/editors/emacs20/files/patch-lib-src::movemail.c b/editors/emacs20/files/patch-lib-src::movemail.c deleted file mode 100644 index 6c04c1de3ecf..000000000000 --- a/editors/emacs20/files/patch-lib-src::movemail.c +++ /dev/null @@ -1,19 +0,0 @@ -*** lib-src/movemail.c.orig Sun May 2 18:25:15 1999 ---- lib-src/movemail.c Thu Feb 10 21:38:32 2005 -*************** -*** 765,771 **** - mbx_delimit_begin (mbf); - if (pop_retr (server, i, mbf) != OK) - { -! error (Errmsg); - close (mbfi); - return (1); - } ---- 765,771 ---- - mbx_delimit_begin (mbf); - if (pop_retr (server, i, mbf) != OK) - { -! error ("%s", Errmsg); - close (mbfi); - return (1); - } diff --git a/editors/emacs20/files/patch-lisp::dired.el b/editors/emacs20/files/patch-lisp::dired.el deleted file mode 100644 index fd23d06496bb..000000000000 --- a/editors/emacs20/files/patch-lisp::dired.el +++ /dev/null @@ -1,19 +0,0 @@ ---- lisp/dired.el.orig Tue Nov 30 00:04:12 1999 -+++ lisp/dired.el Wed Dec 5 03:15:14 2001 -@@ -1375,6 +1375,7 @@ - ;; weiand: changed: year potentially unaligned - ;;old s "\\(" HH:MM "\\|" s yyyy "\\|" yyyy s "\\)")) - s "\\(" HH:MM "\\|" s "?" yyyy "\\|" yyyy s "\\)")) -+ (freebsd-ja (concat s "?" mm "\\(/\\|" s "\\)" dd s "\\(" HH:MM "\\|" s yyyy "\\)")) - (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) - ;; The "[0-9]" below requires the previous column to end in a digit. - ;; This avoids recognizing `1 may 1997' as a date in the line: -@@ -1382,7 +1383,7 @@ - ;; The ".*" below finds the last match if there are multiple matches. - ;; 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]" s "\\(" western "\\|" japanese "\\)" s)) -+ (concat ".*[0-9]" s "\\(" western "\\|" japanese "\\|" freebsd-ja "\\)" 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/emacs20/files/patch-src_emacs.c b/editors/emacs20/files/patch-src_emacs.c deleted file mode 100644 index 2e6ed6273985..000000000000 --- a/editors/emacs20/files/patch-src_emacs.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- src/emacs.c.orig Wed May 24 15:58:54 2000 -+++ src/emacs.c Mon Jul 29 23:23:20 2002 -@@ -602,7 +602,6 @@ - char stack_bottom_variable; - int skip_args = 0; - extern int errno; -- extern int sys_nerr; - #ifdef HAVE_SETRLIMIT - struct rlimit rlim; - #endif |