diff options
| author | yyamano <yyamano@pkgsrc.org> | 2002-03-11 14:21:24 +0000 |
|---|---|---|
| committer | yyamano <yyamano@pkgsrc.org> | 2002-03-11 14:21:24 +0000 |
| commit | d0e6c0b7f45b9bd8de7d0ded79d0625d6c106012 (patch) | |
| tree | c068f60f110a030948444940ddf1430ead775f45 /archivers | |
| parent | c3cc8ff6d3c74c08a7d7d91753d06889029eef06 (diff) | |
| download | pkgsrc-d0e6c0b7f45b9bd8de7d0ded79d0625d6c106012.tar.gz | |
Don't include malloc.h on Darwin to make it build.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/bunzip/distinfo | 4 | ||||
| -rw-r--r-- | archivers/bunzip/patches/patch-aa | 28 |
2 files changed, 21 insertions, 11 deletions
diff --git a/archivers/bunzip/distinfo b/archivers/bunzip/distinfo index bfd50c28241..cf43e2989c0 100644 --- a/archivers/bunzip/distinfo +++ b/archivers/bunzip/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 11:21:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/03/11 14:21:24 yyamano Exp $ SHA1 (bunzip021.c.gz) = 0b12f8327807721d29e4bde44557b536ae9ecfc5 Size (bunzip021.c.gz) = 20317 bytes -SHA1 (patch-aa) = 720b94ce1de0d00139eec7e2d257a2c551a948dc +SHA1 (patch-aa) = b4d4fc765c2b2b93e4aa855f65692302e16dc7ff diff --git a/archivers/bunzip/patches/patch-aa b/archivers/bunzip/patches/patch-aa index a99797d6e6c..ef331a27f86 100644 --- a/archivers/bunzip/patches/patch-aa +++ b/archivers/bunzip/patches/patch-aa @@ -1,8 +1,18 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ +$NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ ---- bunzip021.c.orig Sun May 23 16:48:42 1999 -+++ bunzip021.c Sun May 23 16:52:27 1999 -@@ -400,7 +400,8 @@ +--- bunzip021.c.orig Thu Feb 28 06:11:49 2002 ++++ bunzip021.c +@@ -116,7 +116,9 @@ + #if BZ_UNIX_32 + #include <utime.h> + #include <unistd.h> ++#ifndef __APPLE__ + #include <malloc.h> ++#endif + #include <sys/stat.h> + #include <sys/times.h> + +@@ -400,7 +402,8 @@ Int32 bytesIn, bytesOut; Bool verbose, veryVerbose; @@ -12,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ UInt32 globalCrc; #define OM_FILES_TO_FILES 1 -@@ -2376,17 +2377,13 @@ +@@ -2376,17 +2379,13 @@ "\nusage: %s [flags and input files in any order]\n" "\n" " Flags: -d force decompression\n" @@ -31,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ " from standard input to standard output. You can combine\n" " flags, so `-v -e -4' means the same as -ve4 or -4ev, &c.\n" "\n" -@@ -2542,7 +2539,6 @@ +@@ -2542,7 +2541,6 @@ } keepInputFiles = False; @@ -39,7 +49,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ verbose = False; veryVerbose = False; -@@ -2550,12 +2546,6 @@ +@@ -2550,12 +2548,6 @@ opMode = OM_STDIN_TO_STDOUT; else opMode = OM_FILES_TO_FILES; @@ -52,7 +62,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ if (compressing) blockSize100k = 9; for (aa = argList; aa != NULL; aa = aa->link) -@@ -2564,8 +2554,7 @@ +@@ -2564,8 +2556,7 @@ switch (aa->name[j]) { case 'Q': break; case 'c': opMode = OM_FILE_TO_STDOUT; break; @@ -62,7 +72,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/23 20:55:29 tv Exp $ case 'v': verbose = True; break; case 'k': keepInputFiles = True; break; case '1': blockSize100k = 1; break; -@@ -2593,7 +2582,6 @@ +@@ -2593,7 +2584,6 @@ exit ( 1 ); } |