Page MenuHomeFreeBSD
Files F109343767

D13553.diff
No OneTemporary
Actions

D13553.diff
View Options

Index: head/games/unnethack/Makefile
===================================================================
--- head/games/unnethack/Makefile
+++ head/games/unnethack/Makefile
@@ -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
Index: head/games/unnethack/files/patch-util_lev__comp.l
===================================================================
--- head/games/unnethack/files/patch-util_lev__comp.l
+++ head/games/unnethack/files/patch-util_lev__comp.l
@@ -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).
Index: head/games/unnethack/pkg-plist
===================================================================
--- head/games/unnethack/pkg-plist
+++ head/games/unnethack/pkg-plist
@@ -6,6 +6,7 @@
%%DATADIR%%/nhdat
%%DATADIR%%/recover
%%DATADIR%%/unnethack
+%%DATADIR%%/unnethackrc.default
@mode 664
%%VARDIR%%/logfile
%%VARDIR%%/perm

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 8:16 PM (18 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16460168
Default Alt Text
D13553.diff (2 KB)

Event Timeline