freebsd-ports/editors/emacs22/files/patch-ac

--- src/s/freebsd.h.orig	Sun Jun  9 15:14:32 1996
+++ src/s/freebsd.h	Fri Apr  9 18:17:41 1999
@@ -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
@@ -34,7 +44,6 @@
 #define LIBS_DEBUG
 #define LIBS_SYSTEM -lutil
 #define LIBS_TERMCAP -ltermcap
-#define LIB_GCC -lgcc
 
 #define SYSV_SYSTEM_DIR
 
@@ -42,12 +51,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 +93,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 +112,8 @@
 #define BSD 199103
 #elif __FreeBSD__ == 2
 #define BSD 199306
+#elif __FreeBSD__ >= 3
+#define BSD 199506
 #endif
 
 #define WAITTYPE int
Fix for systems where __FreeBSD__ >= 3. PR: 10783 Submitted by: Peter Jeremy <peter.jeremy@auss2.alcatel.com.au> Diagnosed by: David Deatherage <DDeatherage@bridge.com> 1999-04-10 00:14:28 +00:00			`--- src/s/freebsd.h.orig Sun Jun 9 15:14:32 1996`
			`+++ src/s/freebsd.h Fri Apr 9 18:17:41 1999`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`@@ -1,5 +1,15 @@`
			`/* s/ file for freebsd system. */`
If compiling under native ncurses (instead of libcurses), we have to use the terminfo version of tparam() since the termcap version supplies tgoto() which seriously screws up text display. ncurses-4.1 has both a termcap and terminfo internal interface and is quicker with the terminfo one even when it's read a termcap.db file. 1997-05-26 13:34:38 +00:00
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+/* 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`
If compiling under native ncurses (instead of libcurses), we have to use the terminfo version of tparam() since the termcap version supplies tgoto() which seriously screws up text display. ncurses-4.1 has both a termcap and terminfo internal interface and is quicker with the terminfo one even when it's read a termcap.db file. 1997-05-26 13:34:38 +00:00			`+#else`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#include <osreldate.h>`
If compiling under native ncurses (instead of libcurses), we have to use the terminfo version of tparam() since the termcap version supplies tgoto() which seriously screws up text display. ncurses-4.1 has both a termcap and terminfo internal interface and is quicker with the terminfo one even when it's read a termcap.db file. 1997-05-26 13:34:38 +00:00			`+#endif`
			`+`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`/* '__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`
			`@@ -34,7 +44,6 @@`
			`#define LIBS_DEBUG`
			`#define LIBS_SYSTEM -lutil`
			`#define LIBS_TERMCAP -ltermcap`
			`-#define LIB_GCC -lgcc`

If compiling under native ncurses (instead of libcurses), we have to use the terminfo version of tparam() since the termcap version supplies tgoto() which seriously screws up text display. ncurses-4.1 has both a termcap and terminfo internal interface and is quicker with the terminfo one even when it's read a termcap.db file. 1997-05-26 13:34:38 +00:00			`#define SYSV_SYSTEM_DIR`

Add fix for Alpha. - patch for configure, unexelf.c, alpha.h, PLIST and etc. 1999-01-23 14:28:28 +00:00			`@@ -42,12 +51,33 @@`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`#undef BSD_PGRPS`
			`#define GETPGRP_NO_ARG`

			`+#ifdef __ELF__`
			`+`
			`+#define LD_SWITCH_SYSTEM`
Add fix for Alpha. - patch for configure, unexelf.c, alpha.h, PLIST and etc. 1999-01-23 14:28:28 +00:00			`+#ifdef i386`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#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`
Add fix for Alpha. - patch for configure, unexelf.c, alpha.h, PLIST and etc. 1999-01-23 14:28:28 +00:00			`+#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`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#undef LIB_GCC`
			`+#define LIB_GCC`
			`+`
			`+#else /* not __ELF__ */`
			`+`
			`#ifndef NO_SHARED_LIBS`
Add patches to use the unexec function from xemacs. This eliminates the need for a hack in ld.so to make emacs work. I have submitted these changes to a GNU emacs maintainer. 1997-12-23 05:35:56 +00:00			`#define LD_SWITCH_SYSTEM -e start -dc -dp`
			#define HAVE_TEXT_START /* No need to define `start_of_text'. */
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#if __FreeBSD_version >= 300002`
			`+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o`
			`+#else /* __FreeBSD_version < 300002 */`
Add patches to use the unexec function from xemacs. This eliminates the need for a hack in ld.so to make emacs work. I have submitted these changes to a GNU emacs maintainer. 1997-12-23 05:35:56 +00:00			`#define START_FILES pre-crt0.o /usr/lib/crt0.o`
			`-#define UNEXEC unexsunos4.o`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#endif /* __FreeBSD_version < 300002 */`
Add patches to use the unexec function from xemacs. This eliminates the need for a hack in ld.so to make emacs work. I have submitted these changes to a GNU emacs maintainer. 1997-12-23 05:35:56 +00:00			`+#define UNEXEC unexfreebsd.o`
			`#define RUN_TIME_REMAP`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`+#define LIB_GCC -lgcc`
Add patches to use the unexec function from xemacs. This eliminates the need for a hack in ld.so to make emacs work. I have submitted these changes to a GNU emacs maintainer. 1997-12-23 05:35:56 +00:00
			`#ifndef N_TRELOFF`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`#define N_PAGSIZ(x) __LDPGSZ`
Add fix for Alpha. - patch for configure, unexelf.c, alpha.h, PLIST and etc. 1999-01-23 14:28:28 +00:00			`@@ -63,6 +93,8 @@`
Convert to ELF. PR: 8090 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp> 1998-10-10 04:37:24 +00:00			`#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 */`
Add fix for Alpha. - patch for configure, unexelf.c, alpha.h, PLIST and etc. 1999-01-23 14:28:28 +00:00			`@@ -80,6 +112,8 @@`
Make the emacs/mule ports compile when __FreeBSD__ == 3. Closes PR ports/3175. 1997-04-09 07:24:35 +00:00			`#define BSD 199103`
			`#elif __FreeBSD__ == 2`
			`#define BSD 199306`
Fix for systems where __FreeBSD__ >= 3. PR: 10783 Submitted by: Peter Jeremy <peter.jeremy@auss2.alcatel.com.au> Diagnosed by: David Deatherage <DDeatherage@bridge.com> 1999-04-10 00:14:28 +00:00			`+#elif __FreeBSD__ >= 3`
Make the emacs/mule ports compile when __FreeBSD__ == 3. Closes PR ports/3175. 1997-04-09 07:24:35 +00:00			`+#define BSD 199506`
			`#endif`

			`#define WAITTYPE int`