Move dragonfly.h from patch to a real file. Modify it to deal with the

crt changes in DragonFly 1.7.1.

4 files changed, 144 insertions, 135 deletions

diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index d44b0a6ea2d..e560e5163a6 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2007/01/25 20:59:15 markd Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/03/24 01:30:50 joerg Exp $
 
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=	markd@NetBSD.org
@@ -41,6 +41,10 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACSVERSION}
 LDFLAGS+=	-Wl,-z,nocombreloc
 .endif
 
+.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
+CPPFLAGS+=	-DDFLY_PRE_17_CRT
+.endif
+
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=	FNS_EL="@comment "
 PLIST_SUBST+=	DOCTAIL=""
@@ -67,6 +71,7 @@ post-extract:
 	${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
 	${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
 	${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
+	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 	${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
 	${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m
 
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index d35ff181dc0..bca64092b08 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2007/01/25 20:59:15 markd Exp $
+$NetBSD: distinfo,v 1.33 2007/03/24 01:30:50 joerg Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -10,9 +10,8 @@ SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
-SHA1 (patch-ai) = ee6cdc06b101805c79e73bc3aaa04f5d79e48872
-SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
 SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714
+SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
 SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91
 SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76
diff --git a/editors/emacs/files/dragonfly.h b/editors/emacs/files/dragonfly.h
new file mode 100644
index 00000000000..604cda4a62e
--- /dev/null
+++ b/editors/emacs/files/dragonfly.h
@@ -0,0 +1,136 @@
+/* System description header for DragonFly systems.
+   This file describes the parameters that system description files
+   should define or not.
+   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   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 2, 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.  */
+
+/* Get most of the stuff from bsd4.3 */
+#include "bsd4-3.h"
+
+/* For mem-limits.h. */
+#define BSD4_2
+
+/* These aren't needed, since we have getloadavg.  */
+#undef KERNEL_FILE
+#undef LDAV_SYMBOL
+
+#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
+
+#define LIBS_DEBUG
+#define LIBS_SYSTEM -lutil
+#define SYSV_SYSTEM_DIR
+
+/* freebsd has POSIX-style pgrp behavior. */
+#undef BSD_PGRPS
+#define GETPGRP_NO_ARG
+
+#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
+#  ifndef DFLY_PRE_17_CRT
+#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
+#  else
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
+#  endif
+#else
+#error "Add compiler version magic"
+#endif
+
+#define LD_SWITCH_SYSTEM_1
+#define UNEXEC unexelf.o
+#undef LIB_GCC
+#define LIB_GCC
+
+#define HAVE_WAIT_HEADER
+#define HAVE_GETLOADAVG 1
+#define HAVE_TERMIOS
+#define NO_TERMIO
+#define DECLARE_GETPWUID_WITH_UID_T
+
+/* freebsd uses OXTABS instead of the expected TAB3. */
+#define TABDLY OXTABS
+#define TAB3 OXTABS
+
+/* this silences a few compilation warnings */
+#undef BSD_SYSTEM
+#define BSD_SYSTEM 199506
+
+/* Needed to avoid hanging when child process writes an error message
+   and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
+#define vfork fork
+
+/* Don't close pty in process.c to make it as controlling terminal.
+   It is already a controlling terminal of subprocess, because we did
+   ioctl TIOCSCTTY.  */
+#define DONT_REOPEN_PTY
+
+/* CLASH_DETECTION is defined in bsd4-3.h.
+   In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links
+   remaining in /tmp or other directories with +t bit.
+   To avoid this problem, you could #undef it to use no file lock. */
+/* #undef CLASH_DETECTION */
+
+/* If the system's imake configuration file defines `NeedWidePrototypes'
+   as `NO', we must define NARROWPROTO manually.  Such a define is
+   generated in the Makefile generated by `xmkmf'.  If we don't 
+   define NARROWPROTO, we will see the wrong function prototypes
+   for X functions taking float or double parameters.  */
+
+#define NARROWPROTO 1
+
+#define C_SWITCH_SYSTEM
+#define LD_SWITCH_SYSTEM
+
+/* Circumvent a bug in FreeBSD.  In the following sequence of
+   writes/reads on a PTY, read(2) returns bogus data:
+
+   write(2)  1022 bytes
+   write(2)   954 bytes, get EAGAIN
+   read(2)   1024 bytes in process_read_output
+   read(2)     11 bytes in process_read_output
+
+   That is, read(2) returns more bytes than have ever been written
+   successfully.  The 1033 bytes read are the 1022 bytes written
+   successfully after processing (for example with CRs added if the
+   terminal is set up that way which it is here).  The same bytes will
+   be seen again in a later read(2), without the CRs.  */
+
+#define BROKEN_PTY_READ_AFTER_EAGAIN 1
+
+/* Tell that garbage collector that setjmp is known to save all
+   registers relevant for conservative garbage collection in the
+   jmp_buf.  */
+
+#define GC_SETJMP_WORKS 1
+
+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
+   stack.  */
+
+#define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
+
+/* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
+   buffer text.  This overrides REL_ALLOC.  */
+
+#define USE_MMAP_FOR_BUFFERS	1
+
+/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
+   of sigblock says it is obsolete.  */
+
+#define POSIX_SIGNALS		1
diff --git a/editors/emacs/patches/patch-ai b/editors/emacs/patches/patch-ai
deleted file mode 100644
index a526db236ca..00000000000
--- a/editors/emacs/patches/patch-ai
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2005/12/29 13:56:51 joerg Exp $
-
---- src/s/dragonfly.h.orig	2005-12-29 13:13:02.000000000 +0000
-+++ src/s/dragonfly.h
-@@ -0,0 +1,126 @@
-+/* System description header for FreeBSD systems.
-+   This file describes the parameters that system description files
-+   should define or not.
-+   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+   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 2, 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.  */
-+
-+/* Get most of the stuff from bsd4.3 */
-+#include "bsd4-3.h"
-+
-+/* For mem-limits.h. */
-+#define BSD4_2
-+
-+/* These aren't needed, since we have getloadavg.  */
-+#undef KERNEL_FILE
-+#undef LDAV_SYMBOL
-+
-+#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
-+
-+#define LIBS_DEBUG
-+#define LIBS_SYSTEM -lutil
-+#define SYSV_SYSTEM_DIR
-+
-+/* freebsd has POSIX-style pgrp behavior. */
-+#undef BSD_PGRPS
-+#define GETPGRP_NO_ARG
-+
-+#define LD_SWITCH_SYSTEM_1
-+#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 -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#define HAVE_WAIT_HEADER
-+#define HAVE_GETLOADAVG 1
-+#define HAVE_TERMIOS
-+#define NO_TERMIO
-+#define DECLARE_GETPWUID_WITH_UID_T
-+
-+/* freebsd uses OXTABS instead of the expected TAB3. */
-+#define TABDLY OXTABS
-+#define TAB3 OXTABS
-+
-+/* this silences a few compilation warnings */
-+#undef BSD_SYSTEM
-+#define BSD_SYSTEM 199506
-+
-+/* Needed to avoid hanging when child process writes an error message
-+   and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
-+#define vfork fork
-+
-+/* Don't close pty in process.c to make it as controlling terminal.
-+   It is already a controlling terminal of subprocess, because we did
-+   ioctl TIOCSCTTY.  */
-+#define DONT_REOPEN_PTY
-+
-+/* CLASH_DETECTION is defined in bsd4-3.h.
-+   In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links
-+   remaining in /tmp or other directories with +t bit.
-+   To avoid this problem, you could #undef it to use no file lock. */
-+/* #undef CLASH_DETECTION */
-+
-+/* If the system's imake configuration file defines `NeedWidePrototypes'
-+   as `NO', we must define NARROWPROTO manually.  Such a define is
-+   generated in the Makefile generated by `xmkmf'.  If we don't 
-+   define NARROWPROTO, we will see the wrong function prototypes
-+   for X functions taking float or double parameters.  */
-+
-+#define NARROWPROTO 1
-+
-+#define C_SWITCH_SYSTEM
-+#define LD_SWITCH_SYSTEM
-+
-+/* Circumvent a bug in FreeBSD.  In the following sequence of
-+   writes/reads on a PTY, read(2) returns bogus data:
-+
-+   write(2)  1022 bytes
-+   write(2)   954 bytes, get EAGAIN
-+   read(2)   1024 bytes in process_read_output
-+   read(2)     11 bytes in process_read_output
-+
-+   That is, read(2) returns more bytes than have ever been written
-+   successfully.  The 1033 bytes read are the 1022 bytes written
-+   successfully after processing (for example with CRs added if the
-+   terminal is set up that way which it is here).  The same bytes will
-+   be seen again in a later read(2), without the CRs.  */
-+
-+#define BROKEN_PTY_READ_AFTER_EAGAIN 1
-+
-+/* Tell that garbage collector that setjmp is known to save all
-+   registers relevant for conservative garbage collection in the
-+   jmp_buf.  */
-+
-+#define GC_SETJMP_WORKS 1
-+
-+/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-+   stack.  */
-+
-+#define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
-+
-+/* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
-+   buffer text.  This overrides REL_ALLOC.  */
-+
-+#define USE_MMAP_FOR_BUFFERS	1
-+
-+/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
-+   of sigblock says it is obsolete.  */
-+
-+#define POSIX_SIGNALS		1