From 16dee66fa3ed97ce01acea17cbb6af512eedb33b Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 4 Aug 2010 17:17:57 +0000 Subject: [PATCH] fix i386; from stsp@, reported by deraadt@ --- editors/emacs21/Makefile | 4 ++-- editors/emacs21/patches/patch-lib-src_cvtmail_c | 10 +++++----- editors/emacs21/patches/patch-src_m_intel386_h | 11 +++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 editors/emacs21/patches/patch-src_m_intel386_h diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index e3b91b161fb..3c2a98573cc 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2010/07/26 18:08:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.50 2010/08/04 17:17:57 naddy Exp $ COMMENT-main= GNU editor: extensible, customizable, self documenting COMMENT-el= elisp sources for those who want to read/modify them @@ -11,7 +11,7 @@ FULLPKGNAME-el= emacs-el-${VERSION} FULLPKGPATH-el= editors/emacs21,-el FULLPKGNAME-leim= emacs-leim-${VERSION} FULLPKGPATH-leim= editors/emacs21,-leim -REVISION-main= 13 +REVISION-main= 14 REVISION-el= 3 REVISION-leim= 3 diff --git a/editors/emacs21/patches/patch-lib-src_cvtmail_c b/editors/emacs21/patches/patch-lib-src_cvtmail_c index 44418c8ea26..6d3e6738ad5 100644 --- a/editors/emacs21/patches/patch-lib-src_cvtmail_c +++ b/editors/emacs21/patches/patch-lib-src_cvtmail_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib-src_cvtmail_c,v 1.1 2005/12/10 11:57:40 aanriot Exp $ ---- lib-src/cvtmail.c.orig Mon Oct 10 21:40:20 2005 -+++ lib-src/cvtmail.c Mon Oct 10 21:40:30 2005 -@@ -60,7 +60,7 @@ main (int argc, char *argv[]) +$OpenBSD: patch-lib-src_cvtmail_c,v 1.2 2010/08/04 17:17:57 naddy Exp $ +--- lib-src/cvtmail.c.orig Fri Feb 15 13:06:48 2002 ++++ lib-src/cvtmail.c Wed Aug 4 19:06:56 2010 +@@ -60,7 +60,7 @@ main (argc, argv) FILE *mfilef; FILE *cff; char pre[10]; @@ -9,4 +9,4 @@ $OpenBSD: patch-lib-src_cvtmail_c,v 1.1 2005/12/10 11:57:40 aanriot Exp $ + char name[15]; int c; - hd = getenv ("HOME"); + hd = (char *) getenv ("HOME"); diff --git a/editors/emacs21/patches/patch-src_m_intel386_h b/editors/emacs21/patches/patch-src_m_intel386_h new file mode 100644 index 00000000000..51b2a61c150 --- /dev/null +++ b/editors/emacs21/patches/patch-src_m_intel386_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_m_intel386_h,v 1.1 2010/08/04 17:17:57 naddy Exp $ +--- src/m/intel386.h.orig Wed Aug 4 19:07:10 2010 ++++ src/m/intel386.h Wed Aug 4 19:08:28 2010 +@@ -58,6 +58,7 @@ NOTE-END */ + * group of arguments and treat it as an array of the arguments. */ + + /* #define NO_ARG_ARRAY */ ++#define NO_ARG_ARRAY /* ProPolice may copy arguments */ + + /* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */