Enable sound, and fix the Makefile. Cannot touch the RAY.names file,

otherwise the game cannot figure out it's own level files. (?) Sound works,
but isn't very good, and the music is absolutely horrid.

3 files changed, 41 insertions, 12 deletions

diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index ab1d0c0aaee..79d4055ad4f 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/07/04 09:18:57 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1998/11/09 21:20:18 garbled Exp $
 #
 
 DISTNAME=		mirrormagic-1.3
@@ -13,14 +13,17 @@ DEPENDS=		xpm-3.4k:../../graphics/xpm
 USE_X11=		YES
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${X11BASE}/bin
+	${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11BASE}/bin
 	${MKDIR} ${X11BASE}/share/mirrormagic/sounds
 	${MKDIR} ${X11BASE}/share/mirrormagic/graphics
+	chown bin:games ${X11BASE}/share/mirrormagic
+	chmod 775 ${X11BASE}/share/mirrormagic
 	${INSTALL_DATA} ${WRKSRC}/sounds/* ${X11BASE}/share/mirrormagic/sounds
 	${INSTALL_DATA} ${WRKSRC}/graphics/* ${X11BASE}/share/mirrormagic/graphics
 	${INSTALL_DATA} ${WRKSRC}/RAY.* ${X11BASE}/share/mirrormagic
 	${GUNZIP_CMD} ${X11BASE}/share/mirrormagic/graphics/*.gz
-	${TOUCH} ${X11BASE}/share/mirrormagic/RAY.score ${X11BASE}/share/mirrormagic/RAY.names
-	chmod 666 ${X11BASE}/share/mirrormagic/RAY.score ${X11BASE}/share/mirrormagic/RAY.names
+	${TOUCH} ${X11BASE}/share/mirrormagic/RAY.score
+	chown bin:games ${X11BASE}/share/mirrormagic/RAY.score
+	chmod 664 ${X11BASE}/share/mirrormagic/RAY.score
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/mirrormagic/patches/patch-aa b/games/mirrormagic/patches/patch-aa
index 0ec32047052..0c0ea9dd3f4 100644
--- a/games/mirrormagic/patches/patch-aa
+++ b/games/mirrormagic/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:43 agc Exp $
-
---- Makefile.orig	Thu Jun 11 13:25:51 1998
-+++ Makefile	Thu Jun 11 13:28:21 1998
-@@ -10,7 +10,7 @@
+$NetBSD: patch-aa,v 1.3 1998/11/09 21:20:18 garbled Exp $
+--- Makefile.orig	Wed Sep  6 04:56:17 1995
++++ Makefile	Mon Nov  9 12:35:14 1998
+@@ -8,11 +8,11 @@
+ CC = gcc
+ # CC = cc				# for HP-UX and others
  
 -GFX_PATH = -DGFX_PATH=\"./graphics\"	# path where the graphics are
 -SND_PATH = -DSND_PATH=\"./sounds\"	# path where the sounds are
@@ -15,17 +16,24 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:43 agc Exp $
 +SCORE_PATH = -DSCORE_PATH=\"${X11BASE}/share/mirrormagic\"		# path where the score file is
 +NAMES_PATH = -DNAMES_PATH=\"${X11BASE}/share/mirrormagic\"		# path where the names file is
  # SOUNDS = -DNO_SOUNDS			# don't play any sounds
-@@ -28,3 +28,3 @@
+ # SCORE_ENTRIES = -DONE_PER_NAME	# only one score entry per name
+ SCORE_ENTRIES = -DMANY_PER_NAME		# many score entries per name
+@@ -26,15 +26,15 @@
+ 
+ # DEBUG = -DDEBUG -g -ansi -pedantic -Wall
  # DEBUG = -DDEBUG -g -Wall
 -DEBUG = -O6
 +DEBUG = -O2
  
-@@ -33,6 +33,6 @@
+ # SYSTEM = -Aa -D_HPUX_SOURCE -Dhpux	# for HP-UX (obsolete)
+ # SYSTEM = -DSYSV -Ae			# for HP-UX
  # SYSTEM = -DSYSV			# for systems without 'usleep()'
 -# INCL = -I/usr/include/X11R5		# for HP-UX and others
 +INCL = -I${X11BASE}/include		# for HP-UX and others
  # LIBS = -lXpm -lX11 -lm
  # LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm # for HP-UX and others
 -LIBS = -lXpm -lXpm -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
-+LIBS = -L${X11BASE}/lib -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
++LIBS = -L${X11BASE}/lib -lXpm -lX11 -lm	-lossaudio # triple "-lXpm" because of Xpm error
  
+ # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
+ CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
diff --git a/games/mirrormagic/patches/patch-ab b/games/mirrormagic/patches/patch-ab
new file mode 100644
index 00000000000..80b41bb1e2c
--- /dev/null
+++ b/games/mirrormagic/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 1998/11/09 21:20:18 garbled Exp $
+--- sound.h.orig	Mon Nov  9 12:36:49 1998
++++ sound.h	Mon Nov  9 12:35:46 1998
+@@ -29,6 +29,14 @@
+ extern void ioctl(long, long, void *);
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/ioctl.h>
++#include <soundcard.h>
++#ifndef VOXWARE
++#define VOXWARE
++#endif
++#endif
++
+ #define SND_BLOCKSIZE 4096
+ 
+ #ifdef _HPUX_SOURCE