frotz: Update to 2.50

NEW FEATURES

- Added UTF-8 input and output.  Plain ASCII is still available.

- Added -L option for restoring save file directly from the command line.

- Added -R option for restricted read/write path.

- Sound effects in AIFF, MOD, and OGG formats supported per the Blorb specs.

- Sound driver selection is automated through the use of libao.

- Allow for an alternative Blorb file to be specified on the command line.


BUG FIXES

- Overhauled MacOS compilation.

- Corrected problems with error handling.

- Fixed a lot of unsafe strcpy() and strcat() calls.

- Fixed numerous problems with portability to other flavors of Unix.

- Fixed adaptive palette rendering for SDL.

- Fixed scaling with manually specified window dimensions.

- Fixed problem with unnecessary newlines with input timeouts.

- Allow fontdir in .sfrotzrc to work relative to user's home directory.

- Fixed problem with memory allocation leading to crashes in DOS.

- Fixed problem with DOS Frotz creating non-portable Quetzal files.

5 files changed, 47 insertions, 113 deletions

diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 2f318bc01c4..e8c0680efad 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2019/07/18 15:06:50 nia Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/24 00:45:39 nia Exp $
 
-DISTNAME=	frotz-2.44
+DISTNAME=	frotz-2.50
 CATEGORIES=	games
 MASTER_SITES=	https://gitlab.com/DavidGriffith/frotz/-/archive/${PKGVERSION_NOREV}/
 
@@ -11,13 +11,9 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
 
-.include "../../mk/bsd.prefs.mk"
+BUILD_TARGET=	curses
 
-.if ${OPSYS} != "Darwin"
-MAKE_FLAGS+=	SOUND_DEFS=-DOSS_SOUND
-MAKE_FLAGS+=	SOUND_LIB=${LIBOSSAUDIO}
-CPPFLAGS+=	-DSOUND_DEV=\"${DEVOSSSOUND}\"
-.endif
+FAKE_NCURSES=	yes
 
 MAKE_FLAGS+=	CONFIG_DIR=${PKG_SYSCONFDIR}
 
@@ -39,6 +35,9 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY \
 		${DESTDIR}${DOCDIR}
 
+.include "../../audio/libao/buildlink3.mk"
+.include "../../audio/libmodplug/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 52599efafe0..729c7b748c7 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2019/07/18 11:54:26 nia Exp $
+$NetBSD: distinfo,v 1.14 2019/11/24 00:45:39 nia Exp $
 
