Don't use malloc.h.

4 files changed, 30 insertions, 15 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 );
     }
  
diff --git a/games/battalion/distinfo b/games/battalion/distinfo
index 9281a85b62f..2f15b089a62 100644
--- a/games/battalion/distinfo
+++ b/games/battalion/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/04/28 14:58:32 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/08/01 20:45:59 joerg Exp $
 
 SHA1 (battalionSource1.4.tar.Z) = 50891668a9b6745fcb4e070805c085487a5176d8
 RMD160 (battalionSource1.4.tar.Z) = 109e5e38239f2c1d05cd4ab9619634c2d44ce890
@@ -9,3 +9,4 @@ Size (battalionSUN4.tar.gz) = 1593265 bytes
 SHA1 (patch-aa) = 1f32510f308e8c081d9a23f7213c564035e0c823
 SHA1 (patch-ab) = a47c5be93d82555b4fed23f5d5e71169859ebb49
 SHA1 (patch-ac) = a2b15a1bbff53cd6804b063dc776c34fcf55ecba
+SHA1 (patch-ad) = 97b000c9173b2d40d26889ae1dda36167d57ae77
diff --git a/games/battalion/patches/patch-ad b/games/battalion/patches/patch-ad
new file mode 100644
index 00000000000..ae0022603d6
--- /dev/null
+++ b/games/battalion/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/08/01 20:46:01 joerg Exp $
+
+--- battalion.h.orig	2007-08-01 20:28:41.000000000 +0000
++++ battalion.h
+@@ -59,7 +59,7 @@
+ #endif
+ 
+ #ifndef MACVERSION
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <pwd.h>
+ #endif
+