frotz: Update to 2.51

Summary of changes between Frotz 2.50 and Frotz 2.51:
=====================================================

Frotz 2.51 was released on Wednesday February 12, 2020.

This is a minor release focusing on minor enhancements and bug fixes.

NEW FEATURES

- Added an -f option for Dumb Frotz to mark up the output with color and
  formatting codes.  Currently "irc", "ansi", and "normal" modes are
  supported.


BUG FIXES

- Cleanly account for some installations of ncurses which have the
  library split into ncurses (high level) and tinfo (low level).

- Added an idiosyncrasy fix for Cutthroats, which assumes a
  quick-and-dirty conversion of 24-hour notation to am/pm notation.

- Fixed where the Makefile used spaces instead of a tab in a rarely-used
  recipe.

- Fixed a memory allocation problem with restoring a game at the command
  line using the -L option.

- Fixed an oversight in which curses wasn't being shut down properly
  when fatal zcode errors were encountered.

3 files changed, 21 insertions, 26 deletions

diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index e8c0680efad..72a0dd7178a 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2019/11/24 00:45:39 nia Exp $
+# $NetBSD: Makefile,v 1.36 2020/03/22 10:20:06 nia Exp $
 
-DISTNAME=	frotz-2.50
+DISTNAME=	frotz-2.51
 CATEGORIES=	games
 MASTER_SITES=	https://gitlab.com/DavidGriffith/frotz/-/archive/${PKGVERSION_NOREV}/
 
@@ -12,11 +12,18 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	gmake
 
 BUILD_TARGET=	curses
-
 FAKE_NCURSES=	yes
+USE_CURSES=	wide
 
+MAKE_FLAGS+=	CURSES=ncursesw
 MAKE_FLAGS+=	CONFIG_DIR=${PKG_SYSCONFDIR}
 
+.include "../../mk/curses.buildlink3.mk"
+
+.if ${CURSES_TYPE} == "curses"
+LDFLAGS+=	-lcurses
+.endif
+
 SAMPLEDIR=	${PREFIX}/share/examples/frotz
 DOCDIR=		${PREFIX}/share/doc/frotz
 
@@ -39,5 +46,4 @@ do-install:
 .include "../../audio/libmodplug/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 729c7b748c7..d95b8cd4c28 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2019/11/24 00:45:39 nia Exp $
+$NetBSD: distinfo,v 1.15 2020/03/22 10:20:06 nia Exp $
 
-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
+SHA1 (frotz-2.51.tar.gz) = 54aa50d36b6ae402d063c0fb64e990e50557ed1e
+RMD160 (frotz-2.51.tar.gz) = 2eaf0b7b4a8b3cc7482f755580a35fb146d9ede0
+SHA512 (frotz-2.51.tar.gz) = 16736db1abd458a2dbb25a82ce4f5577bbc861af3591e1a34975fa5ad65e8ff9afb28b48761893869d10c1a58ce03f88bef128f37bc36b972976ebd70b2de12b
+Size (frotz-2.51.tar.gz) = 350626 bytes
+SHA1 (patch-Makefile) = 84913a2a85ebe4b7780a28bce5f25d0441256baa
diff --git a/games/frotz/patches/patch-Makefile b/games/frotz/patches/patch-Makefile
index 53cb548e828..4b73cce007a 100644
--- a/games/frotz/patches/patch-Makefile
+++ b/games/frotz/patches/patch-Makefile
@@ -1,17 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2019/11/24 00:45:39 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2020/03/22 10:20:06 nia Exp $
 
-Do not force -O3/-g.
+Don't force -O3, -g
 
-Fix indentation.
-
---- Makefile.orig	2019-11-13 03:18:50.000000000 +0000
+--- Makefile.orig	2020-02-12 16:22:40.000000000 +0000
 +++ Makefile
-@@ -6,14 +6,13 @@ CC ?= gcc
+@@ -6,14 +6,13 @@
  #CC ?= clang
  
  # Enable compiler warnings. This is an absolute minimum.
 -CFLAGS += -Wall -std=c99 -O3 #-Wextra
-+CFLAGS += -Wall -std=c99
++CFLAGS += -Wall -std=c99 #-Wextra
  
  # Define your optimization flags.
  #
@@ -22,12 +20,3 @@ Fix indentation.
  
  # 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)