-SHA1 (frotz-2.44.tar.gz) = d7203a80605d4dc9731b65c92c677738ba105100
-RMD160 (frotz-2.44.tar.gz) = 69314238d040ca1aefd87b9e4a3468463842b312
-SHA512 (frotz-2.44.tar.gz) = a6d41005fc62a93fd4b3a0b573365999bc635108cca5fc8cb03f347e3e1ddac0a6f7aec2e90f079d4875886ed779af9cf8c75543dd530165b0b78b51d05c3862
-Size (frotz-2.44.tar.gz) = 276718 bytes
-SHA1 (patch-aa) = e087f9f519b492f1e0fdb60b358d8ebe07288415
-SHA1 (patch-src_curses_ux__audio__oss.c) = 74ecf48d2dab36bc9ebb4c5bbf70e011a4b6cd49
+SHA1 (frotz-2.50.tar.gz) = 29238d73a10335961708e3728ae6b377b6e13d91
+RMD160 (frotz-2.50.tar.gz) = 01c352d22447609ed09ddc31cca5bd218858c373
+SHA512 (frotz-2.50.tar.gz) = bb7240c56b5cae061ce641bac62df0abbb63a271f5da3011b68c1d483a2e25409dea163e6f9bffc80b3dccaac7db0964db83366b9b7652f942390fd08be6b8ae
+Size (frotz-2.50.tar.gz) = 346972 bytes
+SHA1 (patch-Makefile) = e0b4cbd547abb358784ed044adc1563745c925b2
diff --git a/games/frotz/patches/patch-Makefile b/games/frotz/patches/patch-Makefile
new file mode 100644
index 00000000000..53cb548e828
--- /dev/null
+++ b/games/frotz/patches/patch-Makefile
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile,v 1.1 2019/11/24 00:45:39 nia Exp $
+
+Do not force -O3/-g.
+
+Fix indentation.
+
+--- Makefile.orig	2019-11-13 03:18:50.000000000 +0000
++++ Makefile
+@@ -6,14 +6,13 @@ CC ?= gcc
+ #CC ?= clang
+ 
+ # Enable compiler warnings. This is an absolute minimum.
+-CFLAGS += -Wall -std=c99 -O3 #-Wextra
++CFLAGS += -Wall -std=c99
+ 
+ # Define your optimization flags.
+ #
+ # These are good for regular use.
+ #CFLAGS += -O2 -fomit-frame-pointer -falign-functions=2 -falign-loops=2 -falign-jumps=2
+ # These are handy for debugging.
+-CFLAGS += -g
+ 
+ # Define where you want Frotz installed
+ PREFIX ?= /usr/local
+@@ -297,7 +296,7 @@ ifneq ($(and $(wildcard $(GIT_DIR)),$(sh
+ 		$(NAME)src/doc/*.6 $(NAME)src/doc/frotz.conf* \
+ 		$(NAME)src/doc/Xresources  > /dev/null
+ else
+-        @echo "Not in a git repository or git command not found.  Cannot make a tarball."
++	@echo "Not in a git repository or git command not found.  Cannot make a tarball."
+ endif
+ 
+ all: $(FROTZ_BIN) $(DFROTZ_BIN) $(SFROTZ_BIN)
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
deleted file mode 100644
index 577762a5276..00000000000
--- a/games/frotz/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2019/07/18 11:54:26 nia Exp $
-
-Honour pkgsrc settings.
-
---- Makefile.orig	2015-05-20 09:29:14.000000000 +0000
-+++ Makefile
-@@ -1,30 +1,27 @@
- # Define your C compiler.  I recommend gcc if you have it.
- # MacOS users should use "cc" even though it's really "gcc".
- #
--CC = gcc
-+CC ?= cc
- #CC = cc
- 
- # Define your optimization flags.  Most compilers understand -O and -O2,
- # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.)
- #
--OPTS = -O2
- 
- # Pentium with gcc 2.7.0 or better
- #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \
- #-malign-jumps=2
- 
- # Define where you want Frotz installed.  Usually this is /usr/local
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- 
- MAN_PREFIX = $(PREFIX)
- #MAN_PREFIX = /usr/local/share
- 
--CONFIG_DIR = $(PREFIX)/etc
- #CONFIG_DIR = /etc
- 
- # Define where you want Frotz to look for frotz.conf.
- #
--CONFIG_DIR = /usr/local/etc
- #CONFIG_DIR = /etc
- #CONFIG_DIR = /usr/pkg/etc
- #CONFIG_DIR =
-@@ -195,7 +192,7 @@ FLAGS = $(OPTS) $(CURSES_DEFS) $(INCL)
- $(NAME): $(NAME)-curses
- curses:  $(NAME)-curses
- $(NAME)-curses: $(COMMON_TARGET) $(CURSES_TARGET) $(BLORB_TARGET)
--	$(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) $(SOUND_LIB)
-+	$(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) $(SOUND_LIB)
- 
- dumb:		$(NAME)-dumb
- d$(NAME):	$(NAME)-dumb
-@@ -214,19 +211,19 @@ all:	$(NAME) d$(NAME)
- .SUFFIXES: .c .o .h
- 
- $(COMMON_OBJECT): %.o: %.c
--	$(CC) $(OPTS) $(COMMON_DEFS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(COMMON_DEFS) -o $@ -c $<
- 
- $(BLORB_OBJECT): %.o: %.c
--	$(CC) $(OPTS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
- $(DUMB_OBJECT): %.o: %.c
--	$(CC) $(OPTS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
- $(CURSES_OBJECT): %.o: %.c
--	$(CC) $(OPTS) $(CURSES_DEFS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(CURSES_DEFS) -o $@ -c $<
- 
- $(SDL_OBJECT): %.o: %.c
--	$(CC) $(OPTS) $(SDL_DEFS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_DEFS) -o $@ -c $<
- 
- 
- # If you're going to make this target manually, you'd better know which
diff --git a/games/frotz/patches/patch-src_curses_ux__audio__oss.c b/games/frotz/patches/patch-src_curses_ux__audio__oss.c
deleted file mode 100644
index 589a965bbdf..00000000000
--- a/games/frotz/patches/patch-src_curses_ux__audio__oss.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_curses_ux__audio__oss.c,v 1.1 2019/07/18 11:54:26 nia Exp $
-
-Avoid colliding with another symbol.
-
---- src/curses/ux_audio_oss.c.orig	2015-05-20 09:29:14.000000000 +0000
-+++ src/curses/ux_audio_oss.c
-@@ -80,7 +80,7 @@ static void sigterm_handler(int signal) 
-   _exit(0);
- }
- 
--static void sigint_handler(int signal) {
-+static void sigint_handler_oss(int signal) {
-   num_repeats = 1;
- }
- 
-@@ -141,7 +141,7 @@ static void play_sound(int volume, int r
-   sigaddset(&sa.sa_mask, SIGTERM);
-   sa.sa_flags = 0;
-   sigaction(SIGTERM, &sa, NULL);
--  sa.sa_handler = sigint_handler;
-+  sa.sa_handler = sigint_handler_oss;
-   sigaction(SIGINT, &sa, NULL);
- 
-   for (num_repeats = repeats; num_repeats > 0;