From a64dc7f70b9843a5de914327d149d4248b02c3b8 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 31 Jul 2007 10:12:00 +0000 Subject: Don't use malloc.h. --- games/xbreaky/distinfo | 4 ++-- games/xbreaky/patches/patch-ac | 17 +++++++++++++---- games/xdoom/distinfo | 7 ++++--- games/xdoom/patches/patch-au | 18 +++++++++--------- games/xdoom/patches/patch-az | 24 ++++++++++++++++-------- games/xdoom/patches/patch-be | 12 ++++++++++++ 6 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 games/xdoom/patches/patch-be (limited to 'games') diff --git a/games/xbreaky/distinfo b/games/xbreaky/distinfo index e762c227103..58bdc309284 100644 --- a/games/xbreaky/distinfo +++ b/games/xbreaky/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 23:12:04 agc Exp $ +$NetBSD: distinfo,v 1.6 2007/07/31 10:17:38 joerg Exp $ SHA1 (xbreaky-0.0.5.tar.gz) = 3601bf1fb6fe2a3c04d3aed749f1f9e15500e11c RMD160 (xbreaky-0.0.5.tar.gz) = 4e4f8c5a819111ef0c4103dc1ff99dcc2a4c7853 Size (xbreaky-0.0.5.tar.gz) = 31136 bytes SHA1 (patch-aa) = 0cefbc96bf9a015d8573c0e78972421da05efd4a SHA1 (patch-ab) = 0ea22ce8cad38cecd615a0f8fe11de948426601c -SHA1 (patch-ac) = 11a19443637b09a00ea02496a698c880aba9c9d0 +SHA1 (patch-ac) = aa31bf411d4e729ceb370aa32f3d422e263af432 diff --git a/games/xbreaky/patches/patch-ac b/games/xbreaky/patches/patch-ac index 10942e60ea5..799411c0659 100644 --- a/games/xbreaky/patches/patch-ac +++ b/games/xbreaky/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/10/15 18:04:20 rh Exp $ +$NetBSD: patch-ac,v 1.2 2007/07/31 10:17:38 joerg Exp $ ---- xbreaky.snd.c.orig Thu May 11 10:13:45 2000 +--- xbreaky.snd.c.orig 2000-05-11 08:13:45.000000000 +0000 +++ xbreaky.snd.c +@@ -20,7 +20,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include @@ -28,11 +28,19 @@ #include #include @@ -22,7 +31,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/10/15 18:04:20 rh Exp $ #define RAWFILESDIR PREFIX"/share/games/xbreaky" int timelimit = 0, dsp_speed = DEFAULT_DSP_SPEED, dsp_stereo = 0; -@@ -53,7 +61,6 @@ +@@ -53,7 +61,6 @@ int main (int argc, char *argv[]) char k; signal(SIGTERM, quit); @@ -30,7 +39,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/10/15 18:04:20 rh Exp $ audio = open (AUDIO, O_WRONLY, 0); if (audio == -1) { -@@ -101,7 +108,7 @@ +@@ -101,7 +108,7 @@ int main (int argc, char *argv[]) } if(i!=-1) { diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo index a6606d00dee..6e5ec27fa8f 100644 --- a/games/xdoom/distinfo +++ b/games/xdoom/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2006/09/24 13:50:08 joerg Exp $ +$NetBSD: distinfo,v 1.16 2007/07/31 10:12:00 joerg Exp $ SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99 RMD160 (doomsrc.zip) = c88e57b3cc72ca8bbfacbe138f8a3c69a13bf2e1 @@ -26,13 +26,14 @@ SHA1 (patch-aq) = 83b21a11e8007ea04fbedf10330887469b48dbab SHA1 (patch-ar) = 9f7285b05baf484f6546cc6678088e02cd0ff7ea SHA1 (patch-as) = 8d56b0a78a6cedb3b1ad63d9418081fb0277cf3d SHA1 (patch-at) = 96e5a88b7f250c35b148353d77eb6e598e35c661 -SHA1 (patch-au) = ce66a255347aa3ec6ec0c7826e352e5b53a0e69d +SHA1 (patch-au) = 7782fcbd0bd44f8739c5dbd2a0c3a1c1d3eac9db SHA1 (patch-av) = 494568bf3298195523c689125ad664d59d16e901 SHA1 (patch-aw) = 431b990ad5bcf32fc5152c4b4331ce2bc85aba8b SHA1 (patch-ax) = 8aab1f5d3e6f0fc08bd673d37fb19c600aa0f60b SHA1 (patch-ay) = 525fe394abcb0833c7595d3bc0559afcc7319f3b -SHA1 (patch-az) = 48690eebd65de95b7ce4fd73390b46ffd6a58085 +SHA1 (patch-az) = f9494960fcb2b5c9b42274db4c603205f0556624 SHA1 (patch-ba) = d8e41ed9d277145cd776ca5dc18e1c82cbefc8b7 SHA1 (patch-bb) = 28dbedb6209466f5b9ad226e2a5583c3881acae1 SHA1 (patch-bc) = e55e08d525469b44f96fbd45aeed0bedee0a9d8c SHA1 (patch-bd) = 35f01a7d790bb8683a6a4b72581dbe10307c57ed +SHA1 (patch-be) = 8a6a822136899e09fd3a8dff80d5618d60dd7a3c diff --git a/games/xdoom/patches/patch-au b/games/xdoom/patches/patch-au index c0fdc62b8a2..b7fbb034ba6 100644 --- a/games/xdoom/patches/patch-au +++ b/games/xdoom/patches/patch-au @@ -1,16 +1,16 @@ -$NetBSD: patch-au,v 1.1 2000/02/03 16:01:15 abs Exp $ +$NetBSD: patch-au,v 1.2 2007/07/31 10:12:00 joerg Exp $ ---- linuxdoom-1.10/w_wad.c.orig Mon Dec 22 21:05:36 1997 -+++ linuxdoom-1.10/w_wad.c Thu Feb 3 01:34:02 2000 -@@ -34,7 +34,11 @@ - #include +--- linuxdoom-1.10/w_wad.c.orig 1997-12-22 21:05:36.000000000 +0000 ++++ linuxdoom-1.10/w_wad.c +@@ -31,10 +31,9 @@ rcsid[] = "$Id: w_wad.c,v 1.5 1997/02/03 + #include + #include + #include +-#include #include #include -+#if 0 - #include -+#else +-#include +#include -+#endif #define O_BINARY 0 #endif diff --git a/games/xdoom/patches/patch-az b/games/xdoom/patches/patch-az index 9df4adcfe54..21bc5279843 100644 --- a/games/xdoom/patches/patch-az +++ b/games/xdoom/patches/patch-az @@ -1,8 +1,16 @@ -$NetBSD: patch-az,v 1.1 2000/02/03 16:01:16 abs Exp $ +$NetBSD: patch-az,v 1.2 2007/07/31 10:12:00 joerg Exp $ ---- sndserv/wadread.c.orig Thu Jan 30 19:54:23 1997 -+++ sndserv/wadread.c Thu Feb 3 01:34:06 2000 -@@ -94,12 +94,7 @@ +--- sndserv/wadread.c.orig 1997-01-30 19:54:23.000000000 +0000 ++++ sndserv/wadread.c +@@ -39,7 +39,6 @@ static const char rcsid[] = "$Id: wadrea + + + +-#include + #include + #include + #include +@@ -94,12 +93,7 @@ void** lumpcache; // Something new. // This version of w_wad.c does handle endianess. // @@ -16,15 +24,15 @@ $NetBSD: patch-az,v 1.1 2000/02/03 16:01:16 abs Exp $ #define LONG(x) ((long)SwapLONG((unsigned long) (x))) #define SHORT(x) ((short)SwapSHORT((unsigned short) (x))) -@@ -118,6 +113,11 @@ - return +@@ -119,6 +113,11 @@ unsigned short SwapSHORT(unsigned short (x>>8) | (x<<8); } -+ + +#else + +#define LONG(x) (x) +#define SHORT(x) (x) - ++ #endif + diff --git a/games/xdoom/patches/patch-be b/games/xdoom/patches/patch-be new file mode 100644 index 00000000000..45f75e0b6fa --- /dev/null +++ b/games/xdoom/patches/patch-be @@ -0,0 +1,12 @@ +$NetBSD: patch-be,v 1.1 2007/07/31 10:12:00 joerg Exp $ + +--- sndserv/soundsrv.c.orig 2007-07-31 09:57:06.000000000 +0000 ++++ sndserv/soundsrv.c +@@ -47,7 +47,6 @@ static const char rcsid[] = "$Id: sounds + #include + #include + #include +-#include + #include + #include + -- cgit v1.2.3