Fixed the package to build and install on Solaris with sunpro.

4 files changed, 62 insertions, 25 deletions

diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag
index 30e4e5f4142..852a056a540 100644
--- a/emulators/snes9x/patches/patch-ag
+++ b/emulators/snes9x/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.9 2006/07/05 21:21:37 wiz Exp $
+$NetBSD: patch-ag,v 1.10 2006/10/18 13:11:59 rillig Exp $
 
---- unix/unix.cpp.orig	2004-12-30 22:15:47.000000000 +0000
-+++ unix/unix.cpp
+--- unix/unix.cpp.orig	2004-12-30 23:15:47.000000000 +0100
++++ unix/unix.cpp	2006-10-18 14:03:16.729013960 +0200
 @@ -117,15 +117,25 @@
  
  #ifdef USE_THREADS
@@ -300,6 +300,20 @@ $NetBSD: patch-ag,v 1.9 2006/07/05 21:21:37 wiz Exp $
  #ifdef JSIOCGVERSION
      struct js_event js_ev;
      int i;
+@@ -1129,11 +1373,11 @@ void _splitpath (const char *path, char 
+ {
+     *drive = 0;
+ 
+-    char *slash = strrchr (path, '/');
++    const char *slash = strrchr (path, '/');
+     if (!slash)
+ 	slash = strrchr (path, '\\');
+ 
+-    char *dot = strrchr (path, '.');
++    const char *dot = strrchr (path, '.');
+ 
+     if (dot && slash && dot < slash)
+ 	dot = NULL;
 @@ -1646,7 +1890,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
  }
  #endif
diff --git a/emulators/snes9x/patches/patch-aq b/emulators/snes9x/patches/patch-aq
index 8672ec5a3cf..a98177ee1af 100644
--- a/emulators/snes9x/patches/patch-aq
+++ b/emulators/snes9x/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1 2006/03/18 15:56:00 ben Exp $
+$NetBSD: patch-aq,v 1.2 2006/10/18 13:11:59 rillig Exp $
 
---- configure.orig	2004-12-30 14:15:48.000000000 -0800
-+++ configure
+--- configure.orig	2004-12-30 23:15:48.000000000 +0100
++++ configure	2006-10-18 13:51:14.687896164 +0200
 @@ -23,7 +23,9 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with(out)-aido        Use a shared memory area for output (default: without)"
@@ -172,22 +172,3 @@ $NetBSD: patch-aq,v 1.1 2006/03/18 15:56:00 ben Exp $
  /* */
  #else
  #error No sound for this platform
-@@ -4938,6 +5022,18 @@ for ac_option
- do
-   case "\$ac_option" in
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
diff --git a/emulators/snes9x/patches/patch-ba b/emulators/snes9x/patches/patch-ba
new file mode 100644
index 00000000000..cfbb4837e2b
--- /dev/null
+++ b/emulators/snes9x/patches/patch-ba
@@ -0,0 +1,26 @@
+$NetBSD: patch-ba,v 1.1 2006/10/18 13:11:59 rillig Exp $
+
+SunPro interprets the original code as "extern C" pointer to "extern C"
+functions, which conflicts with the definition of the functions.
+
+--- apu.h.orig	2004-12-30 23:15:47.000000000 +0100
++++ apu.h	2006-10-18 13:50:59.265817188 +0200
+@@ -150,6 +150,9 @@ STATIC inline void S9xAPUPackStatus()
+ 		      (IAPU._Zero & 0x80) | (IAPU._Overflow << 6);
+ }
+ 
++/* Note: This must be outside the "extern" block. */
++typedef void (*S9xApuOpcodeFunction)(void);
++
+ START_EXTERN_C
+ void S9xResetAPU (void);
+ bool8 S9xInitAPU ();
+@@ -167,7 +170,7 @@ void S9xOpenCloseSoundTracingFile (bool8
+ void S9xPrintAPUState ();
+ extern int32 S9xAPUCycles [256];	// Scaled cycle lengths
+ extern int32 S9xAPUCycleLengths [256];	// Raw data.
+-extern void (*S9xApuOpcodes [256]) (void);
++extern S9xApuOpcodeFunction S9xApuOpcodes[256];
+ END_EXTERN_C
+ 
+ 
diff --git a/emulators/snes9x/patches/patch-bc b/emulators/snes9x/patches/patch-bc
new file mode 100644
index 00000000000..6ddc0cb8f9c
--- /dev/null
+++ b/emulators/snes9x/patches/patch-bc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bc,v 1.1 2006/10/18 13:11:59 rillig Exp $
+
+Type mismatch, caused by not using header files for function
+declarations.
+
+--- unix/x11.cpp.orig	2004-12-30 23:15:47.000000000 +0100
++++ unix/x11.cpp	2006-10-18 14:18:18.126928644 +0200
+@@ -209,7 +209,7 @@ int ErrorHandler (Display *, XErrorEvent
+ void TVMode (int width, int height);
+ void S9xDisplayStateChange (const char *str, bool8 on);
+ 
+-void Init_2xSaI (uint32);
++int Init_2xSaI (uint32);
+ void Super2xSaI (uint8 *srcPtr, uint32 srcPitch,
+ 		 uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch,
+ 		 int width, int height);