Attachment #149385 for bug #194997




# $FreeBSD$

PORTNAME=	frotz
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

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 HOW_TO_PLAY README
PORTEXAMPLES=	frotz.conf-big frotz.conf-small

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/

.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}

Lines 1-2 Link Here

(-)b/games/frotz/distinfo (-2 / +2 lines)
1	SHA256 (frotz-2.43d.tar.gz) = c56a2f77f630db04ad968fc7c0b2114e3f855fdae8ce226e600f20dcba2c5985	1	SHA256 (frotz-2.44.p.tar.gz) = ee88039cf36e24026aa8eee29c08f9e392f9db07209cf98930d98756920e18d8
2	SIZE (frotz-2.43d.tar.gz) = 203962	2	SIZE (frotz-2.44.p.tar.gz) = 279660




--- 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;

Return to bug 194997

Lines 2-34 Link Here

(-)b/games/frotz/Makefile (-10 / +32 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= frotz	4	PORTNAME= frotz
5	PORTVERSION= 2.43d	5	PORTVERSION= 2.44.p # actually 2.44pre
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/d//}/ \
8	http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/
9		7
10	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Infocom games interpreter	9	COMMENT= Infocom games interpreter
12		10
13	LICENSE= GPLv2	11	LICENSE= GPLv2
14		12
15	MAKE_ARGS= CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \	13	USE_GITHUB= yes
16	CONFIG_DIR="${PREFIX}/etc" SOUND_DEFS="-DOSS_SOUND" \	14	GH_ACCOUNT= DavidGriffith
17	SOUND_DEV="/dev/dsp" INCL="" LIB=""	15	GH_TAGNAME= ${GH_COMMIT}
		16	GH_COMMIT= 3e4af2a
		17
		18	USES= gmake
		19
		20	MAKE_ENV= CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \
		21	CONFIG_DIR="${PREFIX}/etc" \
		22	INCL="" LIB=""
18		23
19	PLIST_FILES= bin/frotz \	24	PLIST_FILES= bin/frotz \
20	man/man6/dfrotz.6.gz \
21	man/man6/frotz.6.gz	25	man/man6/frotz.6.gz
22		26
23	PORTDOCS= AUTHORS BUGS ChangeLog DUMB HOW_TO_PLAY README	27	PORTDOCS= AUTHORS BUGS ChangeLog HOW_TO_PLAY README
24	PORTEXAMPLES= frotz.conf-big frotz.conf-small	28	PORTEXAMPLES= frotz.conf-big frotz.conf-small
25		29
26	OPTIONS_DEFINE= DOCS EXAMPLES	30	OPTIONS_DEFINE= DOCS EXAMPLES DUMB OSS
		31	OPTIONS_DEFAULT= OSS
		32	DUMB_DESC= Install dfrotz (dumb frotz)
		33
		34	OSS_MAKE_ENV= SOUND_DEFS='-DOSS_SOUND -DSOUND_DEV=\"/dev/dsp\"'
		35	OSS_MAKE_ARGS= -e soundcard.h
		36
		37	DUMB_PLIST_FILES= bin/dfrotz \
		38	man/man6/dfrotz.6.gz
		39
		40	.include <bsd.port.options.mk>
		41
		42	.if ${PORT_OPTIONS:MDUMB}
		43	PORTDOCS+= DUMB
		44	.endif
27		45
28	do-install:	46	do-install:
29	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/	47	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
		48	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
30		49
31	${INSTALL_MAN} ${WRKSRC}/doc/*.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/	50	.if ${PORT_OPTIONS:MDUMB}
		51	${INSTALL_PROGRAM} ${WRKSRC}/d${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
		52	${INSTALL_MAN} ${WRKSRC}/doc/d${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
		53	.endif
32		54
33	@${MKDIR} ${STAGEDIR}${DOCSDIR}	55	@${MKDIR} ${STAGEDIR}${DOCSDIR}
34	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	56	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}

Added Link Here

(-)b/games/frotz/files/patch-src_curses_ux__audio__oss.c (+20 lines)
1	--- src/curses/ux_audio_oss.c.orig 2014-03-06 06:08:15 UTC
2	+++ src/curses/ux_audio_oss.c
3	@@ -80,7 +80,7 @@ static void sigterm_handler(int signal)
4	_exit(0);
5	}
6
7	-static void sigint_handler(int signal) {
8	+static void oss_sigint_handler(int signal) {
9	num_repeats = 1;
10	}
11
12	@@ -141,7 +141,7 @@ static void play_sound(int volume, int r
13	sigaddset(&sa.sa_mask, SIGTERM);
14	sa.sa_flags = 0;
15	sigaction(SIGTERM, &sa, NULL);
16	- sa.sa_handler = sigint_handler;
17	+ sa.sa_handler = oss_sigint_handler;
18	sigaction(SIGINT, &sa, NULL);
19
20	for (num_repeats = repeats; num_repeats > 0;