emacs.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125
  1. --- configure.orig Thu Jul 31 09:30:40 2003
  2. +++ configure Thu Jul 31 09:32:10 2003
  3. @@ -805,6 +805,16 @@
  4. machine='' opsys='' unported=no
  5. case "${canonical}" in
  6. + ## FreeBSD ports
  7. + *-*-freebsd* )
  8. + opsys=freebsd
  9. + case "${canonical}" in
  10. + alpha*-*-freebsd*) machine=alpha ;;
  11. + i[3456]86-*-freebsd*) machine=intel386 ;;
  12. + sparc64-*-freebsd*) machine=sparc ;;
  13. + esac
  14. + ;;
  15. +
  16. ## NetBSD ports
  17. *-*-netbsd* )
  18. opsys=netbsd
  19. @@ -1535,9 +1545,19 @@
  20. NON_GNU_CPP=/usr/ccs/lib/cpp
  21. RANLIB="ar -ts"
  22. ;;
  23. - *-sunos5* | *-solaris* )
  24. + *-sunos5.6* | *-solaris2.6* )
  25. opsys=sol2-5
  26. NON_GNU_CPP=/usr/ccs/lib/cpp
  27. + RANLIB="ar -ts"
  28. + ;;
  29. + *-sunos5.7* | *-solaris2.7* )
  30. + opsys=sol2-5
  31. + NON_GNU_CPP=/usr/ccs/lib/cpp
  32. + RANLIB="ar -ts"
  33. + ;;
  34. + *-sunos5* | *-solaris* )
  35. + opsys=sol2-8
  36. + NON_GNU_CPP=/usr/ccs/lib/cpp
  37. ;;
  38. * ) opsys=bsd4-2 ;;
  39. esac
  40. @@ -1658,7 +1678,6 @@
  41. ;;
  42. *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
  43. *-386bsd* ) opsys=386bsd ;;
  44. - *-freebsd* ) opsys=freebsd ;;
  45. *-nextstep* ) opsys=nextstep ;;
  46. ## Otherwise, we'll fall through to the generic opsys code at the bottom.
  47. esac
  48. --- /dev/null Mon Jan 13 19:51:22 2003
  49. +++ src/s/sol2-8.h Mon Jan 13 18:15:37 2003
  50. @@ -0,0 +1,10 @@
  51. +/* Handle Solaris 2.8 and 2.9 */
  52. +
  53. +#include "sol2-5.h"
  54. +
  55. +/* Avoid conflict between strings.h and iso/string_iso.h */
  56. +
  57. +#undef bcmp
  58. +#undef bcopy
  59. +#undef bzero
  60. +
  61. --- src/Makefile.in.orig Mon Dec 17 23:09:32 2001
  62. +++ src/Makefile.in Mon Oct 21 13:37:26 2002
  63. @@ -155,6 +155,10 @@
  64. /* This holds special options for linking temacs
  65. that should be used for linking anything else. */
  66. #ifndef LD_SWITCH_SYSTEM_TEMACS
  67. +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
  68. +#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
  69. +#else
  70. #define LD_SWITCH_SYSTEM_TEMACS
  71. +#endif
  72. #endif
  73. --- src/alloc.c.orig Thu Sep 12 13:50:01 2002
  74. +++ src/alloc.c Thu Sep 12 13:48:11 2002
  75. @@ -3723,7 +3723,11 @@
  76. /* This trick flushes the register windows so that all the state of
  77. the process is contained in the stack. */
  78. #ifdef sparc
  79. +#ifdef __sparc64__
  80. + asm ("flushw");
  81. +#else
  82. asm ("ta 3");
  83. +#endif
  84. #endif
  85. /* Save registers that we need to see on the stack. We need to see
  86. --- src/m/alpha.h.orig Mon Oct 2 23:30:39 2000
  87. +++ src/m/alpha.h Wed Feb 13 09:05:57 2002
  88. @@ -198,7 +198,7 @@
  89. #ifndef NOT_C_CODE
  90. /* We need these because pointers are larger than the default ints. */
  91. -#if !defined(__NetBSD__) && !defined(__OpenBSD__)
  92. +#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
  93. #include <alloca.h>
  94. #endif
  95. --- src/m/sparc.h.orig Thu Sep 12 02:25:09 2002
  96. +++ src/m/sparc.h Thu Sep 12 12:33:36 2002
  97. @@ -89,7 +89,7 @@
  98. #define PURESIZE 130000
  99. #endif
  100. -#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
  101. +#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
  102. /* This really belongs in s/sun.h. */
  103. /* Say that the text segment of a.out includes the header;
  104. --- src/s/freebsd.h.orig Tue Feb 20 19:52:17 2001
  105. +++ src/s/freebsd.h Mon Feb 18 11:51:50 2002
  106. @@ -68,6 +68,11 @@
  107. #define LIBS_SYSTEM -lutil
  108. #if __FreeBSD_version < 400000
  109. #define LIBS_TERMCAP -ltermcap
  110. +#else
  111. +#ifdef HAVE_LIBNCURSES
  112. +#define TERMINFO
  113. +#define LIBS_TERMCAP -lncurses
  114. +#endif
  115. #endif
  116. #define SYSV_SYSTEM_DIR