Mon Jul 30 04:08:53 2012 UTC ()
Add patch comments. Regen patch-ac as it wasn't diff -u format. Improve
portability of patch-aa.


(dholland)
diff -r1.6 -r1.7 pkgsrc/x11/xscribble/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/xscribble/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/x11/xscribble/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/x11/xscribble/patches/patch-ae
cvs diff -r1.6 -r1.7 pkgsrc/x11/xscribble/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xscribble/distinfo 2006/07/29 04:39:31 1.6
+++ pkgsrc/x11/xscribble/distinfo 2012/07/30 04:08:53 1.7
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.6 2006/07/29 04:39:31 minskim Exp $ 1$NetBSD: distinfo,v 1.7 2012/07/30 04:08:53 dholland Exp $
2 2
3SHA1 (xscribble.tgz) = 9983577533c6b6f482e2bfe863f54604337562c7 3SHA1 (xscribble.tgz) = 9983577533c6b6f482e2bfe863f54604337562c7
4RMD160 (xscribble.tgz) = 49f5a5339819a76e303a135d54fb8ffd4f88febb 4RMD160 (xscribble.tgz) = 49f5a5339819a76e303a135d54fb8ffd4f88febb
5Size (xscribble.tgz) = 164379 bytes 5Size (xscribble.tgz) = 164379 bytes
6SHA1 (patch-aa) = eaab5d05c9ced68dda8848df5360afc990e58b6d 6SHA1 (patch-aa) = 3655a05ea99e25a9f126d1b33c562c5387db82b7
7SHA1 (patch-ab) = 6da2e1ba900c05d428de74b44e369c0e0c242190 7SHA1 (patch-ab) = 6da2e1ba900c05d428de74b44e369c0e0c242190
8SHA1 (patch-ac) = 0a6352bf35e79db51b25e195a5bed88661672987 8SHA1 (patch-ac) = 61557798a2ea575862e9c0a14761465491ec6ac5
9SHA1 (patch-ad) = 9fe0ce4f137975cd380280e13ccfa1543016b5b7 9SHA1 (patch-ad) = 9fe0ce4f137975cd380280e13ccfa1543016b5b7
10SHA1 (patch-ae) = 383631838e7467196ed5fa579084d4637cf82d7b 10SHA1 (patch-ae) = 794a20d07760403be3fd90fef5de604732834771
cvs diff -r1.3 -r1.4 pkgsrc/x11/xscribble/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xscribble/patches/patch-aa 2004/05/23 18:31:27 1.3
+++ pkgsrc/x11/xscribble/patches/patch-aa 2012/07/30 04:08:53 1.4
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2004/05/23 18:31:27 danw Exp $ 1$NetBSD: patch-aa,v 1.4 2012/07/30 04:08:53 dholland Exp $
 2
 3- use standard headers
 4- don't need to provide bcopy or strdup
