On Mon, 16 Dec 2019, David Griffith wrote:
I released version 2.50 of Frotz last month. Would someone please update ports to install this version?
I have never used that software but I gave it a try and: * moved it to Gitlab * applied fix for a https://gitlab.com/DavidGriffith/frotz/issues/180 * I think we do not need to generate soundcard.h manually anymore? Now I am getting: ===> Building for frotz-2.50 gmake[2]: Entering directory '/usr/home/saper/sw/FreeBSD/ports/games/frotz/work/frotz-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64' ** Generating src/common/defs.h ** Generating src/common/git_hash.h ** ERROR UTF-8 support only works with ncursesw! exit 2 gmake[2]: *** [Makefile:391: src/curses/ux_defines.h] Error 2 but then second "make" works just fine... Marcin my patch to the port below if you want to try: diff -ruN /usr/ports/games/frotz/distinfo ./distinfo --- /usr/ports/games/frotz/distinfo 2015-05-26 20:50:09.000000000 +0200 +++ ./distinfo 2019-12-18 23:51:11.422706000 +0100 @@ -1,2 +1,3 @@ -SHA256 (DavidGriffith-frotz-2.44_GH0.tar.gz) = dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f -SIZE (DavidGriffith-frotz-2.44_GH0.tar.gz) = 276815 +TIMESTAMP = 1576709471 +SHA256 (DavidGriffith-frotz-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64_GL0.tar.gz) = 0fdbf055edd31e2f07b52f720a74a098d81b766a00a4103955edb2171d13b0d6 +SIZE (DavidGriffith-frotz-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64_GL0.tar.gz) = 346458 diff -ruN /usr/ports/games/frotz/files/patch-Makefile ./files/patch-Makefile --- /usr/ports/games/frotz/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-Makefile 2019-12-18 23:55:18.081693000 +0100 @@ -0,0 +1,11 @@ +--- Makefile.orig 2019-12-18 22:55:03 UTC ++++ Makefile +@@ -297,7 +297,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 -ruN /usr/ports/games/frotz/files/patch-src_curses_ux__audio__oss.c ./files/patch-src_curses_ux__audio__oss.c --- /usr/ports/games/frotz/files/patch-src_curses_ux__audio__oss.c 2014-12-05 18:18:12.000000000 +0100 +++ ./files/patch-src_curses_ux__audio__oss.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- src/curses/ux_audio_oss.c.orig 2014-03-06 06:08:15 UTC -+++ 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 oss_sigint_handler(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 = oss_sigint_handler; - sigaction(SIGINT, &sa, NULL);- - for (num_repeats = repeats; num_repeats > 0;
diff -ruN /usr/ports/games/frotz/Makefile ./Makefile --- /usr/ports/games/frotz/Makefile 2017-06-02 17:43:42.000000000 +0200 +++ ./Makefile 2019-12-19 00:03:18.599172000 +0100 @@ -2,7 +2,7 @@ # $FreeBSD: head/games/frotz/Makefile 442400 2017-06-02 15:43:42Z sunpoet $ PORTNAME= frotz -PORTVERSION= 2.44 +PORTVERSION= 2.50 CATEGORIES= games MAINTAINER= [email protected] @@ -11,8 +11,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USE_GITHUB= yes -GH_ACCOUNT= DavidGriffith +USE_GITLAB= yes +GL_ACCOUNT= DavidGriffith +GL_COMMIT= 9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64 USES= gmake ncurses @@ -25,8 +26,7 @@ PORTDOCS= AUTHORS BUGS ChangeLog HOW_TO_PLAY README PORTEXAMPLES= frotz.conf-big frotz.conf-small -OPTIONS_DEFINE= DOCS EXAMPLES DUMB OSS -OPTIONS_DEFAULT= OSS +OPTIONS_DEFINE= DOCS EXAMPLES DUMB DUMB_DESC= Install dfrotz (dumb frotz) OSS_MAKE_ENV= SOUND_DEFS='-DOSS_SOUND -DSOUND_DEV=\"/dev/dsp\"' @@ -34,9 +34,6 @@ man/man6/dfrotz.6.gz DUMB_PORTDOCS= DUMB -pre-build-OSS-on: - cd ${WRKSRC} && ${DO_MAKE_BUILD} soundcard.h - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
smime.p7s
Description: S/MIME Cryptographic Signature
