Fix format string, some missing prototypes and the check for signal

handler type.

7 files changed, 69 insertions, 3 deletions

diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index a9f926ffb8a..574a2033d08 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/04/08 11:17:16 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/18 12:05:09 joerg Exp $
 
 DISTNAME=	ucblogo-5.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/pub/ucblogo/
 # Not at GNU mirrors yet
diff --git a/lang/ucblogo/distinfo b/lang/ucblogo/distinfo
index f50c739ce15..edca5ad3bc6 100644
--- a/lang/ucblogo/distinfo
+++ b/lang/ucblogo/distinfo
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.7 2012/11/01 19:55:37 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/07/18 12:05:09 joerg Exp $
 
 SHA1 (ucblogo-5.3.tar.gz) = abe27b2a36cc5d8dc4208fba04569e82cc163719
 RMD160 (ucblogo-5.3.tar.gz) = 9dfaf9886335ff7624e72cd23d0fd28a80e679c3
 Size (ucblogo-5.3.tar.gz) = 1180188 bytes
 SHA1 (patch-aa) = 7e3ab4e800f726dea6e6a46eb22ee6b7b8b03509
+SHA1 (patch-configure) = 329c31aed56a37b53383a3e7421fd9f429468f6c
 SHA1 (patch-graphics.c) = 5ebe5e76e07d5692105ca9f37c665924486f180a
+SHA1 (patch-makehelp.c) = e236bbf271337d6f45474c071f2ea26f14b09744
+SHA1 (patch-print.c) = 48f6e453e260770a2a03b421c5a99dae35d7d41f
+SHA1 (patch-term.c) = 621b4a5a02e0e6c150d8655957f945a81177cb08
+SHA1 (patch-wrksp.c) = a0c52544a4a54289c08e3300474655915a4b9e5d
 SHA1 (patch-xgraphics.c) = d1f58d85260d650a37f0b3bf12097656f352078c
 SHA1 (patch-xgraphics.h) = 3b4c6a74cd328241dd2ea8c601879bd24911570d
diff --git a/lang/ucblogo/patches/patch-configure b/lang/ucblogo/patches/patch-configure
new file mode 100644
index 00000000000..7a047889500
--- /dev/null
+++ b/lang/ucblogo/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2013/07/18 12:05:09 joerg Exp $
+
+--- configure.orig	2013-07-17 14:28:44.000000000 +0000
++++ configure
+@@ -1753,7 +1753,7 @@ int main() { return 0; }
+ RETSIGTYPE t(int foo) {
+ int i;
+ signal(SIGINT,t);
+-return 0; }
++}
+ EOF
+ if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
diff --git a/lang/ucblogo/patches/patch-makehelp.c b/lang/ucblogo/patches/patch-makehelp.c
new file mode 100644
index 00000000000..4811b3383be
--- /dev/null
+++ b/lang/ucblogo/patches/patch-makehelp.c
@@ -0,0 +1,9 @@
+$NetBSD: patch-makehelp.c,v 1.1 2013/07/18 12:05:09 joerg Exp $
+
+--- makehelp.c.orig	2013-07-17 14:25:25.000000000 +0000
++++ makehelp.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ 
diff --git a/lang/ucblogo/patches/patch-print.c b/lang/ucblogo/patches/patch-print.c
new file mode 100644
index 00000000000..4d3cf4ff865
--- /dev/null
+++ b/lang/ucblogo/patches/patch-print.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-print.c,v 1.1 2013/07/18 12:05:09 joerg Exp $
+
+--- print.c.orig	2013-07-17 14:26:15.000000000 +0000
++++ print.c
+@@ -229,7 +229,7 @@ void real_print_node(FILE *strm, NODE *n
+ 	if (print_backslashes && (getarrorg(nd) != 1)) {
+ 	    char org[] = "@	";
+ 
+-	    sprintf(&org[1],"%d",getarrorg(nd));
++	    sprintf(&org[1],"%ld",getarrorg(nd));
+ 	    ndprintf(strm,org);
+ 	}
+     } else if (ndty == QUOTE) {
diff --git a/lang/ucblogo/patches/patch-term.c b/lang/ucblogo/patches/patch-term.c
new file mode 100644
index 00000000000..a9511929a2a
--- /dev/null
+++ b/lang/ucblogo/patches/patch-term.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-term.c,v 1.1 2013/07/18 12:05:09 joerg Exp $
+
+--- term.c.orig	2002-10-03 16:54:33.000000000 +0000
++++ term.c
+@@ -53,6 +53,9 @@
+ #endif
+ #endif
+ 
++#include <term.h>
++#include <termios.h>
++
+ #undef TRUE
+ #undef FALSE
+ 
diff --git a/lang/ucblogo/patches/patch-wrksp.c b/lang/ucblogo/patches/patch-wrksp.c
new file mode 100644
index 00000000000..fe412128826
--- /dev/null
+++ b/lang/ucblogo/patches/patch-wrksp.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-wrksp.c,v 1.1 2013/07/18 12:05:09 joerg Exp $
+
+--- wrksp.c.orig	2013-07-17 14:30:28.000000000 +0000
++++ wrksp.c
+@@ -30,6 +30,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <sys/wait.h>
+ 
+ #ifdef ibm
+ #include "process.h"