svn commit: r419275 - head/editors/jove/files
Baptiste Daroussin
bapt at FreeBSD.org
Fri Jul 29 23:15:13 UTC 2016
Author: bapt
Date: Fri Jul 29 23:15:11 2016
New Revision: 419275
URL: https://svnweb.freebsd.org/changeset/ports/419275
Log:
Fix collision with getline(3)
Regen patches
Added:
head/editors/jove/files/patch-io.h (contents, props changed)
head/editors/jove/files/patch-recover.c (contents, props changed)
Modified:
head/editors/jove/files/patch-Makefile
head/editors/jove/files/patch-abbrev.c
head/editors/jove/files/patch-io.c
head/editors/jove/files/patch-mouse.c
head/editors/jove/files/patch-proc.c
head/editors/jove/files/patch-rec.c
head/editors/jove/files/patch-sysdep.h
Modified: head/editors/jove/files/patch-Makefile
==============================================================================
--- head/editors/jove/files/patch-Makefile Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-Makefile Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,5 +1,5 @@
---- Makefile.orig Tue Mar 19 13:44:33 1996
-+++ Makefile Wed Dec 20 05:39:12 2000
+--- Makefile.orig 1996-03-19 04:44:33 UTC
++++ Makefile
@@ -27,16 +27,16 @@
# LIBDIR and SHAREDIR. All others must already exist.
@@ -22,7 +22,7 @@
# The install commands of BSD and System V differ in unpleasant ways:
# -c: copy (BSD); -c dir: destination directory (SysV)
-@@ -50,12 +50,12 @@
+@@ -50,12 +50,12 @@ DFLTSHELL = /bin/csh
INSTALLFLAGS = # -g bin -o root
# to install executable files
@@ -39,7 +39,7 @@
# These should all just be right if the above ones are.
# You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
# compiler, adding -Xa -v will increase compiler checking.
# On DEC OSF/1, -std1 -O
@@ -48,7 +48,7 @@
# For making dependencies under BSD systems
DEPENDFLAG = -M
-@@ -163,13 +163,13 @@
+@@ -163,13 +163,13 @@ LDFLAGS =
#
# You can just say 'make SYSDEFS=-Dwhatever' on these systems.
@@ -64,7 +64,7 @@
# For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
# CC = /usr/bin/cc
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ NROFF = nroff
TROFF = troff -Tpost
TROFFPOST = | /usr/lib/lp/postscript/dpost - >troff.out.ps
Modified: head/editors/jove/files/patch-abbrev.c
==============================================================================
--- head/editors/jove/files/patch-abbrev.c Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-abbrev.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,6 +1,6 @@
---- abbrev.c.orig Fri Mar 8 02:34:41 1996
-+++ abbrev.c Wed Dec 20 05:19:33 2000
-@@ -274,7 +274,16 @@
+--- abbrev.c.orig 1996-03-07 17:34:41 UTC
++++ abbrev.c
+@@ -274,7 +274,16 @@ EditAbbrevs()
"jabbXXXXXX"
#endif
);
Modified: head/editors/jove/files/patch-io.c
==============================================================================
--- head/editors/jove/files/patch-io.c Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-io.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,6 +1,6 @@
---- io.c.orig Fri Mar 8 02:34:42 1996
-+++ io.c Wed Dec 20 05:19:17 2000
-@@ -1193,10 +1193,16 @@
+--- io.c.orig 1996-03-07 17:34:42 UTC
++++ io.c
+@@ -1193,10 +1193,16 @@ tmpinit()
#endif
);
tfname = copystr(buf);
@@ -17,3 +17,15 @@
#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
Added: head/editors/jove/files/patch-io.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/jove/files/patch-io.h Fri Jul 29 23:15:11 2016 (r419275)
@@ -0,0 +1,11 @@
+--- 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)),
Modified: head/editors/jove/files/patch-mouse.c
==============================================================================
--- head/editors/jove/files/patch-mouse.c Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-mouse.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,19 +1,11 @@
-*** mouse.c.org Thu Mar 7 12:34:43 1996
---- mouse.c Thu Jun 25 14:17:16 1998
-***************
-*** 266,272 ****
- /* Format of command to xterm to start or stop mouse hilite tracking:
- * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
- */
-! #define XTERMBUG
- #ifdef XTERMBUG
- static const char hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
- #else
---- 266,272 ----
- /* Format of command to xterm to start or stop mouse hilite tracking:
- * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
- */
-! /* #undef XTERMBUG */
- #ifdef XTERMBUG
- static const char hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
- #else
+--- mouse.c.orig 1996-03-07 17:34:43 UTC
++++ mouse.c
+@@ -266,7 +266,7 @@ int mproto;
+ /* Format of command to xterm to start or stop mouse hilite tracking:
+ * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
+ */
+-#define XTERMBUG
++/* #undef XTERMBUG */
+ #ifdef XTERMBUG
+ static const char hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
+ #else
Modified: head/editors/jove/files/patch-proc.c
==============================================================================
--- head/editors/jove/files/patch-proc.c Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-proc.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,6 +1,6 @@
---- proc.c.orig Sat Mar 9 06:46:40 1996
-+++ proc.c Wed Dec 20 05:20:13 2000
-@@ -827,8 +827,14 @@
+--- proc.c.orig 1996-03-08 21:46:40 UTC
++++ proc.c
+@@ -827,8 +827,14 @@ UnixToBuf(flags, bnm, InFName, cmd)
int ph;
swritef(pnbuf, sizeof(pnbuf), "%s/%s", TmpDir, "jpXXXXXX");
@@ -16,7 +16,7 @@
complain("cannot make pipe for filter: %s", strerror(errno));
close(1);
close(2);
-@@ -923,7 +929,18 @@
+@@ -923,7 +929,18 @@ bool wrap;
jmp_buf sav_jmp;
swritef(tnambuf, sizeof(tnambuf), "%s/%s", TmpDir, "jfXXXXXX");
Modified: head/editors/jove/files/patch-rec.c
==============================================================================
--- head/editors/jove/files/patch-rec.c Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-rec.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,6 +1,6 @@
---- rec.c.orig Fri Mar 8 02:34:43 1996
-+++ rec.c Wed Dec 20 05:19:50 2000
-@@ -55,8 +55,12 @@
+--- rec.c.orig 1996-03-07 17:34:43 UTC
++++ rec.c
+@@ -55,8 +55,12 @@ recinit()
#endif
);
recfname = copystr(buf);
Added: head/editors/jove/files/patch-recover.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/jove/files/patch-recover.c Fri Jul 29 23:15:11 2016 (r419275)
@@ -0,0 +1,20 @@
+--- 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);
Modified: head/editors/jove/files/patch-sysdep.h
==============================================================================
--- head/editors/jove/files/patch-sysdep.h Fri Jul 29 23:10:16 2016 (r419274)
+++ head/editors/jove/files/patch-sysdep.h Fri Jul 29 23:15:11 2016 (r419275)
@@ -1,5 +1,5 @@
---- sysdep.h.orig Mon Jul 20 16:39:19 1998
-+++ sysdep.h Mon Jul 20 16:40:08 1998
+--- sysdep.h.orig 1996-03-19 04:44:33 UTC
++++ sysdep.h
@@ -154,6 +154,7 @@
# define USE_FSYNC 1
# define USE_FSTAT 1
More information about the svn-ports-all
mailing list