Wed Jul 9 18:30:49 2014 UTC ()
Pullup ticket #4443 - requested by dholland
converters/ack: build fix

Revisions pulled up:
- converters/ack/distinfo                                       1.4
- converters/ack/patches/patch-fileio.c                         1.2

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Jul  6 18:50:20 UTC 2014

   Modified Files:
   	pkgsrc/converters/ack: distinfo
   	pkgsrc/converters/ack/patches: patch-fileio.c

   Log Message:
   Include sys/time.h for utimes(). From PR 48965 by SUNAGAWA Keiki.
   Also include sys/types.h first as a general precaution, and don't
   use <utime.h> any more.


(tron)
diff -r1.3 -r1.3.14.1 pkgsrc/converters/ack/distinfo
diff -r1.1 -r1.1.14.1 pkgsrc/converters/ack/patches/patch-fileio.c
cvs diff -r1.3 -r1.3.14.1 pkgsrc/converters/ack/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/ack/distinfo 2012/12/26 21:21:38 1.3
+++ pkgsrc/converters/ack/distinfo 2014/07/09 18:30:49 1.3.14.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.3 2012/12/26 21:21:38 dholland Exp $ 1$NetBSD: distinfo,v 1.3.14.1 2014/07/09 18:30:49 tron Exp $
2 2
3SHA1 (ack139.tar.gz) = d9ae53238176d46c303a48e736c5bafa9743250c 3SHA1 (ack139.tar.gz) = d9ae53238176d46c303a48e736c5bafa9743250c
4RMD160 (ack139.tar.gz) = 859af65bb4e4d3e1bc42840b23d571510f095d18 4RMD160 (ack139.tar.gz) = 859af65bb4e4d3e1bc42840b23d571510f095d18
5Size (ack139.tar.gz) = 16292 bytes 5Size (ack139.tar.gz) = 16292 bytes
6SHA1 (patch-aa) = 4840bef577a42cd4cd1a387f7261f42f9887055f 6SHA1 (patch-aa) = 4840bef577a42cd4cd1a387f7261f42f9887055f
7SHA1 (patch-ackstring.h) = 6af0febe5c1b8c36240b68ec3eb5993403c73137 7SHA1 (patch-ackstring.h) = 6af0febe5c1b8c36240b68ec3eb5993403c73137
8SHA1 (patch-codetoeuc.c) = ba4da165520b60bd7a88758227fe7760faa72fcd 8SHA1 (patch-codetoeuc.c) = ba4da165520b60bd7a88758227fe7760faa72fcd
9SHA1 (patch-codetojis.c) = 2c9959113c77bc98340c3ad7596bc7d85bfe66b5 9SHA1 (patch-codetojis.c) = 2c9959113c77bc98340c3ad7596bc7d85bfe66b5
10SHA1 (patch-codetosjis.c) = 1cf4a11d584a1a4412002d112cd743500275bf99 10SHA1 (patch-codetosjis.c) = 1cf4a11d584a1a4412002d112cd743500275bf99
11SHA1 (patch-codetozen.c) = 9612cf1811489bc251140d611000af551f88ee1a 11SHA1 (patch-codetozen.c) = 9612cf1811489bc251140d611000af551f88ee1a
12SHA1 (patch-euctocode.c) = 75486f92a700fa684602d933dcd337f19ab28763 12SHA1 (patch-euctocode.c) = 75486f92a700fa684602d933dcd337f19ab28763
13SHA1 (patch-fileio.c) = 29485831fff5686bb30c9dc62eefed42727999f3 13SHA1 (patch-fileio.c) = d0b097ccf936c1a44a9ec9cc43a51d6dc9997cc9
14SHA1 (patch-kanjicheck.c) = c37f252c11df5960f9018d21eda9d12bc272c8ef 14SHA1 (patch-kanjicheck.c) = c37f252c11df5960f9018d21eda9d12bc272c8ef
15SHA1 (patch-kanjicode.h) = f44671c45d2ed7f0a173db84e6c1f10ad1c13f82 15SHA1 (patch-kanjicode.h) = f44671c45d2ed7f0a173db84e6c1f10ad1c13f82
16SHA1 (patch-kmain.c) = d0e0d31598febf75c633cf29989279e1aa492de8 16SHA1 (patch-kmain.c) = d0e0d31598febf75c633cf29989279e1aa492de8
17SHA1 (patch-lcode.c) = e044192fa29ca44168fa853f51987c5cef090ddf 17SHA1 (patch-lcode.c) = e044192fa29ca44168fa853f51987c5cef090ddf
18SHA1 (patch-misc.h) = 775c9910792a1cda98d8fe6fe327191369e2efa7 18SHA1 (patch-misc.h) = 775c9910792a1cda98d8fe6fe327191369e2efa7
19SHA1 (patch-sjistocode.c) = 4a0b6103acc30455201b0c478dbbcb7bee76ad46 19SHA1 (patch-sjistocode.c) = 4a0b6103acc30455201b0c478dbbcb7bee76ad46
20SHA1 (patch-string.c) = 3075438f91c30b9c42260eb1870f4b491a55bad8 20SHA1 (patch-string.c) = 3075438f91c30b9c42260eb1870f4b491a55bad8
cvs diff -r1.1 -r1.1.14.1 pkgsrc/converters/ack/patches/patch-fileio.c (expand / switch to unified diff)

