summaryrefslogtreecommitdiff
path: root/sysutils/9base
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-08-04 11:37:58 +0000
committerjoerg <joerg@pkgsrc.org>2011-08-04 11:37:58 +0000
commit7947d57875f90f1ffc40cf6b1603b2876c779a6f (patch)
tree2330855edd5c7c32fc2469987815dca6dc2eaa96 /sysutils/9base
parentce33fc669b00d27614e0d3ab9a930d3a2ad35dd6 (diff)
downloadpkgsrc-7947d57875f90f1ffc40cf6b1603b2876c779a6f.tar.gz
Fix getline usage.
Diffstat (limited to 'sysutils/9base')
-rw-r--r--sysutils/9base/distinfo5
-rw-r--r--sysutils/9base/patches/patch-awk-proctab.c13
-rw-r--r--sysutils/9base/patches/patch-awk-proto.h13
-rw-r--r--sysutils/9base/patches/patch-awk-run.c13
4 files changed, 43 insertions, 1 deletions
diff --git a/sysutils/9base/distinfo b/sysutils/9base/distinfo
index 6ab4fb615a5..04fd71104c1 100644
--- a/sysutils/9base/distinfo
+++ b/sysutils/9base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/06/21 19:34:45 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/08/04 11:37:58 joerg Exp $
SHA1 (9base-20051114.tar.gz) = 27fb8879677dbb83a9f2f24a3be7cc96d97ea244
RMD160 (9base-20051114.tar.gz) = 59223d40e2c761ed80f3eb73afcc046b4d6e921b
@@ -25,6 +25,9 @@ SHA1 (patch-as) = 997dc92229699c0e3a51a753b0b2480d517c64ca
SHA1 (patch-at) = 32d0da68f18b56e8774f90e5f0090ef8c5aed84a
SHA1 (patch-au) = d412607f5d49b5e72e24de91da2dec63dd1f3437
SHA1 (patch-av) = 6553a9e7260d879a04ae1c0c873c2706130dba9e
+SHA1 (patch-awk-proctab.c) = e74887d26b32335af1b1d50a1f0e1493a58fbfd4
+SHA1 (patch-awk-proto.h) = 55991e304df7d891e0a4e811131437d02d585cad
+SHA1 (patch-awk-run.c) = 969be20828a9aca566c1f6b79e122f66dfb27572
SHA1 (patch-ba) = 97aff6df9b6971ee5ddfeb9a88fcaf383a9a9bbb
SHA1 (patch-bb) = a7b5b80ed7125f66d845c74d21d8de41b10d112a
SHA1 (patch-bc) = 46debf24eab8dcef0768aef88aee0029b2f316ec
diff --git a/sysutils/9base/patches/patch-awk-proctab.c b/sysutils/9base/patches/patch-awk-proctab.c
new file mode 100644
index 00000000000..894c1133426
--- /dev/null
+++ b/sysutils/9base/patches/patch-awk-proctab.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-awk-proctab.c,v 1.1 2011/08/04 11:37:59 joerg Exp $
+
+--- awk/proctab.c.orig 2011-08-03 11:53:00.000000000 +0000
++++ awk/proctab.c
+@@ -179,7 +179,7 @@ Cell *(*proctab[92])(Node **, int) = {
+ nullproc, /* NUMBER */
+ nullproc, /* STRING */
+ nullproc, /* REGEXPR */
+- getline, /* GETLINE */
++ my_getline, /* GETLINE */
+ jump, /* RETURN */
+ split, /* SPLIT */
+ substr, /* SUBSTR */
diff --git a/sysutils/9base/patches/patch-awk-proto.h b/sysutils/9base/patches/patch-awk-proto.h
new file mode 100644
index 00000000000..a572298c061
--- /dev/null
+++ b/sysutils/9base/patches/patch-awk-proto.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-awk-proto.h,v 1.1 2011/08/04 11:37:59 joerg Exp $
+
+--- awk/proto.h.orig 2011-08-03 11:53:03.000000000 +0000
++++ awk/proto.h
+@@ -131,7 +131,7 @@ extern Cell *call(Node **, int);
+ extern Cell *copycell(Cell *);
+ extern Cell *arg(Node **, int);
+ extern Cell *jump(Node **, int);
+-extern Cell *getline(Node **, int);
++extern Cell *my_getline(Node **, int);
+ extern Cell *getnf(Node **, int);
+ extern Cell *array(Node **, int);
+ extern Cell *awkdelete(Node **, int);
diff --git a/sysutils/9base/patches/patch-awk-run.c b/sysutils/9base/patches/patch-awk-run.c
new file mode 100644
index 00000000000..852b4a8cc6e
--- /dev/null
+++ b/sysutils/9base/patches/patch-awk-run.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-awk-run.c,v 1.1 2011/08/04 11:37:59 joerg Exp $
+
+--- awk/run.c.orig 2011-08-03 11:53:06.000000000 +0000
++++ awk/run.c
+@@ -377,7 +377,7 @@ Cell *jump(Node **a, int n) /* break, co
+ return 0; /* not reached */
+ }
+
+-Cell *getline(Node **a, int n) /* get next line from specific input */
++Cell *my_getline(Node **a, int n) /* get next line from specific input */
+ { /* a[0] is variable, a[1] is operator, a[2] is filename */
+ Cell *r, *x;
+ extern Cell **fldtab;