Make this compile on Darwin: rename lround() to xlround() to avoid

a conflict with a declration in a system header file.

4 files changed, 43 insertions, 1 deletions

diff --git a/lang/ucblogo/distinfo b/lang/ucblogo/distinfo
index 413210d1631..1910f79c607 100644
--- a/lang/ucblogo/distinfo
+++ b/lang/ucblogo/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:01:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/07/13 02:16:43 thorpej Exp $
 
 SHA1 (ucblogo-4.6.tar.gz) = b702456377d683f194e58f8c3b1463baa79fe6cf
 Size (ucblogo-4.6.tar.gz) = 254646 bytes
 SHA1 (patch-aa) = 35e2c76c398cb7e6d4e9d86c100f1e44284510dd
+SHA1 (patch-ab) = 4b80115de9d0a006076666e43afef7b8be59c222
+SHA1 (patch-ac) = 742896f8185a0570bf2df081e0e1ef0bee772253
+SHA1 (patch-ad) = 0eede51c7c5b420d3d3cfea750970df33d3e3dc3
diff --git a/lang/ucblogo/patches/patch-ab b/lang/ucblogo/patches/patch-ab
new file mode 100644
index 00000000000..610853c72f3
--- /dev/null
+++ b/lang/ucblogo/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/07/13 02:16:43 thorpej Exp $
+
+--- globals.h.orig	Mon Jul 12 19:08:40 2004
++++ globals.h	Mon Jul 12 19:08:57 2004
+@@ -138,7 +138,7 @@
+ extern NODE *lradatan(NODE *);
+ extern NODE *lsqrt(NODE *);
+ extern NODE *linteg(NODE *);
+-extern NODE *lround(NODE *);
++extern NODE *xlround(NODE *);
+ extern NODE *lexp(NODE *);
+ extern NODE *llog10(NODE *);
+ extern NODE *lln(NODE *);
diff --git a/lang/ucblogo/patches/patch-ac b/lang/ucblogo/patches/patch-ac
new file mode 100644
index 00000000000..93845a758b3
--- /dev/null
+++ b/lang/ucblogo/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/07/13 02:16:43 thorpej Exp $
+
+--- init.c.orig	Mon Jul 12 19:09:10 2004
++++ init.c	Mon Jul 12 19:09:02 2004
+@@ -261,7 +261,7 @@
+     {"rerandom", 0, 0, 1, PREFIX_PRIORITY, lrerandom},
+     {"right", 1, 1, 1, PREFIX_PRIORITY, lright},
+     {"rl", 0, 0, 0, PREFIX_PRIORITY, lreadlist},
+-    {"round", 1, 1, 1, PREFIX_PRIORITY, lround},
++    {"round", 1, 1, 1, PREFIX_PRIORITY, xlround},
+     {"rt", 1, 1, 1, PREFIX_PRIORITY, lright},
+     {"run", 1, 1, 1, MACRO_PRIORITY, lrun},
+     {"runparse", 1, 1, 1, PREFIX_PRIORITY, lrunparse},
diff --git a/lang/ucblogo/patches/patch-ad b/lang/ucblogo/patches/patch-ad
new file mode 100644
index 00000000000..0ce85d8bc10
--- /dev/null
+++ b/lang/ucblogo/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/07/13 02:16:43 thorpej Exp $
+
+--- math.c.orig	Mon Jul 12 19:09:10 2004
++++ math.c	Mon Jul 12 19:09:08 2004
+@@ -482,7 +482,7 @@
+     return(binary(args, 'i'));
+ }
+ 
+-NODE *lround(NODE *args) {
++NODE *xlround(NODE *args) {
+     return(binary(args, 'r'));
+ }
+