pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games Fix errno.
details: https://anonhg.NetBSD.org/pkgsrc/rev/2f90bb8a560d
branches: trunk
changeset: 506232:2f90bb8a560d
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Jan 12 23:59:02 2006 +0000
description:
Fix errno.
diffstat:
games/xdoom/distinfo | 8 ++++----
games/xdoom/patches/patch-ah | 30 +++++++++++++-----------------
games/xdoom/patches/patch-ai | 26 +++++++++++++++++---------
games/xdoom/patches/patch-ay | 19 +++++++++++++------
games/xfreecell/distinfo | 3 ++-
games/xfreecell/patches/patch-ae | 19 +++++++++++++++++++
6 files changed, 68 insertions(+), 37 deletions(-)
diffs (253 lines):
diff -r 59375d45b6cf -r 2f90bb8a560d games/xdoom/distinfo
--- a/games/xdoom/distinfo Thu Jan 12 23:54:09 2006 +0000
+++ b/games/xdoom/distinfo Thu Jan 12 23:59:02 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 23:07:34 minskim Exp $
+$NetBSD: distinfo,v 1.14 2006/01/13 00:04:16 joerg Exp $
SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99
RMD160 (doomsrc.zip) = c88e57b3cc72ca8bbfacbe138f8a3c69a13bf2e1
@@ -13,8 +13,8 @@
SHA1 (patch-ae) = 5bba08b0ae36e3a9b9b48b1dba9570035cf1a54d
SHA1 (patch-af) = 19367ee3112bfd0e5c054749347e642e6d0ff2ee
SHA1 (patch-ag) = accb03154ee6fcd8771b5cd782bb4f4fb0c96b1b
-SHA1 (patch-ah) = 8ce7eff703079ca435bcffd125483285d8bade5c
-SHA1 (patch-ai) = 9759962516af3bd15474c03350f115fda6d36468
+SHA1 (patch-ah) = d5ab2fd3f5593876d5c78e2a18ac909ec56ac8cf
+SHA1 (patch-ai) = 05d2abc579d970fec6c0776e953d6ad13946b9b6
SHA1 (patch-aj) = 23e3b35b8072752a9d3fcaa1913f390cf6bd5146
SHA1 (patch-ak) = 7ac753f505c5becc2ce26de209723fc464096cdc
SHA1 (patch-al) = a3c5b2ae0a820010339c06655f53778e5edfd498
@@ -30,7 +30,7 @@
SHA1 (patch-av) = 494568bf3298195523c689125ad664d59d16e901
SHA1 (patch-aw) = 431b990ad5bcf32fc5152c4b4331ce2bc85aba8b
SHA1 (patch-ax) = 8aab1f5d3e6f0fc08bd673d37fb19c600aa0f60b
-SHA1 (patch-ay) = 978e1aeef4239abd752e0ec4404a3819ee6339af
+SHA1 (patch-ay) = 525fe394abcb0833c7595d3bc0559afcc7319f3b
SHA1 (patch-az) = 48690eebd65de95b7ce4fd73390b46ffd6a58085
SHA1 (patch-ba) = d8e41ed9d277145cd776ca5dc18e1c82cbefc8b7
SHA1 (patch-bb) = 28dbedb6209466f5b9ad226e2a5583c3881acae1
diff -r 59375d45b6cf -r 2f90bb8a560d games/xdoom/patches/patch-ah
--- a/games/xdoom/patches/patch-ah Thu Jan 12 23:54:09 2006 +0000
+++ b/games/xdoom/patches/patch-ah Thu Jan 12 23:59:02 2006 +0000
@@ -1,10 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2000/02/03 16:01:15 abs Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/13 00:04:16 joerg Exp $
--- linuxdoom-1.10/i_sound.c.orig Mon Dec 22 19:57:15 1997
+++ linuxdoom-1.10/i_sound.c Thu Feb 3 02:56:08 2000
-@@ -41,8 +41,11 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
+@@ -26,2 +26,3 @@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/0
+
++#include <errno.h>
+ #include <stdio.h>
+@@ -43,4 +44,7 @@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/0
+#ifdef LINUX
// Linux voxware output.
@@ -12,11 +14,11 @@
+#endif
+
- // Timer stuff. Experimental.
- #include <time.h>
-@@ -482,8 +485,12 @@
- #ifdef SNDSERV
- if (sndserver)
+@@ -165,3 +169,2 @@ myioctl
+ int rc;
+- extern int errno;
+
+@@ -484,4 +487,8 @@ I_StartSound
{
- fprintf(sndserver, "p%2.2x%2.2x%2.2x%2.2x\n", id, pitch, vol, sep);
- fflush(sndserver);
@@ -27,11 +29,7 @@
+ sndserver = 0;
+ }
}
- // warning: control reaches end of non-void function.
- return id;
-@@ -745,13 +752,25 @@
- getenv("DOOMWADDIR"),
- sndserver_filename);
+@@ -747,6 +754,16 @@ I_InitSound()
else
- sprintf(buffer, "%s", sndserver_filename);
+#ifdef INSTALL_PREFIX
@@ -50,10 +48,8 @@
- if ( !access(buffer, X_OK) )
+ if (!access(buffer, X_OK) )
{
- strcat(buffer, " -quiet");
+@@ -754,2 +771,4 @@ I_InitSound()
sndserver = popen(buffer, "w");
+ /* Don't die with SIGPIPE if the sndserver has problems */
+ signal(SIGPIPE, (void (*)(int)) SIG_IGN);
}
- else
- fprintf(stderr, "Could not start sound server [%s]\n", buffer);
diff -r 59375d45b6cf -r 2f90bb8a560d games/xdoom/patches/patch-ai
--- a/games/xdoom/patches/patch-ai Thu Jan 12 23:54:09 2006 +0000
+++ b/games/xdoom/patches/patch-ai Thu Jan 12 23:59:02 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2002/08/22 05:08:31 mycroft Exp $
+$NetBSD: patch-ai,v 1.4 2006/01/13 00:04:16 joerg Exp $
--- linuxdoom-1.10/i_video.c.orig Mon Dec 22 20:39:01 1997
+++ linuxdoom-1.10/i_video.c Thu Aug 22 04:42:18 2002
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ rcsid[] = "$Id: i_x.c,v 1.6 1997/02/03 2
#include <X11/extensions/XShm.h>
// Had to dig up XShm.c for this one.
// It is in the libXext, but not in the XFree86 headers.
@@ -11,7 +11,7 @@
int XShmGetEventBase( Display* dpy ); // problems with g++?
#endif
-@@ -46,13 +46,14 @@
+@@ -46,13 +46,14 @@ int XShmGetEventBase( Display* dpy ); //
#include <sys/socket.h>
#include <netinet/in.h>
@@ -27,7 +27,7 @@
#include "d_main.h"
#include "doomdef.h"
-@@ -164,15 +165,20 @@
+@@ -164,15 +165,20 @@ int xlatekey(void)
void I_ShutdownGraphics(void)
{
// Detach from X server
@@ -53,7 +53,15 @@
}
-@@ -685,8 +691,7 @@
+@@ -666,7 +672,6 @@ void grabsharedmemory(int size)
+ id = shmget((key_t)key, size, IPC_CREAT|0777);
+ if (id==-1)
+ {
+- extern int errno;
+ fprintf(stderr, "errno=%d\n", errno);
+ I_Error("Could not get any shared memory");
+ }
+@@ -685,8 +690,7 @@ void grabsharedmemory(int size)
// attach to the shared memory segment
image->data = X_shminfo.shmaddr = shmat(id, 0, 0);
@@ -63,7 +71,7 @@
}
void I_InitGraphics(void)
-@@ -986,13 +991,13 @@
+@@ -986,13 +990,13 @@ Expand4
{
fourpixels = lineptr[0];
@@ -79,7 +87,7 @@
xline[1] = dpixel;
xline[161] = dpixel;
xline[321] = dpixel;
-@@ -1000,13 +1005,13 @@
+@@ -1000,13 +1004,13 @@ Expand4
fourpixels = lineptr[1];
@@ -95,7 +103,7 @@
xline[3] = dpixel;
xline[163] = dpixel;
xline[323] = dpixel;
-@@ -1014,13 +1019,13 @@
+@@ -1014,13 +1018,13 @@ Expand4
fourpixels = lineptr[2];
@@ -111,7 +119,7 @@
xline[5] = dpixel;
xline[165] = dpixel;
xline[325] = dpixel;
-@@ -1028,13 +1033,13 @@
+@@ -1028,13 +1032,13 @@ Expand4
fourpixels = lineptr[3];
diff -r 59375d45b6cf -r 2f90bb8a560d games/xdoom/patches/patch-ay
--- a/games/xdoom/patches/patch-ay Thu Jan 12 23:54:09 2006 +0000
+++ b/games/xdoom/patches/patch-ay Thu Jan 12 23:59:02 2006 +0000
@@ -1,8 +1,12 @@
-$NetBSD: patch-ay,v 1.2 2005/02/24 23:04:31 minskim Exp $
+$NetBSD: patch-ay,v 1.3 2006/01/13 00:04:16 joerg Exp $
--- sndserv/linux.c.orig Sun Jan 26 07:45:01 1997
+++ sndserv/linux.c Thu Feb 3 01:34:05 2000
-@@ -39,11 +39,14 @@
+@@ -36,13 +36,17 @@ static const char rcsid[] = "$Id: linux.
+
+
++#include <errno.h>
+ #include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
@@ -17,9 +21,13 @@
+
int audio_fd;
- void
-@@ -76,9 +79,12 @@
-
+@@ -54,5 +58,4 @@ myioctl
+ {
+ int rc;
+- extern int errno;
+
+ rc = ioctl(fd, command, arg);
+@@ -77,7 +80,10 @@ I_InitSound
int i;
- audio_fd = open("/dev/dsp", O_WRONLY);
@@ -32,4 +40,3 @@
+ }
- i = 11 | (2<<16);
diff -r 59375d45b6cf -r 2f90bb8a560d games/xfreecell/distinfo
--- a/games/xfreecell/distinfo Thu Jan 12 23:54:09 2006 +0000
+++ b/games/xfreecell/distinfo Thu Jan 12 23:59:02 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:12:04 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/01/12 23:59:02 joerg Exp $
SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
RMD160 (xfreecell-1.0.5b.tgz) = 2629217bf29734bb25b30ca8aaec62ae19d0ff6f
@@ -7,3 +7,4 @@
SHA1 (patch-ab) = 74326c5b4e731a32a404210cdc13b87a5b15119a
SHA1 (patch-ac) = 4fcb28840a4619c8ceb06dd86ffea351d1b8a2c5
SHA1 (patch-ad) = ab39728f9cb2f9cfb8b55c87185546e93ae5a231
+SHA1 (patch-ae) = 88a9048924d083c7903501302e224df5897c6838
diff -r 59375d45b6cf -r 2f90bb8a560d games/xfreecell/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-ae Thu Jan 12 23:59:02 2006 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2006/01/12 23:59:02 joerg Exp $
+
+--- subwindows.cpp.orig 2006-01-12 23:55:23.000000000 +0000
++++ subwindows.cpp
+@@ -1,5 +1,6 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <errno.h>
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <unistd.h>
+@@ -62,7 +63,6 @@ void QueryWindow::waitForEvent()
+ }
+
+ //Score
+-extern int errno;
+
+ const int winScore = 10;
+ const int defeatScore = 10;
Home |
Main Index |
Thread Index |
Old Index