Make patch-ao a normal file and fix the build on DragonFly 1.8+

4 files changed, 119 insertions, 110 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 98cc0d0743b..4aa415fb370 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/20 19:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/06/30 01:01:12 joerg Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	8
@@ -50,6 +50,10 @@ CHECK_WRKREF_SKIP+=	bin/emacs-20.7
 LDFLAGS+=	-Wl,-z,nocombreloc
 .endif
 
+.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
+CPPFLAGS+=	-DDFLY_PRE_17_CRT
+.endif
+
 EMACS_USE_POP?=	yes
 .if (defined(EMACS_USE_POP) && \
     (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
@@ -90,6 +94,7 @@ INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
 post-extract:
 	${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
+	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig*" -print | ${XARGS} ${RM} -f
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index a668e2698c8..0899bd12d90 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/01/04 17:00:32 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/06/30 01:01:13 joerg Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
@@ -25,7 +25,6 @@ SHA1 (patch-ak) = 604f80fbf7d24ec7b732c7ac3cc99a07fb4a2eb6
 SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
 SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
 SHA1 (patch-an) = 59cffa7847fe84bc29a44d3b0e4c2eb09719126f
-SHA1 (patch-ao) = 628564fd9ffb47c9f12f53da6c3dea7129502b65
 SHA1 (patch-ap) = f0453313569cd000af36230bc193ab777db80974
 SHA1 (patch-aq) = 17897dc84bc40f6e5229b6c833f87066d9e065ed
 SHA1 (patch-ar) = 0c04e0dd0e0e91099404ba47a01c1a556884773a
diff --git a/editors/emacs20/files/dragonfly.h b/editors/emacs20/files/dragonfly.h
new file mode 100644
index 00000000000..8399c7d14c5
--- /dev/null
+++ b/editors/emacs20/files/dragonfly.h
@@ -0,0 +1,112 @@
+/* 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
+
+#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 NO_MATHERR
+#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
+
+#define WAITTYPE int
+/* get this since it won't be included if WAITTYPE is defined */
+#ifdef emacs
+#include <sys/wait.h>
+#endif
+#define WRETCODE(w) (_W_INT(w) >> 8)
+
+/* 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 */
+
+/* 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
diff --git a/editors/emacs20/patches/patch-ao b/editors/emacs20/patches/patch-ao
deleted file mode 100644
index a7577552c6c..00000000000
--- a/editors/emacs20/patches/patch-ao
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- /dev/null	2006-01-04 16:01:24.000000000 +0000
-+++ src/s/dragonfly.h
-@@ -0,0 +1,102 @@
-+/* 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 NO_MATHERR
-+#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
-+
-+#define WAITTYPE int
-+/* get this since it won't be included if WAITTYPE is defined */
-+#ifdef emacs
-+#include <sys/wait.h>
-+#endif
-+#define WRETCODE(w) (_W_INT(w) >> 8)
-+
-+/* 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 */
-+
-+/* 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