frotz: Update to 2.44

NEW FEATURES

* Blorb support implemented. No support for audio in Blorb files yet.
* Added an -m option for Dumb Frotz to suppress the [MORE] prompt.
* Makefile and code for compiling for 16-bit DOS.

BUG FIXES

* Fixed a problem with saving and restoring in certain games.
* Added some fflush() calls to make Dumb Frotz more suitable for bot use.
* Removed old-style save support. It was getting hard to manage. Only the Quetzal save file format is supported now.
* Fixed assorted minor 64-bitness problems.

6 files changed, 90 insertions, 68 deletions

diff --git a/games/frotz/MESSAGE b/games/frotz/MESSAGE
deleted file mode 100644
index 4359be233dc..00000000000
--- a/games/frotz/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:00 wiz Exp $
-
-To enable the '-f' and '-b' options, you must set the TERM environment
-variable to the name of a terminfo entry that supports color. Both
-'color_xterm' and 'xterm-16color' are known to work with the X11R6
-xterm distributed with NetBSD-1.4.1.
-
-===========================================================================
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 31ad21f475f..52ff7e7a597 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,26 +1,31 @@
-# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:10 agc Exp $
+# $NetBSD: Makefile,v 1.33 2019/07/18 11:54:26 nia Exp $
 
-DISTNAME=	frotz-2.43
-PKGREVISION=	5
+DISTNAME=	frotz-2.44
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=frotz/}
-MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/frotz/
+MASTER_SITES=	https://gitlab.com/DavidGriffith/frotz/-/archive/${PKGVERSION_NOREV}/
 
 MAINTAINER=	seebs@plethora.net
-HOMEPAGE=	http://frotz.sourceforge.net/
+HOMEPAGE=	https://davidgriffith.gitlab.io/frotz/j
 COMMENT=	Curses-based interpreter for Infocom-compatible games
+LICENSE=	gnu-gpl-v2
+
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Darwin"
-MAKE_ENV+=	SOUND_DEFS=-DOSS_SOUND
-MAKE_ENV+=	SOUND_LIB=${LIBOSSAUDIO}
-MAKE_ENV+=	SOUND_DEV=${DEVOSSSOUND}
+MAKE_FLAGS+=	SOUND_DEFS=-DOSS_SOUND
+MAKE_FLAGS+=	SOUND_LIB=${LIBOSSAUDIO}
+CPPFLAGS+=	-DSOUND_DEV=\"${DEVOSSSOUND}\"
 .endif
 
+MAKE_FLAGS+=	CONFIG_DIR=${PKG_SYSCONFDIR}
+
 SAMPLEDIR=	${PREFIX}/share/examples/frotz
 DOCDIR=		${PREFIX}/share/doc/frotz
 
+CONF_FILES+=	${SAMPLEDIR}/frotz.conf ${PKG_SYSCONFDIR}/frotz.conf
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index e928d0ec28c..52599efafe0 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 20:56:50 agc Exp $
+$NetBSD: distinfo,v 1.13 2019/07/18 11:54:26 nia Exp $
 
-SHA1 (frotz-2.43.tar.gz) = 2b2684ec670b471489c15be732c7dd1c59821b00
-RMD160 (frotz-2.43.tar.gz) = ccfc303e116e517caff0fec8f3bd555dfc02ae4e
-SHA512 (frotz-2.43.tar.gz) = 654f2ca2d1a625df8f88b5629e09a873668cea42688acdf154636b066b94fc9d70b7f45acb33a71d234c19b59c394c63aee38d6224245b3b329210e6b4a58409
-Size (frotz-2.43.tar.gz) = 160771 bytes
-SHA1 (patch-aa) = 1d6f92a0c5fae76d13e4de0ce4a9886eda4d1ca9
-SHA1 (patch-pb) = e7d63332e82b5835de051ec0696a76dbe3822042
+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
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
index ce9edba4817..577762a5276 100644
--- a/games/frotz/patches/patch-aa
+++ b/games/frotz/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2009/08/19 04:04:40 yyamano Exp $
+$NetBSD: patch-aa,v 1.9 2019/07/18 11:54:26 nia Exp $
 
---- Makefile.orig	2002-10-27 17:21:52.000000000 -0800
+Honour pkgsrc settings.
+
+--- Makefile.orig	2015-05-20 09:29:14.000000000 +0000
 +++ Makefile
-@@ -1,7 +1,7 @@
+@@ -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".
  #
@@ -11,7 +13,12 @@ $NetBSD: patch-aa,v 1.8 2009/08/19 04:04:40 yyamano Exp $
  #CC = cc
  
  # Define your optimization flags.  Most compilers understand -O and -O2,
-@@ -14,7 +14,7 @@ OPTS = -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
@@ -20,21 +27,47 @@ $NetBSD: patch-aa,v 1.8 2009/08/19 04:04:40 yyamano Exp $
  
  MAN_PREFIX = $(PREFIX)
  #MAN_PREFIX = /usr/local/share
-@@ -24,7 +24,7 @@ CONFIG_DIR = $(PREFIX)/etc
+ 
+-CONFIG_DIR = $(PREFIX)/etc
+ #CONFIG_DIR = /etc
  
  # Define where you want Frotz to look for frotz.conf.
  #
 -CONFIG_DIR = /usr/local/etc
-+CONFIG_DIR = ${PREFIX}/etc
  #CONFIG_DIR = /etc
  #CONFIG_DIR = /usr/pkg/etc
  #CONFIG_DIR =
-@@ -163,7 +163,7 @@ FLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
+@@ -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 $<
  
- $(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)
+ # If you're going to make this target manually, you'd better know which
diff --git a/games/frotz/patches/patch-pb b/games/frotz/patches/patch-pb
deleted file mode 100644
index b74516be649..00000000000
--- a/games/frotz/patches/patch-pb
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-pb,v 1.1 2009/07/18 02:49:15 smb Exp $
-
---- src/dumb/dumb_input.c.orig	2009-07-17 22:42:30.000000000 -0400
-+++ src/dumb/dumb_input.c	2009-07-17 22:42:49.000000000 -0400
-@@ -79,7 +79,7 @@
- /* Read one line, including the newline, into s.  Safely avoids buffer
-  * overruns (but that's kind of pointless because there are several
-  * other places where I'm not so careful).  */
--static void getline(char *s)
-+static void get_line(char *s)
- {
-   int c;
-   char *p = s;
-@@ -203,7 +203,7 @@
-       fputs(prompt, stdout);
-     else
-       dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
--    getline(s);
-+    get_line(s);
-     if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
-       /* Is not a command line.  */
-       translate_special_chars(s);
-@@ -265,7 +265,7 @@
- 	  if (!*current_page)
- 	    break;
- 	  printf("HELP: Type <return> for more, or q <return> to stop: ");
--	  getline(s);
-+	  get_line(s);
- 	  if (!strcmp(s, "q\n"))
- 	    break;
- 	}
diff --git a/games/frotz/patches/patch-src_curses_ux__audio__oss.c b/games/frotz/patches/patch-src_curses_ux__audio__oss.c
new file mode 100644
index 00000000000..589a965bbdf
--- /dev/null
+++ b/games/frotz/patches/patch-src_curses_ux__audio__oss.c
@@ -0,0 +1,24 @@
+$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;