diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-01 20:45:59 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-01 20:45:59 +0000 |
| commit | 8ef6ed5828b6b44a1788175cb0fafaf95a68bbc8 (patch) | |
| tree | 70387ce10ffa63aa601f82c71313e4e08e423c0d /archivers/bunzip | |
| parent | c5cd514663dc913dffbb4a428ad97a6bfd87f9b5 (diff) | |
| download | pkgsrc-8ef6ed5828b6b44a1788175cb0fafaf95a68bbc8.tar.gz | |
Don't use malloc.h.
Diffstat (limited to 'archivers/bunzip')
| -rw-r--r-- | archivers/bunzip/distinfo | 4 | ||||
| -rw-r--r-- | archivers/bunzip/patches/patch-aa | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/archivers/bunzip/distinfo b/archivers/bunzip/distinfo index df637a059c8..8c2d9f7c96e 100644 --- a/archivers/bunzip/distinfo +++ b/archivers/bunzip/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 14:45:22 agc Exp $ +$NetBSD: distinfo,v 1.5 2007/08/01 20:48:14 joerg Exp $ SHA1 (bunzip021.c.gz) = 0b12f8327807721d29e4bde44557b536ae9ecfc5 RMD160 (bunzip021.c.gz) = 32580bfeefc17094a4e8dc2532bdd7efcbd80063 Size (bunzip021.c.gz) = 20317 bytes -SHA1 (patch-aa) = b4d4fc765c2b2b93e4aa855f65692302e16dc7ff +SHA1 (patch-aa) = daa22405412573b67d31f8416c677f8bcdf77f41 diff --git a/archivers/bunzip/patches/patch-aa b/archivers/bunzip/patches/patch-aa index ef331a27f86..8518192754a 100644 --- a/archivers/bunzip/patches/patch-aa +++ b/archivers/bunzip/patches/patch-aa @@ -1,18 +1,19 @@ -$NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ +$NetBSD: patch-aa,v 1.3 2007/08/01 20:48:15 joerg Exp $ ---- bunzip021.c.orig Thu Feb 28 06:11:49 2002 +--- bunzip021.c.orig 2007-08-01 20:31:16.000000000 +0000 +++ bunzip021.c -@@ -116,7 +116,9 @@ +@@ -114,9 +114,9 @@ + --*/ + #if BZ_UNIX_32 ++ #include <stdlib.h> #include <utime.h> #include <unistd.h> -+#ifndef __APPLE__ - #include <malloc.h> -+#endif +- #include <malloc.h> #include <sys/stat.h> #include <sys/times.h> -@@ -400,7 +402,8 @@ +@@ -400,7 +400,8 @@ Int32 bytesIn, bytesOut; Bool verbose, veryVerbose; @@ -22,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ UInt32 globalCrc; #define OM_FILES_TO_FILES 1 -@@ -2376,17 +2379,13 @@ +@@ -2376,17 +2377,13 @@ void usage ( Char *fullProgName ) "\nusage: %s [flags and input files in any order]\n" "\n" " Flags: -d force decompression\n" @@ -41,7 +42,7 @@ $NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano 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 +2541,6 @@ +@@ -2542,7 +2539,6 @@ IntNative main ( IntNative argc, Char *a } keepInputFiles = False; @@ -49,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ verbose = False; veryVerbose = False; -@@ -2550,12 +2548,6 @@ +@@ -2550,12 +2546,6 @@ IntNative main ( IntNative argc, Char *a opMode = OM_STDIN_TO_STDOUT; else opMode = OM_FILES_TO_FILES; @@ -62,7 +63,7 @@ $NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ if (compressing) blockSize100k = 9; for (aa = argList; aa != NULL; aa = aa->link) -@@ -2564,8 +2556,7 @@ +@@ -2564,8 +2554,7 @@ IntNative main ( IntNative argc, Char *a switch (aa->name[j]) { case 'Q': break; case 'c': opMode = OM_FILE_TO_STDOUT; break; @@ -72,7 +73,7 @@ $NetBSD: patch-aa,v 1.2 2002/03/11 14:21:25 yyamano Exp $ case 'v': verbose = True; break; case 'k': keepInputFiles = True; break; case '1': blockSize100k = 1; break; -@@ -2593,7 +2584,6 @@ +@@ -2593,7 +2582,6 @@ IntNative main ( IntNative argc, Char *a exit ( 1 ); } |