From a87d2df940ab13e988302d7137c4e338439a9b9b Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 18 Mar 2012 17:02:00 +0000
Subject: [PATCH] getline -> get_line

---
 editors/jove/Makefile                |  3 ++-
 editors/jove/patches/patch-insert_c  | 12 ++++++++++++
 editors/jove/patches/patch-io_c      | 15 +++++++++++++++
 editors/jove/patches/patch-io_h      | 12 ++++++++++++
 editors/jove/patches/patch-recover_c | 21 +++++++++++++++++++++
 editors/jove/patches/patch-util_c    | 12 ++++++++++++
 editors/jove/patches/patch-util_h    | 12 ++++++++++++
 7 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 editors/jove/patches/patch-insert_c
 create mode 100644 editors/jove/patches/patch-io_c
 create mode 100644 editors/jove/patches/patch-io_h
 create mode 100644 editors/jove/patches/patch-recover_c
 create mode 100644 editors/jove/patches/patch-util_c
 create mode 100644 editors/jove/patches/patch-util_h

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 57879f04b89..0b959a74044 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2011/11/13 09:22:31 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2012/03/18 17:02:00 naddy Exp $
 
 COMMENT=	Jonathan's Own Version of Emacs
 
 V=		4.16.0.73
 DISTNAME=	jove${V}
 PKGNAME=	jove-${V}
+REVISION=	0
 CATEGORIES=	editors
 
 # BSD
diff --git a/editors/jove/patches/patch-insert_c b/editors/jove/patches/patch-insert_c
new file mode 100644
index 00000000000..56ddbd43b90
--- /dev/null
+++ b/editors/jove/patches/patch-insert_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-insert_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
+--- insert.c.orig	Sun Mar 18 10:53:30 2012
++++ insert.c	Sun Mar 18 10:53:39 2012
+@@ -504,7 +504,7 @@ Buffer	*whatbuf;
+ 		atchar = 0;
+ 	}
+ 
+-	getline(atline->l_dline, genbuf);
++	get_line(atline->l_dline, genbuf);
+ 	atchar += tchar;
+ 	linecopy(genbuf, atchar, save);
+ 	atline->l_dline = putline(genbuf);
diff --git a/editors/jove/patches/patch-io_c b/editors/jove/patches/patch-io_c
new file mode 100644
index 00000000000..721d4f70769
--- /dev/null
+++ b/editors/jove/patches/patch-io_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-io_c,v 1.3 2012/03/18 17:02:00 naddy Exp $
+--- io.c.orig	Sun Mar 18 10:52:54 2012
++++ io.c	Sun Mar 18 10:53:09 2012
+@@ -1356,9 +1356,9 @@ int	Jr_Len;		/* length of Just Read Line */
+ 
+ void
+ #ifdef USE_PROTOTYPES
+-getline proto((daddr addr, register char *buf))
++get_line proto((daddr addr, register char *buf))
+ #else
+-getline(addr, buf)
++get_line(addr, buf)
+ daddr	addr;
+ register char	*buf;
+ #endif
diff --git a/editors/jove/patches/patch-io_h b/editors/jove/patches/patch-io_h
new file mode 100644
index 00000000000..d727ef408c1
--- /dev/null
+++ b/editors/jove/patches/patch-io_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-io_h,v 1.1 2012/03/18 17:02:00 naddy Exp $
+--- io.h.orig	Sun Mar 18 10:52:30 2012
++++ io.h	Sun Mar 18 10:52:42 2012
+@@ -40,7 +40,7 @@ extern void
+ 	close_file proto((File *fp)),
+ 	d_cache_init proto((void)),
+ 	file_write proto((char *fname, bool app)),
+-	getline proto((daddr addr, char *buf)),
++	get_line proto((daddr addr, char *buf)),
+ 	lsave proto((void)),
+ 	putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
+ 	read_file proto((char *file, bool is_insert)),
diff --git a/editors/jove/patches/patch-recover_c b/editors/jove/patches/patch-recover_c
new file mode 100644
index 00000000000..90abf8760c5
--- /dev/null
+++ b/editors/jove/patches/patch-recover_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-recover_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
+--- recover.c.orig	Sun Mar 18 10:53:47 2012
++++ recover.c	Sun Mar 18 10:54:19 2012
+@@ -166,7 +166,7 @@ size_t	n;
+ private char	*getblock proto((daddr atl));
+ 
+ void
+-getline(tl, buf)
++get_line(tl, buf)
+ daddr	tl;
+ char	*buf;
+ {
+@@ -597,7 +597,7 @@ FILE	*out;
+ 	Nchars = Nlines = 0L;
+ 	while (--nlines >= 0) {
+ 		addr = getaddr(ptrs_fp);
+-		getline(addr, buf);
++		get_line(addr, buf);
+ 		Nlines += 1;
+ 		Nchars += 1 + strlen(buf);
+ 		fputs(buf, out);
diff --git a/editors/jove/patches/patch-util_c b/editors/jove/patches/patch-util_c
new file mode 100644
index 00000000000..58a233089c3
--- /dev/null
+++ b/editors/jove/patches/patch-util_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-util_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
+--- util.c.orig	Sun Mar 18 10:54:56 2012
++++ util.c	Sun Mar 18 10:55:05 2012
+@@ -280,7 +280,7 @@ char	*buf;
+ 			strcpy(buf, linebuf);
+ 		Jr_Len = strlen(linebuf);
+ 	} else
+-		getline(line->l_dline, buf);
++		get_line(line->l_dline, buf);
+ 	return buf;
+ }
+ 
diff --git a/editors/jove/patches/patch-util_h b/editors/jove/patches/patch-util_h
new file mode 100644
index 00000000000..44cc9e4abc5
--- /dev/null
+++ b/editors/jove/patches/patch-util_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-util_h,v 1.1 2012/03/18 17:02:00 naddy Exp $
+--- util.h.orig	Sun Mar 18 10:54:54 2012
++++ util.h	Sun Mar 18 10:55:11 2012
+@@ -18,7 +18,7 @@ extern int
+ #define eobp()		(lastp(curline) && eolp())
+ #define eolp()		(linebuf[curchar] == '\0')
+ #define firstp(line)	((line) == curbuf->b_first)
+-#define getDOT()	getline(curline->l_dline, linebuf)
++#define getDOT()	get_line(curline->l_dline, linebuf)
+ #define lastp(line)	((line) == curbuf->b_last)
+ 
+ extern UnivPtr