CVS commit: pkgsrc/games/frotz

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 24 00:45:40 UTC 2019

Modified Files:
        pkgsrc/games/frotz: Makefile distinfo
Added Files:
        pkgsrc/games/frotz/patches: patch-Makefile
Removed Files:
        pkgsrc/games/frotz/patches: patch-aa patch-src_curses_ux__audio__oss.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/frotz/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/frotz/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/frotz/patches/patch-Makefile
cvs rdiff -u -r1.9 -r0 pkgsrc/games/frotz/patches/patch-aa
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/frotz/patches/patch-src_curses_ux__audio__oss.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/frotz/Makefile
diff -u pkgsrc/games/frotz/Makefile:1.34 pkgsrc/games/frotz/Makefile:1.35
--- pkgsrc/games/frotz/Makefile:1.34    Thu Jul 18 15:06:50 2019
+++ pkgsrc/games/frotz/Makefile Sun Nov 24 00:45:39 2019
@@ -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"

Index: pkgsrc/games/frotz/distinfo
diff -u pkgsrc/games/frotz/distinfo:1.13 pkgsrc/games/frotz/distinfo:1.14
--- pkgsrc/games/frotz/distinfo:1.13    Thu Jul 18 11:54:26 2019
+++ pkgsrc/games/frotz/distinfo Sun Nov 24 00:45:39 2019
@@ -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

Added files:

Index: pkgsrc/games/frotz/patches/patch-Makefile
diff -u /dev/null pkgsrc/games/frotz/patches/patch-Makefile:1.1
--- /dev/null   Sun Nov 24 00:45:40 2019
+++ pkgsrc/games/frotz/patches/patch-Makefile   Sun Nov 24 00:45:39 2019
@@ -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)