Attachment 149385 Details for Bug 194997 – Upgrades games/frotz to 2.44p and adds DUMB/OSS options

[patch] Upgrades games/frotz to 2.44p and adds DUMB/OSS options

frotz-upgrade.patch (text/plain), 3.13 KB, created by bsdport on 2014-11-13 23:12:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bsdport

Created: 2014-11-13 23:12:47 UTC

Size: 3.13 KB

patch

obsolete

>diff --git a/games/frotz/Makefile b/games/frotz/Makefile
>--- a/games/frotz/Makefile
>+++ b/games/frotz/Makefile
>@@ -2,33 +2,55 @@
> # $FreeBSD$
> 
> PORTNAME=	frotz
>-PORTVERSION=	2.43d
>+PORTVERSION=	2.44.p	# actually 2.44pre
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/d//}/ \
>-		http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Infocom games interpreter
> 
> LICENSE=	GPLv2
> 
>-MAKE_ARGS=	CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \
>-		CONFIG_DIR="${PREFIX}/etc" SOUND_DEFS="-DOSS_SOUND" \
>-		SOUND_DEV="/dev/dsp" INCL="" LIB=""
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	DavidGriffith
>+GH_TAGNAME=	${GH_COMMIT}
>+GH_COMMIT=	3e4af2a
>+
>+USES=	gmake
>+
>+MAKE_ENV=	CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \
>+		CONFIG_DIR="${PREFIX}/etc" \
>+		INCL="" LIB=""
> 
> PLIST_FILES=	bin/frotz \
>-		man/man6/dfrotz.6.gz \
> 		man/man6/frotz.6.gz
> 
>-PORTDOCS=	AUTHORS BUGS ChangeLog DUMB HOW_TO_PLAY README
>+PORTDOCS=	AUTHORS BUGS ChangeLog HOW_TO_PLAY README
> PORTEXAMPLES=	frotz.conf-big frotz.conf-small
> 
>-OPTIONS_DEFINE= DOCS EXAMPLES
>+OPTIONS_DEFINE=		DOCS EXAMPLES DUMB OSS
>+OPTIONS_DEFAULT=	OSS
>+DUMB_DESC=	Install dfrotz (dumb frotz)
>+
>+OSS_MAKE_ENV=	SOUND_DEFS='-DOSS_SOUND -DSOUND_DEV=\"/dev/dsp\"'
>+OSS_MAKE_ARGS=	-e soundcard.h
>+
>+DUMB_PLIST_FILES=	bin/dfrotz \
>+			man/man6/dfrotz.6.gz
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDUMB}
>+PORTDOCS+=	DUMB
>+.endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
> 
>-	${INSTALL_MAN} ${WRKSRC}/doc/*.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
>+.if ${PORT_OPTIONS:MDUMB}
>+	${INSTALL_PROGRAM} ${WRKSRC}/d${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_MAN} ${WRKSRC}/doc/d${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
>+.endif
> 
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>diff --git a/games/frotz/distinfo b/games/frotz/distinfo
>--- a/games/frotz/distinfo
>+++ b/games/frotz/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (frotz-2.43d.tar.gz) = c56a2f77f630db04ad968fc7c0b2114e3f855fdae8ce226e600f20dcba2c5985
>-SIZE (frotz-2.43d.tar.gz) = 203962
>+SHA256 (frotz-2.44.p.tar.gz) = ee88039cf36e24026aa8eee29c08f9e392f9db07209cf98930d98756920e18d8
>+SIZE (frotz-2.44.p.tar.gz) = 279660
>diff --git a/games/frotz/files/patch-src_curses_ux__audio__oss.c b/games/frotz/files/patch-src_curses_ux__audio__oss.c
>new file mode 100644
>--- /dev/null
>+++ b/games/frotz/files/patch-src_curses_ux__audio__oss.c
>@@ -0,0 +1,20 @@
>+--- 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;

Actions: View | Diff

Attachments on bug 194997: 149383 | 149385