Date: Thu, 19 Dec 2019 04:00:46 +0000 (UTC) From: David Griffith <dave@661.org> To: Marcin Cieslak <saper@saper.info> Cc: ports@FreeBSD.org Subject: Re: Frotz upgrade to 2.50 Message-ID: <alpine.DEB.2.21.1912190239230.2058@hermes.661.org> In-Reply-To: <nycvar.OFS.7.76.44444.807.1912182252390.2778@z.fncre.vasb> References: <alpine.DEB.2.21.1912160822540.30958@hermes.661.org> <nycvar.OFS.7.76.44444.807.1912182252390.2778@z.fncre.vasb>
next in thread | previous in thread | raw e-mail | index | archive | help
My reply is at the bottom. Please put your reply there too. On Wed, 18 Dec 2019, Marcin Cieslak wrote: > 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... The OSS interface is deprecated for now. There's no need to go hunting around for soundcard.h anymore in favor of libao. I've resisted removing ux_audio_oss.c entirely because I'd like to someday reenable that for older machines and massage it into something for older Sun workstations. How is this patch supposed to be applied? [dave@diemos /usr/ports/games/frotz]$ patch < frotz-freebsd.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file patch-Makefile using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file ./files/patch-src_curses_ux__audio__oss.c using Plan A... Hunk #1 succeeded at 0. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |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 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 2. Hunk #2 succeeded at 11 with fuzz 2. Hunk #3 failed at 26. Hunk #4 failed at 34. 3 out of 4 hunks failed--saving rejects to Makefile.rej done -- David Griffith dave@661.org A: Because it fouls the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.DEB.2.21.1912190239230.2058>