Date: Thu, 21 Dec 2017 05:58:15 +0000 (UTC) From: Akinori MUSHA <knu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456885 - in head/games/unnethack: . files Message-ID: <201712210558.vBL5wFxW059324@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: knu Date: Thu Dec 21 05:58:15 2017 New Revision: 456885 URL: https://svnweb.freebsd.org/changeset/ports/456885 Log: Unbreak unnethack Submitted by: adridg Differential Revision: D13553 Added: head/games/unnethack/files/patch-util_lev__comp.l (contents, props changed) Modified: head/games/unnethack/Makefile head/games/unnethack/pkg-plist Modified: head/games/unnethack/Makefile ============================================================================== --- head/games/unnethack/Makefile Thu Dec 21 04:09:47 2017 (r456884) +++ head/games/unnethack/Makefile Thu Dec 21 05:58:15 2017 (r456885) @@ -3,13 +3,17 @@ PORTNAME= unnethack DISTVERSION= 5.1.0-20131208 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} MAINTAINER= knu@FreeBSD.org COMMENT= New variant of NetHack -BROKEN= does not build: ./vaults.des: line 110, pos 9 : Core function 'level.depth' has unknown return type 'i'. +LICENSE= nethack +LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE +LICENSE_FILE= ${WRKSRC}/dat/license +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes USES= gmake groff ncurses Added: head/games/unnethack/files/patch-util_lev__comp.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/unnethack/files/patch-util_lev__comp.l Thu Dec 21 05:58:15 2017 (r456885) @@ -0,0 +1,24 @@ + [clang] Declare core_func_retval() + + This fixes the clang build failure + + ./vaults.des: line 110, pos 9 : Core function 'level.depth' has + unknown return type 'i'. + ./vaults.des: line 110, pos 9 : syntax error at level.depth + + Because core_func_retval() wasn't declared, it was defaulting to + return type **int**. So you could get, for instance, return + value 361 (which is 'i' + 256 .. high bits of the return value + were being kept, instead of discarded as they might for a narrower type). + +--- util/lev_comp.l.orig 2017-12-20 08:11:18 UTC ++++ util/lev_comp.l +@@ -80,6 +80,8 @@ void FDECL(savetoken, (char *)); + void NDECL(newline); + void FDECL(advancepos, (char *)); + ++extern char FDECL(core_func_retval, (int idx)); ++ + /* + * This doesn't always get put in lev_comp.h + * (esp. when using older versions of bison). Modified: head/games/unnethack/pkg-plist ============================================================================== --- head/games/unnethack/pkg-plist Thu Dec 21 04:09:47 2017 (r456884) +++ head/games/unnethack/pkg-plist Thu Dec 21 05:58:15 2017 (r456885) @@ -6,6 +6,7 @@ bin/unnethack %%DATADIR%%/nhdat %%DATADIR%%/recover %%DATADIR%%/unnethack +%%DATADIR%%/unnethackrc.default @mode 664 %%VARDIR%%/logfile %%VARDIR%%/perm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712210558.vBL5wFxW059324>