svn commit: r415135 - in head/editors/gate: . files
Baptiste Daroussin
bapt at FreeBSD.org
Fri May 13 19:01:29 UTC 2016
Author: bapt
Date: Fri May 13 19:01:27 2016
New Revision: 415135
URL: https://svnweb.freebsd.org/changeset/ports/415135
Log:
Prevent collision with getline(3)
Added:
head/editors/gate/files/patch-gate.h (contents, props changed)
head/editors/gate/files/patch-line.c (contents, props changed)
head/editors/gate/files/patch-main.c (contents, props changed)
Modified:
head/editors/gate/Makefile
head/editors/gate/files/patch-Makefile.in
head/editors/gate/files/patch-configure
head/editors/gate/files/patch-spel.c
head/editors/gate/files/patch-subs.c
Modified: head/editors/gate/Makefile
==============================================================================
--- head/editors/gate/Makefile Fri May 13 18:59:03 2016 (r415134)
+++ head/editors/gate/Makefile Fri May 13 19:01:27 2016 (r415135)
@@ -15,6 +15,7 @@ RUN_DEPENDS= aspell:textproc/aspell
USES= ncurses
GNU_CONFIGURE= yes
+USE_CSTD= gnu89
CONFIGURE_ARGS= --with-aspell=${LOCALBASE}/bin/aspell
ALL_TARGET= gate gate.1
Modified: head/editors/gate/files/patch-Makefile.in
==============================================================================
--- head/editors/gate/files/patch-Makefile.in Fri May 13 18:59:03 2016 (r415134)
+++ head/editors/gate/files/patch-Makefile.in Fri May 13 19:01:27 2016 (r415135)
@@ -1,6 +1,6 @@
--- Makefile.in.orig 2003-06-19 16:47:56 UTC
+++ Makefile.in
-@@ -25,7 +25,7 @@ DIST= README $(SRCS) gate.h config.h.in
+@@ -25,7 +25,7 @@ DIST= README $(SRCS) gate.h config.h.in
Makefile.in gate.1.C gate.help CHANGES
gate: $(OBJS)
Modified: head/editors/gate/files/patch-configure
==============================================================================
--- head/editors/gate/files/patch-configure Fri May 13 18:59:03 2016 (r415134)
+++ head/editors/gate/files/patch-configure Fri May 13 19:01:27 2016 (r415135)
@@ -9,3 +9,12 @@
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
#line 1773 "configure"
+@@ -2123,7 +2123,7 @@ res_datadir=`eval "echo $datadir"`
+ prefix=$gate_prefix
+
+ cat >> confdefs.h <<EOF
+-#define HELP_FILE "${res_datadir}/gate.help"
++#define HELP_FILE "/usr/local/share/gate/gate.help"
+ EOF
+
+
Added: head/editors/gate/files/patch-gate.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/gate/files/patch-gate.h Fri May 13 19:01:27 2016 (r415135)
@@ -0,0 +1,11 @@
+--- gate.h.orig 2005-01-24 06:24:26 UTC
++++ gate.h
+@@ -211,7 +211,7 @@ int mv_file(char *src, char *dst);
+
+ /* LINE.C */
+ int outcol(char *str,int n,int icol);
+-int getline(char *bf, char *wbf, int *wcol, char *prompt);
++int get_line(char *bf, char *wbf, int *wcol, char *prompt);
+ void back_to_col(int ncol);
+ void print_to_index(int newi);
+
Added: head/editors/gate/files/patch-line.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/gate/files/patch-line.c Fri May 13 19:01:27 2016 (r415135)
@@ -0,0 +1,11 @@
+--- line.c.orig 2003-06-19 15:06:54 UTC
++++ line.c
+@@ -82,7 +82,7 @@ void mcursor(int *col, int *lin, char ch
+ * If <wbuf> is NULL, then this does a more ordinary, wrapless read.
+ */
+
+-int getline(char *buf, char *wbuf, int *wcol, char *prompt)
++int get_line(char *buf, char *wbuf, int *wcol, char *prompt)
+ {
+ int linemode= (wbuf == NULL); /* reading single line, not file */
+ int wrapon= !linemode; /* is line wrap enabled? */
Added: head/editors/gate/files/patch-main.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/gate/files/patch-main.c Fri May 13 19:01:27 2016 (r415135)
@@ -0,0 +1,11 @@
+--- main.c.orig 2005-01-24 17:05:01 UTC
++++ main.c
+@@ -87,7 +87,7 @@ int main(int argc,char **argv)
+ wcol= 0;
+ for (;;)
+ {
+- if (getline(bf[sw], bf[!sw], &wcol, prompt))
++ if (get_line(bf[sw], bf[!sw], &wcol, prompt))
+ {
+ putchar('\n');
+ done(RET_ENTER);
Modified: head/editors/gate/files/patch-spel.c
==============================================================================
--- head/editors/gate/files/patch-spel.c Fri May 13 18:59:03 2016 (r415134)
+++ head/editors/gate/files/patch-spel.c Fri May 13 19:01:27 2016 (r415135)
@@ -1,13 +1,11 @@
-diff --git spel.c spel.c
-index 5c53256..1e9ad04 100644
---- spel.c
+--- spel.c.orig 2003-06-19 16:55:51 UTC
+++ spel.c
-@@ -151,7 +151,7 @@ empty_repl()
- /* ADD_REPL - Add the given replacement to the list of replacements.
- * "replace" may be NULL to indicate that the word is to be ignored.
- */
--
-+void
- add_repl(char *word, int word_len, char *replace)
- {
- struct repl *r;
+@@ -683,7 +683,7 @@ int fix_word(char *line, int offset, int
+ for(;;)
+ {
+ subtask= 1;
+- if (getline(bf,NULL,&wcol,st))
++ if (get_line(bf,NULL,&wcol,st))
+ {
+ printf("\nSpell Check Interupted.\n");
+ return 1;
Modified: head/editors/gate/files/patch-subs.c
==============================================================================
--- head/editors/gate/files/patch-subs.c Fri May 13 18:59:03 2016 (r415134)
+++ head/editors/gate/files/patch-subs.c Fri May 13 19:01:27 2016 (r415135)
@@ -1,7 +1,14 @@
-diff --git subs.c subs.c
-index 287d9d3..a6caea9 100644
---- subs.c
+--- subs.c.orig 2005-01-24 06:16:01 UTC
+++ subs.c
+@@ -74,7 +74,7 @@ int ask_spell_subs(char **replace, int *
+ subtask= 1;
+ sprintf(st,"Replacement for \"%.*s\" (? for help): ",
+ strlen(match+1)-1, match+1);
+- if (getline(*replace= bf,NULL,wcol,st))
++ if (get_line(*replace= bf,NULL,wcol,st))
+ {
+ printf("\nSpell Check Interupted.\n");
+ do_subs= 'q';
@@ -429,7 +429,7 @@ int cliplast(char *lastbuf, int bufsize)
#endif
More information about the svn-ports-head
mailing list