5 files changed, 32 insertions, 16 deletions
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 1d6a5cf26fc..235b2181618 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/26 23:39:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/30 22:41:27 joerg Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -12,9 +12,6 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.ambrosiasw.com/Products/Maelstrom.html
 COMMENT=	High resolution graphics version of Asteroids (X11 version)
 
-PKG_FAIL_REASON+=	"Broken on NetBSD/i386 3.0 in pkgsrc-2005Q4"
-PKG_FAIL_REASON+=	"Will be removed in pkgsrc-2006Q1 unless fixed"
-
 ESOUND=			Maelstrom-Sounds-L2.0.0.tar.gz
 STREK=			Star_Trek.tar.gz
 SWARS=			Star_Wars.tar.gz
diff --git a/games/maelstrom-x11/distinfo b/games/maelstrom-x11/distinfo
index 7dba87ed2c8..c88485ea863 100644
--- a/games/maelstrom-x11/distinfo
+++ b/games/maelstrom-x11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/06/07 04:23:43 minskim Exp $
+$NetBSD: distinfo,v 1.6 2005/12/30 22:41:27 joerg Exp $
 
 SHA1 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 66c81365104bfab9985919f0cba5a6d955727d79
 RMD160 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 071b36ecd31830f3b62e4b6e2f64b7f7d87b1386
@@ -12,8 +12,8 @@ Size (Star_Wars.tar.gz) = 723225 bytes
 SHA1 (Maelstrom-Sounds-L2.0.0.tar.gz) = 26f1fb329576fd95d7cd99d5a8b75a85654225b6
 RMD160 (Maelstrom-Sounds-L2.0.0.tar.gz) = ee11301b5acd54497b14642969d6abacbdc6ffd0
 Size (Maelstrom-Sounds-L2.0.0.tar.gz) = 1706928 bytes
-SHA1 (patch-aa) = 5d0752a373284e001ef358a2d653f312a9ec0f31
-SHA1 (patch-ab) = 487e4fcc7de470a8bbb3e51640ce4daf23be373a
+SHA1 (patch-aa) = 2a6f2e0304b6de08e7bbebe7b0a54b85feed8807
+SHA1 (patch-ab) = d767d9646f98f1d8b7ce5f471a8a789ed29d0e75
 SHA1 (patch-ac) = 81ae36f64ea8db22ba81be8911e05f6c66459edc
 SHA1 (patch-ad) = d5405b696f839c4965fb8e299108aff1b689399a
 SHA1 (patch-ae) = 6f390cca5abbc0b277d22df8efc4ce589e8b0ecb
@@ -22,3 +22,4 @@ SHA1 (patch-ag) = aa7102be99466e81b95258a2a2ff888d7136fda3
 SHA1 (patch-ah) = b39ccc02f3e27e655d5169bb843554b7bdb323a9
 SHA1 (patch-ai) = 153db1c1860e5d336a51aac2d86f753fc3858d31
 SHA1 (patch-aj) = 5135031fbbfa06eb11d24859bb1589361b025ba4
+SHA1 (patch-ak) = 40a94611f4051824f72e757a13a3cb03e141d1ac
diff --git a/games/maelstrom-x11/patches/patch-aa b/games/maelstrom-x11/patches/patch-aa
index d303c6a9de3..16780561966 100644
--- a/games/maelstrom-x11/patches/patch-aa
+++ b/games/maelstrom-x11/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/30 22:41:27 joerg Exp $
 
 --- Makeflags.orig	Mon Jul 14 14:32:13 1997
 +++ Makeflags	Sun Jul 30 01:32:07 2000
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
 +X11LIBS = -lX11 -lXext -lXpm
 +CSUMLIB =
 +LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB)
-+SOUNDLIBS = -lossaudio
++SOUNDLIBS = ${LIBOSSAUDIO}
 +
 +INSTALL = /usr/bin/install
 +
diff --git a/games/maelstrom-x11/patches/patch-ab b/games/maelstrom-x11/patches/patch-ab
index c15135a90d9..0437bcb9752 100644
--- a/games/maelstrom-x11/patches/patch-ab
+++ b/games/maelstrom-x11/patches/patch-ab
@@ -1,25 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/30 22:41:27 joerg Exp $
 
---- bitesex.h.orig	Sun May 25 17:18:10 1997
-+++ bitesex.h	Mon Jul 24 17:55:08 2000
-@@ -20,5 +20,5 @@
+--- bitesex.h.orig	1997-05-25 21:18:10.000000000 +0000
++++ bitesex.h
+@@ -19,13 +19,15 @@
+ #ifdef _INCLUDE_HPUX_SOURCE
  #include <machine/param.h>
  #else
 -#ifdef __mips
 +#if defined(__mips) && !defined(__NetBSD__)
  #include <sex.h>
  #else
-@@ -26,5 +26,5 @@
+ #ifdef _AIX
  #include <sys/machine.h>
  #else
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__DragonFly__)
++#include <sys/endian.h>
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
  #include <machine/endian.h>
  #else
-@@ -38,5 +38,5 @@
+ #if defined(__svr4__)
+@@ -37,7 +39,7 @@
+ #error	Compiling for an unknown architecture!
  #endif /* Win95 */
  #endif /* SVR4 */
 -#endif /* FreeBSD */
 +#endif /* FreeBSD/NetBSD */
  #endif /* AIX */
  #endif /* DEC */
+ #endif /* HPUX */
diff --git a/games/maelstrom-x11/patches/patch-ak b/games/maelstrom-x11/patches/patch-ak
new file mode 100644
index 00000000000..81e13a0ebc2
--- /dev/null
+++ b/games/maelstrom-x11/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2005/12/30 22:41:27 joerg Exp $
+
+--- myerror.h.orig	2005-12-30 22:18:47.000000000 +0000
++++ myerror.h
+@@ -8,7 +8,5 @@ extern void error(char *fmt, ...);
+ extern void mesg(char *fmt, ...);
+ extern void myperror(char *msg);
+ 
+-#define perror(msg)	myperror(msg)
+-
+ #endif /* _myerror_h */
+