--- pkgsrc/converters/ack/patches/patch-fileio.c 2012/12/26 21:21:38 1.1
+++ pkgsrc/converters/ack/patches/patch-fileio.c 2014/07/09 18:30:49 1.1.14.1
@@ -1,66 +1,68 @@ @@ -1,66 +1,68 @@
1$NetBSD: patch-fileio.c,v 1.1 2012/12/26 21:21:38 dholland Exp $ 1$NetBSD: patch-fileio.c,v 1.1.14.1 2014/07/09 18:30:49 tron Exp $
2 2
3- use standard headers 3- use standard headers
4- declare own functions 4- declare own functions
5- avoid implicit int 5- avoid implicit int
6- declare void functions void 6- declare void functions void
7- don't truncate time_t 7- don't truncate time_t
8- use size_t for sizes where easy and appropriate 8- use size_t for sizes where easy and appropriate
9- use a bit of const 9- use a bit of const
10- remove wrong usage of utime(3) and use utimes(3) 10- remove wrong usage of utime(3) and use utimes(3)
11 11
12--- fileio.c.orig 1994-06-12 05:31:00.000000000 +0000 12--- fileio.c.orig 1994-06-12 05:31:00.000000000 +0000
13+++ fileio.c 13+++ fileio.c
14@@ -5,14 +5,18 @@ 14@@ -4,15 +4,20 @@
 15 /* oga@dgw.yz.yamagata-u.ac.jp */
15 /* v1.10 1994 03/19 Ogasawara Hiroyuki */ 16 /* v1.10 1994 03/19 Ogasawara Hiroyuki */
16  17
 18+#include <sys/types.h>
 19+#include <sys/time.h>
17 #include <stdio.h> 20 #include <stdio.h>
18+#include <utime.h> 21
19+ 
20+#include "kanjicode.h" 22+#include "kanjicode.h"
21+#include "misc.h" 23+#include "misc.h"
22  24+
23 #define EMPTY 0 25 #define EMPTY 0
24 #define STACKSIZE 256 26 #define STACKSIZE 256
25 #define PRESIZE (1024*16) 27 #define PRESIZE (1024*16)
26  28
27 static int cstack[STACKSIZE], 29 static int cstack[STACKSIZE],
28- *cstackptr= cstack, 30- *cstackptr= cstack,
29- presize= 0; 31- presize= 0;
30+ *cstackptr= cstack; 32+ *cstackptr= cstack;
31+static size_t presize= 0; 33+static size_t presize= 0;
32 unsigned char prebuf[PRESIZE], 34 unsigned char prebuf[PRESIZE],
33 *preptr= prebuf; 35 *preptr= prebuf;
34  36
35@@ -36,7 +40,7 @@ unsigned int code; 37@@ -36,7 +41,7 @@ unsigned int code;
36 } 38 }
37  39
38 int 40 int
39-getcode() 41-getcode()
40+getcode(void) 42+getcode(void)
41 { 43 {
42 if( cstackptr > cstack ) 44 if( cstackptr > cstack )
43 return *--cstackptr; 45 return *--cstackptr;
44@@ -48,7 +52,7 @@ getcode() 46@@ -48,7 +53,7 @@ getcode()
45 } 47 }
46  48
47 void 49 void
48-ungetcode( code ) 50-ungetcode( code )
49+ungetcode( int code ) 51+ungetcode( int code )
50 { 52 {
51 *cstackptr++= code; 53 *cstackptr++= code;
52 } 54 }
53@@ -62,31 +66,33 @@ void *cp; 55@@ -62,31 +67,33 @@ void *cp;
54 } 56 }
55  57
56 #if HUMAN 58 #if HUMAN
57-isdir( name ) 59-isdir( name )
58-char *name; 60-char *name;
59+int 61+int
60+isdir( const char *name ) 62+isdir( const char *name )
61 { 63 {
62 return CHMOD( name, -1 ) & 0x10; 64 return CHMOD( name, -1 ) & 0x10;
63 } 65 }
64 #else 66 #else
65 #include <sys/types.h> 67 #include <sys/types.h>
66 #include <sys/stat.h> 68 #include <sys/stat.h>