2 5
3--- lirec/li_recognizer.c.orig Mon Jun 12 18:20:13 2000 6--- lirec/li_recognizer.c.orig Mon Jun 12 18:20:13 2000
4+++ lirec/li_recognizer.c 7+++ lirec/li_recognizer.c
5@@ -21,7 +21,7 @@ 8@@ -21,7 +21,7 @@
6 #include <stdio.h> 9 #include <stdio.h>
7 #include <string.h> 10 #include <string.h>
8 #ifndef ELX 11 #ifndef ELX
9-#include <malloc.h> 12-#include <malloc.h>
10+#include <stdlib.h> 13+#include <stdlib.h>
11 #endif 14 #endif
12 #include <math.h> 15 #include <math.h>
13 #include <locale.h> 16 #include <locale.h>
14@@ -53,9 +53,9 @@ static char *lialg_recognize_stroke(rCla 17@@ -53,9 +53,9 @@ static char *lialg_recognize_stroke(rCla
@@ -18,18 +21,18 @@ $NetBSD: patch-aa,v 1.3 2004/05/23 18:31 @@ -18,18 +21,18 @@ $NetBSD: patch-aa,v 1.3 2004/05/23 18:31
18-#define bcopy(s1,s2,n) memcpy(s2,s1,n) 21-#define bcopy(s1,s2,n) memcpy(s2,s1,n)
19+/*#define bcopy(s1,s2,n) memcpy(s2,s1,n)*/ 22+/*#define bcopy(s1,s2,n) memcpy(s2,s1,n)*/
20  23
21-#ifdef mips 24-#ifdef mips
22+#if 0 25+#if 0
23 char *strdup(char* from) { 26 char *strdup(char* from) {
24 char* to; 27 char* to;
25 int len = strlen(from) + 1; 28 int len = strlen(from) + 1;
26@@ -923,7 +923,8 @@ RECOGNIZER_FINALIZE(r) 29@@ -923,7 +923,8 @@ RECOGNIZER_FINALIZE(r)
27 ************************************************** */ 30 ************************************************** */
28  31
29 /*#include <assert.h>*/ 32 /*#include <assert.h>*/
30-#include <values.h> 33-#include <values.h>
31+#include <sys/param.h> 34+#include <limits.h>
32+#define MAXINT INT_MAX 35+#define MAXINT INT_MAX
33 #include <sys/time.h> 36 #include <sys/time.h>
34  37
35 #ifdef __ultrix 38 #ifdef __ultrix
cvs diff -r1.1 -r1.2 pkgsrc/x11/xscribble/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xscribble/patches/patch-ac 2001/01/01 14:30:25 1.1
+++ pkgsrc/x11/xscribble/patches/patch-ac 2012/07/30 04:08:53 1.2
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-ac,v 1.1 2001/01/01 14:30:25 itojun Exp $ 1$NetBSD: patch-ac,v 1.2 2012/07/30 04:08:53 dholland Exp $
2 2
3*** lirec/util.h- Mon Jan 1 22:47:35 2001 3Everything pkgsrc builds on counts as "unix", but doesn't necessarily
4--- lirec/util.h Mon Jan 1 22:48:37 2001 4pollute the namespace with that by default.
5*************** 5
6*** 55,57 **** 6--- lirec/util.h.orig 2000-06-12 22:20:14.000000000 +0000
7  7+++ lirec/util.h
8! #ifndef unix 8@@ -53,7 +53,7 @@ char *tempstring(); /* returns a pointer
9  9 # define GRAPHICS /* only GDEV on unix machines */
10--- 55,57 ---- 10 #endif
11  11
12! #if 0 12-#ifndef unix
13  13+#if 0
 14
 15 /* various BSD to lattice C name changes */
 16
cvs diff -r1.1 -r1.2 pkgsrc/x11/xscribble/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/xscribble/patches/patch-ae 2006/07/29 04:39:31 1.1
+++ pkgsrc/x11/xscribble/patches/patch-ae 2012/07/30 04:08:53 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-ae,v 1.1 2006/07/29 04:39:31 minskim Exp $ 1$NetBSD: patch-ae,v 1.2 2012/07/30 04:08:53 dholland Exp $
 2
 3- Use standard headers.
 4- Don't declare own malloc.
2 5
3--- lirec/util.c.orig 2000-06-12 22:20:14.000000000 +0000 6--- lirec/util.c.orig 2000-06-12 22:20:14.000000000 +0000
4+++ lirec/util.c 7+++ lirec/util.c
5@@ -22,6 +22,7 @@ the full agreement. 8@@ -22,6 +22,7 @@ the full agreement.
6 #include <setjmp.h> 9 #include <setjmp.h>
7 /* ari -- for strlen */ 10 /* ari -- for strlen */
8 #include <string.h> 11 #include <string.h>
9+#include <stdlib.h> 12+#include <stdlib.h>
10  13
11 extern char* li_err_msg; 14 extern char* li_err_msg;
12 static char err_msg[BUFSIZ]; 15 static char err_msg[BUFSIZ];
13@@ -34,7 +35,6 @@ char * 16@@ -34,7 +35,6 @@ char *
14 myalloc(nitems, itemsize, typename) 17 myalloc(nitems, itemsize, typename)