Attachment #180460 for bug #217516

View | Details | Raw Unified | Return to bug 217516
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +5 lines)
3		3
4	PORTNAME= jove	4	PORTNAME= jove
5	PORTVERSION= 4.16	5	PORTVERSION= 4.16
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= editors	7	CATEGORIES= editors
8	MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \	8	MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
9	LOCAL/simon	9	LOCAL/simon
Lines 15-18 Link Here
15	MAKE_ARGS= LIBS="${LDFLAGS} -lncurses"	15	MAKE_ARGS= LIBS="${LDFLAGS} -lncurses"
16	WRKSRC= ${WRKDIR}/${PORTNAME}	16	WRKSRC= ${WRKDIR}/${PORTNAME}
17		17
		18	post-patch:
		19	# Fix collisions with getline(3)
		20	@${REINPLACE_CMD} 's\|getline\|get_line\|g' ${WRKSRC}/.c ${WRKSRC}/.h
		21
18	.include <bsd.port.mk>	22	.include <bsd.port.mk>




 #else /* MSFILESYSTEM */
 	tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
 #endif /* MSFILESYSTEM */
@@ -1240,9 +1246,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

Lines 1-11 Link Here

(-)files/patch-io.h (-11 lines)
1	--- io.h.orig 1996-03-07 17:34:42 UTC
2	+++ io.h
3	@@ -37,7 +37,7 @@ extern void
4	close_file proto((File *fp)),
5	d_cache_init proto((void)),
6	file_write proto((char *fname, bool app)),
7	- getline proto((daddr addr,char *buf)),
8	+ get_line proto((daddr addr,char *buf)),
9	lsave proto((void)),
10	putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
11	read_file proto((char *file, bool is_insert)),




--- recover.c.orig	1996-03-07 17:34:43 UTC
+++ recover.c
@@ -160,7 +160,7 @@ size_t	n;
 private char	*getblock proto((daddr atl));
 
 void
-getline(tl, buf)
+get_line(tl, buf)
 daddr	tl;
 char	*buf;
 {
@@ -561,7 +561,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);

Return to bug 217516

Lines 17-31 Link Here

(-)files/patch-io.c (-12 lines)
17	#else /* MSFILESYSTEM */	17	#else /* MSFILESYSTEM */
18	tmpfd = open(tfname, O_CREAT\|O_EXCL\|O_BINARY\|O_RDWR, S_IWRITE\|S_IREAD);	18	tmpfd = open(tfname, O_CREAT\|O_EXCL\|O_BINARY\|O_RDWR, S_IWRITE\|S_IREAD);
19	#endif /* MSFILESYSTEM */	19	#endif /* MSFILESYSTEM */
20	@@ -1240,9 +1246,9 @@ int Jr_Len; /* length of Just Read Line
21
22	void
23	#ifdef USE_PROTOTYPES
24	-getline proto((daddr addr, register char *buf))
25	+get_line proto((daddr addr, register char *buf))
26	#else
27	-getline(addr, buf)
28	+get_line(addr, buf)
29	daddr addr;
30	register char *buf;
31	#endif

Lines 1-20 Link Here

(-)files/patch-recover.c (-20 lines)
1	--- recover.c.orig 1996-03-07 17:34:43 UTC
2	+++ recover.c
3	@@ -160,7 +160,7 @@ size_t n;
4	private char *getblock proto((daddr atl));
5
6	void
7	-getline(tl, buf)
8	+get_line(tl, buf)
9	daddr tl;
10	char *buf;
11	{
12	@@ -561,7 +561,7 @@ FILE *out;
13	Nchars = Nlines = 0L;
14	while (--nlines >= 0) {
15	addr = getaddr(ptrs_fp);
16	- getline(addr, buf);
17	+ get_line(addr, buf);
18	Nlines += 1;
19	Nchars += 1 + strlen(buf);
20	fputs(buf, out);