summaryrefslogtreecommitdiff
path: root/comms/minicom
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2009-08-24 08:14:36 +0000
committerwiz <wiz@pkgsrc.org>2009-08-24 08:14:36 +0000
commitc021b3b3bdb54c83381b9f6cf499bdcd9451311a (patch)
treeb17d15ecec643a4c63c1be6ae7e80a550021cd19 /comms/minicom
parentbd665be3e56d0a3ad752f2a217f6237a8533da26 (diff)
downloadpkgsrc-c021b3b3bdb54c83381b9f6cf499bdcd9451311a.tar.gz
Fix build on systems with POSIX getline().
Diffstat (limited to 'comms/minicom')
-rw-r--r--comms/minicom/distinfo3
-rw-r--r--comms/minicom/patches/patch-aj112
2 files changed, 114 insertions, 1 deletions
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 97a1021cc60..e281632e520 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/06/19 21:46:40 jlam Exp $
+$NetBSD: distinfo,v 1.10 2009/08/24 08:14:36 wiz Exp $
SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70
RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222
SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd
SHA1 (patch-ah) = da65045ad1d02a7c005aba863a106472d05f5c1c
SHA1 (patch-ai) = 5a1ecdea3287dc4d0b1c71bb88656fb729522081
+SHA1 (patch-aj) = 56c537b245aa32f9b71c96d527bc83c88ec66005
diff --git a/comms/minicom/patches/patch-aj b/comms/minicom/patches/patch-aj
new file mode 100644
index 00000000000..f89816b8a0c
--- /dev/null
+++ b/comms/minicom/patches/patch-aj
@@ -0,0 +1,112 @@
+$NetBSD: patch-aj,v 1.1 2009/08/24 08:14:37 wiz Exp $
+
+--- src/minicom.c.orig 2003-05-16 20:33:19.000000000 +0000
++++ src/minicom.c
+@@ -153,7 +153,7 @@ int dummy;
+
+ #if _HISTORY
+ /* Get a line from either window or scroll back buffer. */
+-static ELM *getline(w, no)
++static ELM *get_line(w, no)
+ WIN *w;
+ int no;
+ {
+@@ -194,7 +194,7 @@ int r;
+
+ w->direct = 0;
+ for(f = 0; f < w->ys; f++)
+- wdrawelm(w, f, getline(w, y++));
++ wdrawelm(w, f, get_line(w, y++));
+ if (r) wredraw(w, 1);
+ w->direct = 1;
+ }
+@@ -222,7 +222,7 @@ int case_matters;
+ w->direct = 0;
+ for (f = 0; f < w->ys; f++)
+ {
+- tmp_e = getline(w, y++);
++ tmp_e = get_line(w, y++);
+
+ /* First we "accumulate" the line into a variable */
+ wdrawelm_var(w, tmp_e, tmp_line);
+@@ -321,7 +321,7 @@ int case_matters; /* guess... */
+ for (next_line = hit_line; next_line <= all_lines; next_line++)
+ {
+ /* we do 'something' here... :-) */
+- tmp_e = getline(w_hist, next_line);
++ tmp_e = get_line(w_hist, next_line);
+
+ /*
+ * First we "accumulate" the line into a variable.
+@@ -390,9 +390,9 @@ int start;
+ int end;
+ {
+ if (y+citey >= start && y+citey <= end)
+- wdrawelm_inverse(w, y, getline(w, y+citey));
++ wdrawelm_inverse(w, y, get_line(w, y+citey));
+ else
+- wdrawelm(w, y, getline(w, y+citey));
++ wdrawelm(w, y, get_line(w, y+citey));
+ }
+
+ static void drawcite_whole(w, y, start, end)
+@@ -416,7 +416,7 @@ int start,end;
+ for (y=start; y<=end; y++) {
+ vt_send('>');
+ vt_send(' ');
+- tmp_e = getline(w, y);
++ tmp_e = get_line(w, y);
+ wdrawelm_var(w, tmp_e, tmp_line);
+ tmp_line[w->xs]=0;
+ for (x=w->xs-1; x>=0; x--){
+@@ -599,7 +599,7 @@ static void scrollback()
+ inverse =
+ (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
+ } else {
+- tmp_e = getline(b_us, y);
++ tmp_e = get_line(b_us, y);
+ if (strlen(look_for) > 1)
+ {
+ /* quick scan for pattern match */
+@@ -618,8 +618,8 @@ static void scrollback()
+ inverse = 0;
+ }
+ #endif /*_SEARCH_HISTORY*/
+- if (inverse) wdrawelm_inverse(b_us, 0, getline(b_us, y));
+- else wdrawelm(b_us, 0, getline(b_us, y));
++ if (inverse) wdrawelm_inverse(b_us, 0, get_line(b_us, y));
++ else wdrawelm(b_us, 0, get_line(b_us, y));
+ if (citemode) wlocate(b_us, 0, cite_y);
+ wflush();
+ break;
+@@ -652,7 +652,7 @@ static void scrollback()
+ inverse =
+ (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
+ } else {
+- tmp_e = getline(b_us, y + b_us->ys - 1);
++ tmp_e = get_line(b_us, y + b_us->ys - 1);
+ if (strlen(look_for) > 1)
+ {
+ /* quick scan for pattern match */
+@@ -673,10 +673,10 @@ static void scrollback()
+ #endif /*_SEARCH_HISTORY*/
+ if (inverse)
+ wdrawelm_inverse(b_us, b_us->ys - 1,
+- getline(b_us, y + b_us->ys - 1));
++ get_line(b_us, y + b_us->ys - 1));
+ else
+ wdrawelm(b_us, b_us->ys - 1,
+- getline(b_us, y + b_us->ys - 1));
++ get_line(b_us, y + b_us->ys - 1));
+ if (citemode) wlocate(b_us, 0, cite_y);
+ wflush();
+ break;
+@@ -760,7 +760,7 @@ static void scrollback()
+ wlocate(b_st, 0, 0);
+ wprintf(b_st, hline);
+ wredraw(b_st, 1);
+- wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
++ wdrawelm_inverse(b_us, cite_y, get_line(b_us, cite_ystart));
+ wlocate(b_us, 0, cite_y);
+ break;
+ case K_ESC: