Mon Aug 1 15:21:16 2011 UTC ()
Avoid gcc-inline vs C99-inline difference by using static inline.


(joerg)
diff -r1.5 -r1.6 pkgsrc/archivers/bunzip/distinfo
diff -r1.3 -r1.4 pkgsrc/archivers/bunzip/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/archivers/bunzip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/bunzip/distinfo 2007/08/01 20:48:14 1.5
+++ pkgsrc/archivers/bunzip/distinfo 2011/08/01 15:21:16 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2007/08/01 20:48:14 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2011/08/01 15:21:16 joerg Exp $
2 2
3SHA1 (bunzip021.c.gz) = 0b12f8327807721d29e4bde44557b536ae9ecfc5 3SHA1 (bunzip021.c.gz) = 0b12f8327807721d29e4bde44557b536ae9ecfc5
4RMD160 (bunzip021.c.gz) = 32580bfeefc17094a4e8dc2532bdd7efcbd80063 4RMD160 (bunzip021.c.gz) = 32580bfeefc17094a4e8dc2532bdd7efcbd80063
5Size (bunzip021.c.gz) = 20317 bytes 5Size (bunzip021.c.gz) = 20317 bytes
6SHA1 (patch-aa) = daa22405412573b67d31f8416c677f8bcdf77f41 6SHA1 (patch-aa) = 9f131e7ae37a5ae061bdcb958ef6cf0c8ed14f75
cvs diff -r1.3 -r1.4 pkgsrc/archivers/bunzip/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/bunzip/patches/patch-aa 2007/08/01 20:48:15 1.3
+++ pkgsrc/archivers/bunzip/patches/patch-aa 2011/08/01 15:21:16 1.4
@@ -1,28 +1,37 @@ @@ -1,28 +1,37 @@
1$NetBSD: patch-aa,v 1.3 2007/08/01 20:48:15 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2011/08/01 15:21:16 joerg Exp $
2 2
3--- bunzip021.c.orig 2007-08-01 20:31:16.000000000 +0000 3--- bunzip021.c.orig 1999-05-22 21:00:00.000000000 +0000
4+++ bunzip021.c 4+++ bunzip021.c
5@@ -114,9 +114,9 @@ 5@@ -114,9 +114,9 @@
6 --*/ 6 --*/
7  7
8 #if BZ_UNIX_32 8 #if BZ_UNIX_32
9+ #include <stdlib.h> 9+ #include <stdlib.h>
10 #include <utime.h> 10 #include <utime.h>
11 #include <unistd.h> 11 #include <unistd.h>
12- #include <malloc.h> 12- #include <malloc.h>
13 #include <sys/stat.h> 13 #include <sys/stat.h>
14 #include <sys/times.h> 14 #include <sys/times.h>
15  15
 16@@ -141,7 +141,7 @@
 17 run rather slowly. gcc version 2.x is recommended.
 18 --*/
 19 #ifdef __GNUC__
 20- #define INLINE inline
 21+ #define INLINE static inline
 22 #define NORETURN __attribute__ ((noreturn))
 23 #else
 24 #define INLINE /**/
16@@ -400,7 +400,8 @@ 25@@ -400,7 +400,8 @@
17  26
18 Int32 bytesIn, bytesOut; 27 Int32 bytesIn, bytesOut;
19 Bool verbose, veryVerbose; 28 Bool verbose, veryVerbose;
20-Bool compressing, keepInputFiles; 29-Bool compressing, keepInputFiles;
21+#define compressing False 30+#define compressing False
22+Bool keepInputFiles; 31+Bool keepInputFiles;
23 UInt32 globalCrc; 32 UInt32 globalCrc;
24  33
25 #define OM_FILES_TO_FILES 1 34 #define OM_FILES_TO_FILES 1
26@@ -2376,17 +2377,13 @@ void usage ( Char *fullProgName ) 35@@ -2376,17 +2377,13 @@ void usage ( Char *fullProgName )
27 "\nusage: %s [flags and input files in any order]\n" 36 "\nusage: %s [flags and input files in any order]\n"
28 "\n" 37 "\n"