Attachment 180460 Details for Bug 217516 – jove.diff

[patch] jove.diff

jove.diff (text/plain), 3.05 KB, created by Tobias Kortkamp on 2017-03-03 10:56:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-03-03 10:56:21 UTC

Size: 3.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 435307)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	jove
> PORTVERSION=	4.16
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	editors
> MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
> 		LOCAL/simon
>@@ -15,4 +15,8 @@
> MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>+post-patch:
>+# Fix collisions with getline(3)
>+	@${REINPLACE_CMD} 's|getline|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
>+
> .include <bsd.port.mk>
>Index: files/patch-io.c
>===================================================================
>--- files/patch-io.c	(revision 435307)
>+++ files/patch-io.c	(working copy)
>@@ -17,15 +17,3 @@
>  #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
>Index: files/patch-io.h
>===================================================================
>--- files/patch-io.h	(revision 435307)
>+++ files/patch-io.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- io.h.orig	1996-03-07 17:34:42 UTC
>-+++ io.h
>-@@ -37,7 +37,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)),
>
>Property changes on: files/patch-io.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-recover.c
>===================================================================
>--- files/patch-recover.c	(revision 435307)
>+++ files/patch-recover.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- 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);
>
>Property changes on: files/patch-recover.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217516: 180459 | 180460