Fix GCC 3.4: __FUNCTION__ works like __func__, it can't be string

concanatted. Add DragonFly.

5 files changed, 80 insertions, 5 deletions

diff --git a/emulators/tuxnes/distinfo b/emulators/tuxnes/distinfo
index c4caf3cf4a3..8ff1ce4072b 100644
--- a/emulators/tuxnes/distinfo
+++ b/emulators/tuxnes/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/12 21:03:20 joerg Exp $
 
 SHA1 (tuxnes-0.75.tar.gz) = 1729cb3a33a5a3e0c8fa81a1341f912cd0b8d18b
 RMD160 (tuxnes-0.75.tar.gz) = d4a94e00f7c90cbf6fbf19537ede22aca05eeafd
 Size (tuxnes-0.75.tar.gz) = 198735 bytes
 SHA1 (patch-aa) = d907d8c64ffec0977160f61bf70eb5223a6fc1d2
 SHA1 (patch-ab) = b2acfc6915f30f28aadc5a9ddf780596c8120f72
-SHA1 (patch-ac) = e4f82da5f6d4e4a15850c5ce14f8420a857a804b
+SHA1 (patch-ac) = dc4bb8796812c3dd24f338f7c8b465199d80207e
 SHA1 (patch-ad) = 25a937a0fcc0e52a42f8614656ca9e6eb08f02b9
+SHA1 (patch-ae) = 4f988a7351a1bceb5eb5add4e11cd3d02d011908
+SHA1 (patch-af) = dd655363b844f0264879f8efd3e5efae6672b43c
+SHA1 (patch-ag) = 4afd1f53df82ddc229ff3c505be1133a3cb206d6
diff --git a/emulators/tuxnes/patches/patch-ac b/emulators/tuxnes/patches/patch-ac
index 3f02f99dd3b..e3c4567f456 100644
--- a/emulators/tuxnes/patches/patch-ac
+++ b/emulators/tuxnes/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2006/01/12 21:03:20 joerg Exp $
 
---- sound.c.orig	2001-04-11 23:45:47.000000000 +0200
+--- sound.c.orig	2001-04-11 21:45:47.000000000 +0000
 +++ sound.c
-@@ -104,6 +104,7 @@
+@@ -104,11 +104,12 @@
  #include <math.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -10,6 +10,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/19 20:29:37 wiz Exp $
  #include <unistd.h>
  #include <sys/ioctl.h>
  #if defined(__FreeBSD__)
+ #include <machine/endian.h>
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <sys/endian.h>
+ #else /* Linux */
+ #include <endian.h>
 @@ -411,7 +412,7 @@ InitAudio(int argc, char **argv)
          {
            int desired_fragmentsize = 0; 
diff --git a/emulators/tuxnes/patches/patch-ae b/emulators/tuxnes/patches/patch-ae
new file mode 100644
index 00000000000..e5d3b98c422
--- /dev/null
+++ b/emulators/tuxnes/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2006/01/12 21:03:20 joerg Exp $
+
+--- emu.c.orig	2006-01-12 20:46:29.000000000 +0000
++++ emu.c
+@@ -890,7 +890,7 @@ loadpal(char *palfile)
+       len = strlen(palfile) + 1;
+       if (! (buffer = malloc(len)))
+ 	{
+-	  perror (__FUNCTION__ ": malloc");
++	  perror ("loadpal: malloc");
+ 	  return;
+ 	}
+       memcpy (buffer, palfile, len);
+@@ -912,7 +912,7 @@ loadpal(char *palfile)
+       len = strlen(filename) + 1;
+       if (! (buffer = malloc(len)))
+ 	{
+-	  perror (__FUNCTION__ ": malloc");
++	  perror ("loadpal: malloc");
+ 	  return;
+ 	}
+       memcpy (buffer, filename, len);
+@@ -924,7 +924,7 @@ loadpal(char *palfile)
+ 	return;
+       if (!(palfile = malloc ((len = strlen (filename)) + 11)))
+         {
+-          perror (__FUNCTION__ ": malloc");
++          perror ("loadpal: malloc");
+           return;
+         }
+       strcpy (palfile, filename);
+@@ -1602,7 +1602,7 @@ main (int argc, char **argv)
+ 
+     if (! (basefilename = malloc(baseend - basestart + 1)))
+       {
+-        perror (__FUNCTION__ ": malloc");
++        perror ("main: malloc");
+         exit (1);
+       }
+ 
diff --git a/emulators/tuxnes/patches/patch-af b/emulators/tuxnes/patches/patch-af
new file mode 100644
index 00000000000..a4c483f76bd
--- /dev/null
+++ b/emulators/tuxnes/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/01/12 21:03:20 joerg Exp $
+
+--- x11.c.orig	2006-01-12 20:53:39.000000000 +0000
++++ x11.c
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #if defined(__FreeBSD__)
+ #include <machine/endian.h>
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <sys/endian.h>
+ #else /* Linux */
+ #include <endian.h>
diff --git a/emulators/tuxnes/patches/patch-ag b/emulators/tuxnes/patches/patch-ag
new file mode 100644
index 00000000000..8cc03aeb645
--- /dev/null
+++ b/emulators/tuxnes/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/01/12 21:03:20 joerg Exp $
+
+--- w.c.orig	2006-01-12 20:48:51.000000000 +0000
++++ w.c
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #if defined(__FreeBSD__)
+ #include <machine/endian.h>
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <sys/endian.h>
+ #else /* Linux */
+ #include <endian.h>