Date: Wed, 18 Dec 2019 23:13:31 +0000 From: Marcin Cieslak <saper@saper.info> To: David Griffith <dave@661.org> Cc: ports@FreeBSD.org Subject: Re: Frotz upgrade to 2.50 Message-ID: <nycvar.OFS.7.76.44444.807.1912182252390.2778@z.fncre.vasb> In-Reply-To: <alpine.DEB.2.21.1912160822540.30958@hermes.661.org> References: <alpine.DEB.2.21.1912160822540.30958@hermes.661.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--1563967779-1516821567-1576710812=:2778 Content-Type: text/plain; charset=US-ASCII; format=flowed 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= ports@FreeBSD.org @@ -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/ --1563967779-1516821567-1576710812=:2778 Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: BASE64 Content-Description: S/MIME Cryptographic Signature Content-Disposition: attachment; filename=smime.p7s MIIOSwYJKoZIhvcNAQcCoIIOPDCCDjgCAQExDzANBglghkgBZQMEAgEFADAL BgkqhkiG9w0BBwGgggqQMIIElzCCA3+gAwIBAgIOSBtqCKJEiNNcmz3JSA0w DQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENB IC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNp Z24wHhcNMTYwNjE1MDAwMDAwWhcNMjQwNjE1MDAwMDAwWjBdMQswCQYDVQQG EwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEzMDEGA1UEAxMqR2xv YmFsU2lnbiBQZXJzb25hbFNpZ24gMSBDQSAtIFNIQTI1NiAtIEczMIIBIjAN BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyrCba00KOKyGuwh9h+/MAcZm ZUF9OxGKA56AADHaDE08rB0WEbgm6J4XvJP3OGQ7cgHdVJu6XMZkRd6EcfjD yRrIwE6oAVWJe57co3gKk/XxvuubSZuUahrcOiv3D2qaHwva4zumubxQQI4f unEzRIJHPiNjaq0cCcZsMcp5pxsEz8aG0sr8Oh80sxKNnzPmuUETLESktfMC pQKHUGmWXLsG6sgCZOezUjDjKpPKW7l4PUt0TEBEyqLhifv9/YPn5C4o10PP daDazZPeKNif2PVQ5u0HRnkFrHh4wmmrMtY22Mse3eR01gD6rEEGWf+gdzuy EQE+ZVlNhCP4gXjdBQIDAQABo4IBZDCCAWAwDgYDVR0PAQH/BAQDAgEGMCcG A1UdJQQgMB4GCCsGAQUFBwMCBggrBgEFBQcDBAYIKwYBBQUHAwkwEgYDVR0T AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUlifCwqX3HPgCenpkr2NvMtKYwrEw HwYDVR0jBBgwFoAUj/BLf6guRSSuTVD6Y5qL3uLdG7wwPgYIKwYBBQUHAQEE MjAwMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20v cm9vdHIzMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ2xvYmFsc2ln bi5jb20vcm9vdC1yMy5jcmwwWQYDVR0gBFIwUDALBgkrBgEEAaAyASgwQQYJ KwYBBAGgMgFfMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNp Z24uY29tL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQCxh3ekjKKy RrUdfI6D1U7qUggdFLksiU+KiIqJzJG6GXcQ2KiBy2tF3+KYb0IixXMpIVli VXlcD5Vh4tiMxJ4WONMFt3f7/53gSXLf24WMwErubc+mGMzgUGE5HKC98PcK UV/5pPggQdzPxCBNeiXnLU1tCGYhPatFTDhUBGaVhBeuUCbgR9gpXJ9guqrD OVwouKvovdIeI5KEAcoAAiSL6naeLk/GbKUaBFa2RxXC17e+YyBWtWlWDEM3 1V8pUIx76lkO8IJYREhLcg/LnyoYy5wcrzI6pbX2vw1x/jR3GHSC1AEdoqbE xui2XLLlSa6y9yQNgdkPz7GTLmpwIT+dMIIF8TCCBNmgAwIBAgIMGk4Oe/1h 2+wMOby/MA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQK ExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNv bmFsU2lnbiAxIENBIC0gU0hBMjU2IC0gRzMwHhcNMTcwNTI1MDg0NDE2WhcN MjAwNTI1MDg0NDE2WjA8MRkwFwYDVQQDDBBzYXBlckBzYXBlci5pbmZvMR8w HQYJKoZIhvcNAQkBFhBzYXBlckBzYXBlci5pbmZvMIICIjANBgkqhkiG9w0B AQEFAAOCAg8AMIICCgKCAgEA2sO3aQNus/oe4ZBZ4fu1Y1mzxnUYAkb4k/dw gMFc2Kd0eRoOY0AHj4rTEi/vVzzizxjLbEwXzQ9cBEAu/PqS8WsOmhZXtlfi szPDmP7ZpOwmNTWKSd9O7jHu9uTCGfEOsocQNYH2ULD1gVFkgKb8jHf+3u9d uCzh6qMomTtwLrCGEP70Lq385xUzRaD6qbOeIB99tpzgvMR6Z0GPTt4z8tLM kfdtohq5llwZ5vYnj/hJohVS9iLMQMHW4nuLj/mLZNaYE1CWJBT1rBwn5YPJ uR6811O9eAP7aX4iG8k1jkiBh+QNgGRBIK4GIdqy7IVRhA7v2OlpLYHMk4zP 9Fs3M+56QromVKBnxfzLhuYMUK6ugj9jwskNVitqlEFUeyfgvmR1jnPRp1Nd XGJllTNwGicR8wkaRj14RxfrvTZfwXs8OBODKFupqun/tNzdpOgyHMGQACss 9yv2SnLGCJvJK3rGIdRZEiUhLZH/Ct4L92dBhev+SjUqWKbHb4yIlGMgLdoh nwqatuWw7iyOeInjcinX7ghiIKDWhulUN493Fzl6kaUBtIIcrb7jzZ2pHAQT WUmuVnCTHk6NtoWB09lvuK77fw4GfxLWDFWkBQiJYPVBrmxlrkCKzrWdTMfS W9BiEC10jT1sSimUBIjDz22RkfsApeBJoAIWjiOZogILu9MCAwEAAaOCAdAw ggHMMA4GA1UdDwEB/wQEAwIFoDCBngYIKwYBBQUHAQEEgZEwgY4wTQYIKwYB BQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0L2dz cGVyc29uYWxzaWduMXNoYTJnM29jc3AuY3J0MD0GCCsGAQUFBzABhjFodHRw Oi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3NwZXJzb25hbHNpZ24xc2hhMmcz MEwGA1UdIARFMEMwQQYJKwYBBAGgMgEoMDQwMgYIKwYBBQUHAgEWJmh0dHBz Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAw RAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9n c3BlcnNvbmFsc2lnbjFzaGEyZzMuY3JsMBsGA1UdEQQUMBKBEHNhcGVyQHNh cGVyLmluZm8wHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1Ud DgQWBBReBINaGUKUo7HCrIjsKLKERu6ooTAfBgNVHSMEGDAWgBSWJ8LCpfcc +AJ6emSvY28y0pjCsTANBgkqhkiG9w0BAQsFAAOCAQEAC0VK968ySq/6B+Kd ecjVThQOKtVXuG17Krfk0xz7OPYR/V+qZtBFm2Uc6tkUEmAmq3Tyf+SE3TTX Q58eJFq0uCTUhIY714ioJs1uVWBz8rPyJ3swkOfDaUXUxkQsBsf73VfKjUk4 kB5MTrApLYUe35NmEY3FqyyX13elhW1tp864vOKM2Git61cYoRn/bwd/z2JM Zkxwkd5JgvmM+p4Da+WO4CUsGzdrZEH8X/8NQIzWtUDIh7VEQZFX5fot/KvH Am8AajtpmNqTfMyg6LfcfJUXSFqXn/KEWu4Td62vX6Pd70dYKUZxnLwYvGqG A4Ktrp9zyrUzxLbmdaPln7CstjGCA38wggN7AgEBMG0wXTELMAkGA1UEBhMC QkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExMzAxBgNVBAMTKkdsb2Jh bFNpZ24gUGVyc29uYWxTaWduIDEgQ0EgLSBTSEEyNTYgLSBHMwIMGk4Oe/1h 2+wMOby/MA0GCWCGSAFlAwQCAQUAoIHkMBgGCSqGSIb3DQEJAzELBgkqhkiG 9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE5MTIxODIzMTMzMlowLwYJKoZIhvcN AQkEMSIEIMM7z9zRkMmhUv9KLHfK9l/DEl98nRXaXFnpvEVO+ZLGMHkGCSqG SIb3DQEJDzFsMGowCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBFjALBglghkgB ZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMC AgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIC AAvD4FfZ5qfnW1CCwTBNjddG5Z3lLaydpc54tQFzqhQo033/ObSBAkZW68No JbJROWP88SzfL87ufJMB8dg1Sn6w0EL0j9g9rJCez//oRQtSucXFP4bEZi5F 9EMcvB+yj1Dvaf2vRJkpmlQ8+6A96P0ATTbom4+E9wo8jO0aNfrzvfqpKr3p SdNnfj4FjUM+pVES7nYtkI2bILzHUKt8jrE6JegmUw1LvwhuOWw6+L2pQLnS UysVgdvA5nVrkMjz3eAt2eJXXaw5VVE8I5LRkGn8/JjlqqLJtC/aSEY6cRUd Yq4k3IKBAcoIu7b5ex+BTY9vJ21gGYfMmXJ5idO3hJ4w3aS4QjMmngvHx3p5 i3EJBLM9zRLoE3fFKT8MgTc1adVs+qfpMb/s20DMD36LyC5sALoPlGcuwRFf ldaKEzlCnkvHkYdeH0vWCUxhTWFPvfm8MKUeO7bQb9d7vN5QMCLQLJef81gp jSkeIel8jWMOIYuDYnLsv8slAlOOu3bIfzgCBAWhkipr3xbqL4QuwRz452QJ aFMHzx9MtjJVuYVnj/cSIjkDh1HrTiL7VAAjkxMC6aH1WfMOPmeSYxyNgmJt ZSuMLR5omOGKomXMC+6x8xx7XNs3yUHicl0DibXBZ9zaZI+Qs/YVgca22wNO hUGQHd68cqTMSTdr0G34DNva --1563967779-1516821567-1576710812=:2778--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?nycvar.OFS.7.76.44444.807.1912182252390.2778>