summaryrefslogtreecommitdiff
path: root/games/mirrormagic
diff options
context:
space:
mode:
Diffstat (limited to 'games/mirrormagic')
-rw-r--r--games/mirrormagic/Makefile16
-rw-r--r--games/mirrormagic/PLIST210
-rw-r--r--games/mirrormagic/distinfo14
-rw-r--r--games/mirrormagic/patches/patch-aa3
-rw-r--r--games/mirrormagic/patches/patch-ab15
-rw-r--r--games/mirrormagic/patches/patch-ac12
-rw-r--r--games/mirrormagic/patches/patch-ad43
-rw-r--r--games/mirrormagic/patches/patch-ae22
-rw-r--r--games/mirrormagic/patches/patch-af14
9 files changed, 37 insertions, 312 deletions
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 1aa18537fad..0ca018235e8 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/07/05 22:13:06 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/11 23:43:41 wiz Exp $
#
-DISTNAME= mirrormagic-2.0.0
+DISTNAME= mirrormagic-2.0.1
CATEGORIES= games x11
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.artsoft.org/mirrormagic/
COMMENT= Nice little puzzle game with color graphics and sound
USE_GMAKE= YES
+PLIST_SRC= ${WRKDIR}/PLIST PLIST
# if you change SCORE_PATH, don't forget to change patch-aa, too
SCORE_PATH= /var/games/mirrormagic
@@ -18,7 +19,7 @@ do-install:
${INSTALL_PROGRAM} -o bin -g games -m 2755 \
${WRKSRC}/mirrormagic ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic
- cd ${WRKSRC} && ${PAX} -r -w sounds graphics levels \
+ cd ${WRKSRC} && ${PAX} -r -w graphics levels music sounds \
${PREFIX}/share/mirrormagic/
${CHOWN} -R games:games ${PREFIX}/share/mirrormagic
${INSTALL_DATA_DIR} ${SCORE_PATH}/scores
@@ -28,6 +29,15 @@ do-install:
${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/${directory} \
&& ${CHMOD} 775 ${SCORE_PATH}/scores/${directory}
.endfor
+ ${RM} -f ${WRKDIR}/PLIST
+.for levdir in Classic_Games
+ cd ${PREFIX} && \
+ ${FIND} share/mirrormagic/levels/${levdir} -type f >>${WRKDIR}/PLIST
+.endfor
+.for directory in graphics music sounds
+ cd ${PREFIX} && \
+ ${FIND} share/mirrormagic/${directory} -type f >>${WRKDIR}/PLIST
+.endfor
${CHOWN} -R games:games ${SCORE_PATH}
.include "../../mk/bsd.pkg.mk"
diff --git a/games/mirrormagic/PLIST b/games/mirrormagic/PLIST
index 990c8c72345..816f3a7e3b8 100644
--- a/games/mirrormagic/PLIST
+++ b/games/mirrormagic/PLIST
@@ -1,207 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:54:08 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/11 23:43:41 wiz Exp $
bin/mirrormagic
-share/mirrormagic/graphics/MirrorDF.pcx
-share/mirrormagic/graphics/MirrorDoor.pcx
-share/mirrormagic/graphics/MirrorFont.pcx
-share/mirrormagic/graphics/MirrorFont2.pcx
-share/mirrormagic/graphics/MirrorFont3.pcx
-share/mirrormagic/graphics/MirrorScreen.pcx
-share/mirrormagic/graphics/MirrorToons.pcx
-share/mirrormagic/graphics/mirrormagic_icon.xbm
-share/mirrormagic/graphics/mirrormagic_iconmask.xbm
-share/mirrormagic/graphics/mouse.pcx
-@dirrm share/mirrormagic/graphics
-share/mirrormagic/sounds/amoebe.wav
-share/mirrormagic/sounds/antigrav.wav
-share/mirrormagic/sounds/autsch.wav
-share/mirrormagic/sounds/bong.wav
-share/mirrormagic/sounds/fuel.wav
-share/mirrormagic/sounds/halloffame.wav
-share/mirrormagic/sounds/holz.wav
-share/mirrormagic/sounds/hui.wav
-share/mirrormagic/sounds/kabumm.wav
-share/mirrormagic/sounds/kink.wav
-share/mirrormagic/sounds/kling.wav
-share/mirrormagic/sounds/laser.wav
-share/mirrormagic/sounds/oeffnen.wav
-share/mirrormagic/sounds/quiek.wav
-share/mirrormagic/sounds/rhythmloop.wav
-share/mirrormagic/sounds/roaaar.wav
-share/mirrormagic/sounds/sirr.wav
-share/mirrormagic/sounds/slurp.wav
-share/mirrormagic/sounds/warnton.wav
-share/mirrormagic/sounds/whoosh.wav
-@dirrm share/mirrormagic/sounds
-share/mirrormagic/levels/Classic_Games/levelinfo.conf
-share/mirrormagic/levels/Classic_Games/classic_deflektor/001.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/002.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/003.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/004.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/005.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/006.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/007.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/008.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/009.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/010.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/011.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/012.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/013.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/014.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/015.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/016.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/017.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/018.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/019.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/020.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/021.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/022.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/023.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/024.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/025.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/026.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/027.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/028.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/029.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/030.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/031.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/032.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/033.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/034.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/035.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/036.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/037.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/038.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/039.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/040.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/041.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/042.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/043.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/044.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/045.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/046.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/047.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/048.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/049.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/050.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/051.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/052.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/053.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/054.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/055.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/056.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/057.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/058.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/059.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/060.level
-share/mirrormagic/levels/Classic_Games/classic_deflektor/levelinfo.conf
-@dirrm share/mirrormagic/levels/Classic_Games/classic_deflektor
-share/mirrormagic/levels/Classic_Games/classic_mindbender/000.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/001.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/002.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/003.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/004.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/005.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/006.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/007.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/008.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/009.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/010.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/011.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/012.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/013.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/014.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/015.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/016.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/017.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/018.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/019.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/020.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/021.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/022.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/023.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/024.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/025.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/026.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/027.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/028.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/029.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/030.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/031.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/032.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/033.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/034.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/035.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/036.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/037.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/038.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/039.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/040.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/041.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/042.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/043.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/044.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/045.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/046.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/047.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/048.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/049.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/050.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/051.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/052.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/053.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/054.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/055.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/056.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/057.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/058.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/059.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/060.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/061.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/062.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/063.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/064.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/065.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/066.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/067.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/068.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/069.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/070.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/071.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/072.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/073.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/074.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/075.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/076.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/077.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/078.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/079.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/080.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/081.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/082.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/083.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/084.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/085.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/086.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/087.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/088.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/089.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/090.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/091.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/092.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/093.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/094.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/095.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/096.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/097.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/098.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/099.level
-share/mirrormagic/levels/Classic_Games/classic_mindbender/levelinfo.conf
-@dirrm share/mirrormagic/levels/Classic_Games/classic_mindbender
-@dirrm share/mirrormagic/levels/Classic_Games
-@dirrm share/mirrormagic/levels
-@dirrm share/mirrormagic
@exec install -d -m 775 -o games -g games /var/games/mirrormagic
@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores
@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores/classic_deflektor
@exec install -d -m 775 -o games -g games /var/games/mirrormagic/scores/classic_mindbender
@unexec echo Delete /var/games/mirrormagic if you do not need your hiscores anymore.
+@dirrm share/mirrormagic/sounds
+@dirrm share/mirrormagic/music
+@dirrm share/mirrormagic/levels/Classic_Games/classic_mindbender
+@dirrm share/mirrormagic/levels/Classic_Games/classic_deflektor
+@dirrm share/mirrormagic/levels/Classic_Games
+@dirrm share/mirrormagic/levels
+@dirrm share/mirrormagic/graphics
+@dirrm share/mirrormagic
diff --git a/games/mirrormagic/distinfo b/games/mirrormagic/distinfo
index 5cda222349b..14cdc493bdc 100644
--- a/games/mirrormagic/distinfo
+++ b/games/mirrormagic/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/05 22:13:06 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2002/09/11 23:43:41 wiz Exp $
-SHA1 (mirrormagic-2.0.0.tar.gz) = ca2ddb0106627b0c43e3688042c3f1241cf73653
-Size (mirrormagic-2.0.0.tar.gz) = 1163123 bytes
-SHA1 (patch-aa) = 3e23db6da50cc1d5add69745e7738ad6d71919de
-SHA1 (patch-ab) = 0485825f11f3d82357effd84d911d164d13373f0
-SHA1 (patch-ac) = dc212592526295d886f049fabde4efe753d1833b
-SHA1 (patch-ad) = 213cc8d169ed448657f96e0adee8623f90f50335
-SHA1 (patch-ae) = fe84a2cfb4bcef854a8f79655e64ee68f771effe
-SHA1 (patch-af) = 30d4782a6345f52008955bd3d2bb3d705c7f28c0
+SHA1 (mirrormagic-2.0.1.tar.gz) = c35770b30cc1e94a20aea721a9a2cfbef1b97781
+Size (mirrormagic-2.0.1.tar.gz) = 1167884 bytes
+SHA1 (patch-aa) = ec4613d70482da6f240fefe57f6c61f745d01125
+SHA1 (patch-ab) = abc9e8b8ed66225b50a398e287d94dfa1b728365
diff --git a/games/mirrormagic/patches/patch-aa b/games/mirrormagic/patches/patch-aa
index d509933ad63..5ce856af013 100644
--- a/games/mirrormagic/patches/patch-aa
+++ b/games/mirrormagic/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.5 2001/07/05 22:13:07 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/11 23:43:42 wiz Exp $
+
--- Makefile.orig Wed May 2 23:09:06 2001
+++ Makefile Sun Jun 24 21:03:37 2001
@@ -12,15 +12,17 @@
diff --git a/games/mirrormagic/patches/patch-ab b/games/mirrormagic/patches/patch-ab
index 37eb5385d6b..b140205d253 100644
--- a/games/mirrormagic/patches/patch-ab
+++ b/games/mirrormagic/patches/patch-ab
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2001/07/05 22:13:08 kristerw Exp $
---- src/Makefile.orig Wed May 2 23:13:44 2001
-+++ src/Makefile Wed May 2 23:24:24 2001
+$NetBSD: patch-ab,v 1.4 2002/09/11 23:43:42 wiz Exp $
+
+--- src/Makefile.orig Tue Mar 19 02:58:57 2002
++++ src/Makefile Thu Mar 28 11:34:15 2002
@@ -17,7 +17,7 @@
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
@@ -10,12 +11,12 @@ $NetBSD: patch-ab,v 1.3 2001/07/05 22:13:08 kristerw Exp $
endif
AR = ar
-@@ -100,7 +100,7 @@
- # OPTIONS = -O3
- # OPTIONS = -DSYSV -Ae # may be needed for HP-UX
+@@ -112,7 +112,7 @@
+ OPTIONS = -O3 -Wall
+ endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-+CFLAGS = $(SYS_CFLAGS) $(CONFIG)
++CFLAGS += $(SYS_CFLAGS) $(CONFIG)
LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
diff --git a/games/mirrormagic/patches/patch-ac b/games/mirrormagic/patches/patch-ac
deleted file mode 100644
index a5e20664e62..00000000000
--- a/games/mirrormagic/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/07/05 22:13:08 kristerw Exp $
---- src/files.c.orig Sat Dec 9 22:09:04 2000
-+++ src/files.c Sun Jun 24 22:54:06 2001
-@@ -82,7 +82,7 @@
- #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH)
- #define USERDATA_DIR_MODE (MODE_R_ALL | MODE_X_ALL | S_IWUSR)
- #define LEVEL_PERMS (MODE_R_ALL | MODE_W_ALL)
--#define SCORE_PERMS LEVEL_PERMS
-+#define SCORE_PERMS (MODE_R_ALL | S_IWUSR | S_IWGRP)
- #define SETUP_PERMS LEVEL_PERMS
-
- /* sort priorities of level series (also used as level series classes) */
diff --git a/games/mirrormagic/patches/patch-ad b/games/mirrormagic/patches/patch-ad
deleted file mode 100644
index 3534a7c40d5..00000000000
--- a/games/mirrormagic/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/07/05 22:13:08 kristerw Exp $
---- src/libgame/sound.c.orig Sun Dec 31 11:47:19 2000
-+++ src/libgame/sound.c Thu Jul 5 23:37:59 2001
-@@ -291,7 +291,30 @@
- - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz)
- - (with stereo the effective buffer size will shrink to 256)
- => fragment_size = 0x00020009 */
-+#if defined(PLATFORM_NETBSD)
-+ {
-+ audio_info_t a_info;
-
-+ AUDIO_INITINFO(&a_info);
-+ a_info.play.encoding = AUDIO_ENCODING_LINEAR8;
-+ a_info.play.precision = 8;
-+ a_info.play.channels = 2;
-+ a_info.play.sample_rate = sample_rate;
-+ a_info.blocksize = fragment_size;
-+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
-+ {
-+ /* Try to disable stereo. */
-+ a_info.play.channels = 1;
-+ stereo = FALSE;
-+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
-+ {
-+ Error(ERR_EXIT_SOUND_SERVER,
-+ "cannot set sample rate of /dev/audio - no sounds");
-+ playing_sounds = 0;
-+ }
-+ }
-+ }
-+#else
- if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_spec) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp - no sounds");
-@@ -319,7 +342,7 @@
- if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE,&fragment_size) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot get fragment size of /dev/dsp - no sounds");
--
-+#endif
- max_sample_size = fragment_size / (stereo ? 2 : 1);
- }
-
diff --git a/games/mirrormagic/patches/patch-ae b/games/mirrormagic/patches/patch-ae
deleted file mode 100644
index 0914822a9d0..00000000000
--- a/games/mirrormagic/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/05 22:13:08 kristerw Exp $
---- src/libgame/sound.h.orig Sat Dec 16 22:07:58 2000
-+++ src/libgame/sound.h Thu Jul 5 23:38:13 2001
-@@ -26,6 +26,9 @@
- #include <linux/soundcard.h>
- #elif defined(PLATFORM_FREEBSD)
- #include <machine/soundcard.h>
-+#elif defined(PLATFORM_NETBSD)
-+#include <sys/ioctl.h>
-+#include <sys/audioio.h>
- #elif defined(PLATFORM_HPUX)
- #include <sys/audio.h>
- #endif
-@@ -33,7 +36,7 @@
- #include "system.h"
-
-
--#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
-+#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE) || defined(PLATFORM_NETBSD)
- #define AUDIO_STREAMING_DSP
- #endif
-
diff --git a/games/mirrormagic/patches/patch-af b/games/mirrormagic/patches/patch-af
deleted file mode 100644
index ecf6b5a78a5..00000000000
--- a/games/mirrormagic/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/07/05 22:13:09 kristerw Exp $
---- src/libgame/platform.h.orig Mon Dec 4 22:07:57 2000
-+++ src/libgame/platform.h Thu Jul 5 23:38:26 2001
-@@ -56,6 +56,10 @@
- #define PLATFORM_FREEBSD
- #endif
-
-+#if defined(__NetBSD__)
-+#define PLATFORM_NETBSD
-+#endif
-+
- /* detecting HP-UX by the following compiler keyword definitions:
- - in K&R mode (the default), the HP C compiler defines "hpux"
- - in ANSI mode (-Aa or -Ae), the HP C compiler defines "__hpux"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 05:19:16 +0000