Make this build on Mac OS X. Fixed PR pkg/41538.

3 files changed, 16 insertions, 30 deletions

diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 21ae810b085..faa18d39a07 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/07/18 02:49:15 smb Exp $
+# $NetBSD: Makefile,v 1.25 2009/08/19 04:04:40 yyamano Exp $
 
 DISTNAME=	frotz-2.43
 PKGREVISION=	3
@@ -13,6 +13,14 @@ COMMENT=	Curses-based interpreter for Infocom-compatible games
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+MAKE_ENV+=	SOUND_DEFS=-DOSS_SOUND
+MAKE_ENV+=	SOUND_LIB=${LIBOSSAUDIO}
+MAKE_ENV+=	SOUND_DEV=${DEVOSSSOUND}
+.endif
+
 # setscrreg()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
 
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 407c2415807..04a176be6d0 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2009/07/18 02:49:15 smb Exp $
+$NetBSD: distinfo,v 1.11 2009/08/19 04:04:40 yyamano Exp $
 
 SHA1 (frotz-2.43.tar.gz) = 2b2684ec670b471489c15be732c7dd1c59821b00
 RMD160 (frotz-2.43.tar.gz) = ccfc303e116e517caff0fec8f3bd555dfc02ae4e
 Size (frotz-2.43.tar.gz) = 160771 bytes
-SHA1 (patch-aa) = a938f7889bca24f182a440c18f468eabe6ce40a5
+SHA1 (patch-aa) = 1d6f92a0c5fae76d13e4de0ce4a9886eda4d1ca9
 SHA1 (patch-pb) = e7d63332e82b5835de051ec0696a76dbe3822042
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
index d6c73ca374c..ce9edba4817 100644
--- a/games/frotz/patches/patch-aa
+++ b/games/frotz/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $
+$NetBSD: patch-aa,v 1.8 2009/08/19 04:04:40 yyamano Exp $
 
---- Makefile.orig	Mon Oct 28 02:21:52 2002
+--- Makefile.orig	2002-10-27 17:21:52.000000000 -0800
 +++ Makefile
 @@ -1,7 +1,7 @@
  # Define your C compiler.  I recommend gcc if you have it.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $
  #CC = cc
  
  # Define your optimization flags.  Most compilers understand -O and -O2,
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ OPTS = -O2 
  #-malign-jumps=2
  
  # Define where you want Frotz installed.  Usually this is /usr/local
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $
  
  MAN_PREFIX = $(PREFIX)
  #MAN_PREFIX = /usr/local/share
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ CONFIG_DIR = $(PREFIX)/etc
  
  # Define where you want Frotz to look for frotz.conf.
  #
@@ -29,29 +29,7 @@ $NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $
  #CONFIG_DIR = /etc
  #CONFIG_DIR = /usr/pkg/etc
  #CONFIG_DIR =
-@@ -37,18 +37,18 @@
- # Uncomment this if you have an OSS soundcard driver and want classical
- # Infocom sound support.
- #
--#SOUND_DEFS = -DOSS_SOUND
-+SOUND_DEFS = -DOSS_SOUND
- 
- # Uncomment this too if you're running BSD of some sort and are using
- # the OSS sound driver.
- #
--#SOUND_LIB = -lossaudio
-+SOUND_LIB = ${LIBOSSAUDIO}
- 
- # Define your sound device 
- # This should probably be a command-line/config-file option.
- #
- #SOUND_DEV = /dev/dsp
--#SOUND_DEV = /dev/sound
-+SOUND_DEV = ${DEVOSSSOUND}
- #SOUND_DEV = /dev/audio
- 
- # If your vendor-supplied curses library won't work, uncomment the
-@@ -163,7 +163,7 @@
+@@ -163,7 +163,7 @@ FLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
  $(NAME): $(NAME)-curses
  
  $(NAME)-curses:		soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)