update to 2.43:

- confirmed working with NetBSD 1.6's curses
- various other bugfixes

3 files changed, 36 insertions, 74 deletions

diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 4b78ca56043..8454343fbd9 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/10/13 15:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/29 17:09:05 dillo Exp $
 #
 
-DISTNAME=	frotz-2.42
-PKGREVISION=	1
+DISTNAME=	frotz-2.43
 CATEGORIES=	games
 # The maintainer has asked us to use the mirrors instead of www.cs.csubak.edu.
 #MASTER_SITES=	http://www.cs.csubak.edu/~dgriffi/frotz/files/
@@ -25,11 +24,12 @@ DOCDIR=		${PREFIX}/share/doc/frotz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/frotz.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/man/man6
 	${INSTALL_DATA_DIR} ${SAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/frotz.conf-big ${SAMPLEDIR}/frotz.conf
+	${INSTALL_DATA} ${WRKSRC}/doc/frotz.conf-big ${SAMPLEDIR}/frotz.conf
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
 
 .include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index d18467aac1d..f3ac6b01d3d 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/06/29 01:48:52 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2002/10/29 17:09:05 dillo Exp $
 
-SHA1 (frotz-2.42.tar.gz) = c447456d46a1dff833b32db0489aa753fdd4c5f2
-Size (frotz-2.42.tar.gz) = 135337 bytes
-SHA1 (patch-aa) = bf5e5237b87ff1932cf2bd4d42ccc5b160d09939
-SHA1 (patch-ab) = 4d619656c71758661f93acbaf5b04add8779d6c6
-SHA1 (patch-ac) = e0ff2a4e9fe2b3db04d395ef6e565bfc1c1cd46d
-SHA1 (patch-ad) = 0fe19e34ecb7f850098f00ed81118a1604ff4173
+SHA1 (frotz-2.43.tar.gz) = 2b2684ec670b471489c15be732c7dd1c59821b00
+Size (frotz-2.43.tar.gz) = 160771 bytes
+SHA1 (patch-aa) = a938f7889bca24f182a440c18f468eabe6ce40a5
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
index 2cf26a9a389..d6c73ca374c 100644
--- a/games/frotz/patches/patch-aa
+++ b/games/frotz/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2002/06/29 01:48:53 kristerw Exp $
---- Makefile.orig	Sun Mar 10 01:24:16 2002
-+++ Makefile	Sat Jun 29 03:32:34 2002
+$NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $
+
+--- Makefile.orig	Mon Oct 28 02:21:52 2002
++++ Makefile
 @@ -1,7 +1,7 @@
  # Define your C compiler.  I recommend gcc if you have it.
  # MacOS users should use "cc" even though it's really "gcc".
@@ -11,14 +12,14 @@ $NetBSD: patch-aa,v 1.6 2002/06/29 01:48:53 kristerw Exp $
  
  # Define your optimization flags.  Most compilers understand -O and -O2,
 @@ -14,7 +14,7 @@
+ #-malign-jumps=2
  
- # Define where you want Frotz to be installed.  Usually this is /usr/local
- #
+ # Define where you want Frotz installed.  Usually this is /usr/local
 -PREFIX = /usr/local
 +#PREFIX = /usr/local
- #PREFIX =
  
- #Define where manpages should go.
+ MAN_PREFIX = $(PREFIX)
+ #MAN_PREFIX = /usr/local/share
 @@ -24,7 +24,7 @@
  
  # Define where you want Frotz to look for frotz.conf.
@@ -28,70 +29,34 @@ $NetBSD: patch-aa,v 1.6 2002/06/29 01:48:53 kristerw Exp $
  #CONFIG_DIR = /etc
  #CONFIG_DIR = /usr/pkg/etc
  #CONFIG_DIR =
-@@ -36,16 +36,23 @@
+@@ -37,18 +37,18 @@
  # Uncomment this if you have an OSS soundcard driver and want classical
- # Infocom sound support.  Currently this works only for Linux.
+ # Infocom sound support.
  #
 -#SOUND_DEFS = -DOSS_SOUND
 +SOUND_DEFS = -DOSS_SOUND
  
- # Also uncomment this if you want sound through the OSS driver.
+ # Uncomment this too if you're running BSD of some sort and are using
+ # the OSS sound driver.
  #
 -#SOUND_LIB = -lossaudio
-+SOUND_LIB = -lossaudio
-+
-+# Define your sound device
-+# This should probably be a command-line/config-file option.
-+#
-+SOUND_DEV = /dev/sound
-+#SOUND_DEV = /dev/dsp
-+#SOUND_DEV = /dev/audio
++SOUND_LIB = ${LIBOSSAUDIO}
  
- # This should point to the location of your curses.h or ncurses.h include
- # file if your compiler doesn't know about it.
- #
--INCL = -I/usr/local/include
-+INCL = -I${BUILDLINK_DIR}/include
- #INCL = -I/usr/pkg/include
- #INCL = -I/usr/freeware/include
- #INCL = -I/5usr/include
-@@ -55,7 +62,7 @@
- # linking with.  Usually, this isn't necessary if /etc/ld.so.conf is set
- # up correctly.
+ # Define your sound device 
+ # This should probably be a command-line/config-file option.
  #
--LIB = -L/usr/local/lib
-+LIB = -L${BUILDLINK_DIR}/lib -Wl,-R${PREFIX}/lib
- #LIB = -L/usr/pkg/lib
- #LIB = -L/usr/freeware/lib
- #LIB = -L/5usr/lib
-@@ -86,7 +93,7 @@
- # Nothing under this line should need to be changed.
- #####################################################
- 
--VERSION = 2.42
-+VERSION = 2.42nb1
- 
- BINNAME = frotz
- 
-@@ -103,17 +110,18 @@
- 	ux_audio_none.o ux_audio_oss.o
- 
- OPT_DEFS = -DCONFIG_DIR="\"$(CONFIG_DIR)\"" $(CURSES_DEF) \
--	-DVERSION="\"$(VERSION)\""
-+	-DVERSION="\"$(VERSION)\"" -DSOUND_DEV="\"$(SOUND_DEV)\""
- 
- 
- COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \
- 	$(MEMMOVE_DEF)
- 
--CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
-+CFLAGS += $(OPTS) $(COMP_DEFS)
- 
-+all: frotz
+ #SOUND_DEV = /dev/dsp
+-#SOUND_DEV = /dev/sound
++SOUND_DEV = ${DEVOSSSOUND}
+ #SOUND_DEV = /dev/audio
  
- $(BINNAME): soundcard.h $(OBJECTS)
--	$(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
-+	$(CC) -o $(BINNAME)$(EXTENSION) $(LDFLAGS) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
+ # If your vendor-supplied curses library won't work, uncomment the
+@@ -163,7 +163,7 @@
+ $(NAME): $(NAME)-curses
  
- all: $(BINNAME)
+ $(NAME)-curses:		soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)
+-	$(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
++	$(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
+ 		$(SOUND_LIB)
  
+ all:	$(NAME) d$(NAME)