diff options
author | Justin M. Seger <jseger@FreeBSD.org> | 2000-07-30 03:45:10 +0000 |
---|---|---|
committer | Justin M. Seger <jseger@FreeBSD.org> | 2000-07-30 03:45:10 +0000 |
commit | 348a8f1b9d9507ea13c2490d6a12aa5d0b6b5a2a (patch) | |
tree | 4dab324ff31b0c943ada9bada7f277349077933c /editors/emacs20 | |
parent | Activate BibleReader. (diff) |
patch-ai, patch-an, patch-cg: Regenerated for emacs-20.7.
patch-cc (configure.in): Merged with patch-ch.
patch-af (src/unexfreebsd.c): Removed. Not used by this port.
patch-ca (src/Makefile.in): Removed. 5-CURRENT's and
4-STABLE's libtermcap -> libncurses symbolic link issues
are now well handled by vendor's src/s/freebsd.h.
Moved LIBS_XPG changes to patch-cb.
patch-cb (src/s/freebsd.h): Regenerate for emacs-20.7.
Update the conditional of enclosing the USE_XPG check
so as not to link libxpg4 on recently 5-CURRENT and
4-STABLE after the merge of libxpg4 into libc.
Added LIBS_XPG to LIBS_SYSTEM.
PR: ports/19653
Submitted by: OKAZAKI Tetsurou <okazaki@be.to>
Notes
Notes:
svn path=/head/; revision=31124
Diffstat (limited to 'editors/emacs20')
-rw-r--r-- | editors/emacs20/files/patch-ai | 8 | ||||
-rw-r--r-- | editors/emacs20/files/patch-an | 6 | ||||
-rw-r--r-- | editors/emacs20/files/patch-cb | 26 | ||||
-rw-r--r-- | editors/emacs20/files/patch-cc | 15 | ||||
-rw-r--r-- | editors/emacs20/files/patch-cg | 19 |
5 files changed, 45 insertions, 29 deletions
diff --git a/editors/emacs20/files/patch-ai b/editors/emacs20/files/patch-ai index 1ae2376d3fed..c506c8761586 100644 --- a/editors/emacs20/files/patch-ai +++ b/editors/emacs20/files/patch-ai @@ -1,6 +1,6 @@ ---- src/unexelf.c.orig Mon Aug 10 11:33:12 1998 -+++ src/unexelf.c Sun Jan 3 20:54:08 1999 -@@ -512,6 +512,14 @@ +--- 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 @@ -14,4 +14,4 @@ + #ifndef ElfW # ifdef __STDC__ - # define ElfW(type) Elf32_##type + # define ElfBitsW(bits, type) Elf##bits##_##type diff --git a/editors/emacs20/files/patch-an b/editors/emacs20/files/patch-an index 0335a0d948e6..0e16253ef003 100644 --- a/editors/emacs20/files/patch-an +++ b/editors/emacs20/files/patch-an @@ -1,7 +1,7 @@ ---- man/emacs.texi.orig Fri Jun 25 02:53:58 1999 -+++ man/emacs.texi Sat Jul 24 01:09:24 1999 +--- man/emacs.texi.orig Tue Jun 13 04:12:20 2000 ++++ man/emacs.texi Sat Jul 1 21:02:39 2000 @@ -11,9 +11,9 @@ - updated for Emacs version 20.4 + updated for Emacs version 20.7. @c Please REMEMBER to update edition number in *three* places in this file. -@dircategory Editors diff --git a/editors/emacs20/files/patch-cb b/editors/emacs20/files/patch-cb index 28e6f9f1ae15..5a37edcb5321 100644 --- a/editors/emacs20/files/patch-cb +++ b/editors/emacs20/files/patch-cb @@ -1,20 +1,26 @@ ---- src/s/freebsd.h.orig Tue Apr 13 03:22:12 1999 -+++ src/s/freebsd.h Sat Jul 24 01:30:10 1999 -@@ -45,6 +45,13 @@ - #define LIBS_SYSTEM -lutil - #define LIBS_TERMCAP -ltermcap +--- src/s/freebsd.h.orig Tue May 2 21:29:10 2000 ++++ src/s/freebsd.h Sat Jul 1 20:17:45 2000 +@@ -41,8 +41,18 @@ + + #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) +/* Use XPG4 Library for FreeBSD */ -+#if __FreeBSD_version >= 220000 ++#define LIBS_XPG ++#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \ ++ || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005) +#ifdef USE_XPG ++#undef LIBS_XPG +#define LIBS_XPG -lxpg4 +#endif +#endif + - #define SYSV_SYSTEM_DIR - - /* freebsd has POSIX-style pgrp behavior. */ -@@ -54,9 +61,16 @@ + #define LIBS_DEBUG +-#define LIBS_SYSTEM -lutil ++#define LIBS_SYSTEM -lutil LIBS_XPG + #if __FreeBSD_version < 400000 + #define LIBS_TERMCAP -ltermcap + #endif +@@ -56,9 +66,16 @@ #ifdef __ELF__ #define LD_SWITCH_SYSTEM diff --git a/editors/emacs20/files/patch-cc b/editors/emacs20/files/patch-cc index f643112fc00d..cc565bb5cd40 100644 --- a/editors/emacs20/files/patch-cc +++ b/editors/emacs20/files/patch-cc @@ -1,5 +1,5 @@ ---- configure.in.orig Sun May 30 04:26:03 1999 -+++ configure.in Sat Jul 24 01:33:18 1999 +--- configure.in.orig Tue Jun 6 00:42:49 2000 ++++ configure.in Sat Jul 1 20:46:31 2000 @@ -42,6 +42,9 @@ AC_ARG_WITH(hesiod, [ --with-hesiod support Hesiod to get the POP server host], @@ -26,7 +26,7 @@ ## NetBSD ports *-*-netbsd* ) opsys=netbsd -@@ -943,7 +955,6 @@ +@@ -958,7 +970,6 @@ ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; @@ -34,3 +34,12 @@ *-nextstep* ) opsys=nextstep ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac +@@ -1639,7 +1650,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-cg b/editors/emacs20/files/patch-cg index 1973aff47d10..b1087db71b9e 100644 --- a/editors/emacs20/files/patch-cg +++ b/editors/emacs20/files/patch-cg @@ -1,5 +1,5 @@ ---- src/process.c-dist Fri Aug 14 22:51:44 1998 -+++ src/process.c Fri Jul 30 12:21:11 1999 +--- src/process.c.orig Wed May 24 04:10:16 2000 ++++ src/process.c Sat Jul 1 20:37:08 2000 @@ -1,7 +1,18 @@ +/* + * Locally hacked process.c to add ipv6 support. -wsr @@ -19,7 +19,7 @@ This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify -@@ -1808,15 +1819,22 @@ +@@ -1810,15 +1821,22 @@ { Lisp_Object proc; register int i; @@ -45,7 +45,7 @@ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int retry = 0; int count = specpdl_ptr - specpdl; -@@ -1829,6 +1847,22 @@ +@@ -1831,6 +1849,22 @@ GCPRO4 (name, buffer, host, service); CHECK_STRING (name, 0); CHECK_STRING (host, 0); @@ -68,8 +68,8 @@ if (INTEGERP (service)) port = htons ((unsigned short) XINT (service)); else -@@ -1839,6 +1873,8 @@ - error ("Unknown service \"%s\"", XSTRING (service)->data); +@@ -1841,6 +1875,8 @@ + error ("Unknown service \"%s\"", XSTRING (service)->data); port = svc_info->s_port; } +#endif /* HAVE_GETADDRINFO */ @@ -77,7 +77,7 @@ /* Slow down polling to every ten seconds. Some kernels have a bug which causes retrying connect to fail -@@ -1848,6 +1884,62 @@ +@@ -1850,6 +1886,62 @@ #endif #ifndef TERM @@ -140,10 +140,11 @@ while (1) { #ifdef TRY_AGAIN -@@ -1938,6 +2030,7 @@ +@@ -1940,6 +2032,7 @@ report_file_error ("connection failed", - Fcons (host, Fcons (name, Qnil))); + Fcons (host, Fcons (name, Qnil))); } +#endif /* HAVE_GETADDRINFO */ immediate_quit = 0; + |