Date: Sun, 08 Mar 2026 22:25:11 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ecb60daf0b5f - main - games/xnethack: update to 9.1 Message-ID: <69adf747.3f42c.2ffe2b4e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecb60daf0b5fe44873cf21b978fb395040cf2e5a commit ecb60daf0b5fe44873cf21b978fb395040cf2e5a Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-03-05 17:46:43 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-03-08 22:24:48 +0000 games/xnethack: update to 9.1 At last, xNetHack 9.1! Regenerate and update patch files. Changelog: https://github.com/copperwater/xNetHack/blob/master/doc/xnh-changelog-9.1.md --- games/xnethack/Makefile | 2 +- games/xnethack/distinfo | 6 ++-- games/xnethack/files/patch-doc_dlb.6 | 11 ------- games/xnethack/files/patch-doc_recover.6 | 11 ------- games/xnethack/files/patch-include-config.h | 12 ++++---- games/xnethack/files/patch-src-files.c | 4 +-- games/xnethack/files/patch-src_nhlua.c | 6 ++-- games/xnethack/files/patch-sys-unix-Makefile.doc | 15 ++++++---- games/xnethack/files/patch-sys-unix-Makefile.src | 38 ++++++++++++------------ games/xnethack/files/patch-sys-unix-Makefile.top | 6 ++-- games/xnethack/files/patch-sys-unix-Makefile.utl | 17 ++++++----- games/xnethack/files/patch-win-tty-termcap.c | 4 +-- games/xnethack/pkg-plist | 1 + 13 files changed, 58 insertions(+), 75 deletions(-) diff --git a/games/xnethack/Makefile b/games/xnethack/Makefile index a51bfebf0b06..aa4d6d959737 100644 --- a/games/xnethack/Makefile +++ b/games/xnethack/Makefile @@ -1,6 +1,6 @@ PORTNAME= xNetHack DISTVERSIONPREFIX= xnh -DISTVERSION= 9.0 +DISTVERSION= 9.1 CATEGORIES= games MAINTAINER= fuz@FreeBSD.org diff --git a/games/xnethack/distinfo b/games/xnethack/distinfo index f8398db4ad95..b4cc355689bf 100644 --- a/games/xnethack/distinfo +++ b/games/xnethack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742211468 -SHA256 (copperwater-xNetHack-xnh9.0_GH0.tar.gz) = 10bda8996fe6d42d7e285a261a5dc442348cb677768562437c2d9612e324e4b5 -SIZE (copperwater-xNetHack-xnh9.0_GH0.tar.gz) = 10982131 +TIMESTAMP = 1772730329 +SHA256 (copperwater-xNetHack-xnh9.1_GH0.tar.gz) = 451adb8cdec50464fafa41deabeb2efeaef1c7475db07195c8eb238aaaeeabaf +SIZE (copperwater-xNetHack-xnh9.1_GH0.tar.gz) = 11092768 diff --git a/games/xnethack/files/patch-doc_dlb.6 b/games/xnethack/files/patch-doc_dlb.6 deleted file mode 100644 index 9333c33abd0d..000000000000 --- a/games/xnethack/files/patch-doc_dlb.6 +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/dlb.6.orig 2025-03-17 12:07:52 UTC -+++ doc/dlb.6 -@@ -137,7 +137,7 @@ Kenneth Lorber - .SH AUTHOR - Kenneth Lorber - .SH "SEE ALSO" --.IR nethack (6), -+.IR xnethack (6), - .IR tar (1) - .SH BUGS - .IP \(bu 2n diff --git a/games/xnethack/files/patch-doc_recover.6 b/games/xnethack/files/patch-doc_recover.6 deleted file mode 100644 index 2a1b9bdf0703..000000000000 --- a/games/xnethack/files/patch-doc_recover.6 +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/recover.6.orig 2025-03-17 12:08:19 UTC -+++ doc/recover.6 -@@ -136,7 +136,7 @@ will find them in the uncompressed form. - .I nethack - will find them in the uncompressed form. - .SH "SEE ALSO" --nethack(6) -+xnethack(6) - .SH BUGS - .PP - .I recover diff --git a/games/xnethack/files/patch-include-config.h b/games/xnethack/files/patch-include-config.h index aeabd252b245..a21f02b21bf8 100644 --- a/games/xnethack/files/patch-include-config.h +++ b/games/xnethack/files/patch-include-config.h @@ -1,6 +1,6 @@ ---- include/config.h.orig 2025-03-17 12:13:32 UTC +--- include/config.h.orig 2026-02-28 22:45:03 UTC +++ include/config.h -@@ -386,11 +386,11 @@ +@@ -387,11 +387,11 @@ #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS) /* path and file name extension for compression program */ @@ -16,7 +16,7 @@ #endif #ifndef COMPRESS -@@ -475,7 +475,7 @@ +@@ -444,7 +444,7 @@ * otherwise it will be the current directory. */ #ifndef HACKDIR @@ -25,7 +25,7 @@ #endif /* -@@ -730,7 +730,7 @@ typedef unsigned char uchar; +@@ -699,7 +699,7 @@ typedef unsigned char uchar; /* TEMPORARY - MAKE UNCONDITIONAL BEFORE RELEASE */ /* undef this to check if sandbox breaks something */ @@ -34,7 +34,7 @@ #ifdef NHL_SANDBOX #ifdef CHRONICLE -@@ -764,7 +764,7 @@ typedef unsigned char uchar; +@@ -733,7 +733,7 @@ typedef unsigned char uchar; #ifdef DUMPLOG #define DUMPLOG_CORE #ifndef DUMPLOG_FILE @@ -43,7 +43,7 @@ /* DUMPLOG_FILE allows following placeholders: %% literal '%' %v version (eg. "3.6.3-0") -@@ -800,7 +800,7 @@ typedef unsigned char uchar; +@@ -769,7 +769,7 @@ typedef unsigned char uchar; /* TEMPORARY - MAKE UNCONDITIONAL BEFORE RELEASE */ /* undef this to check if sandbox breaks something */ diff --git a/games/xnethack/files/patch-src-files.c b/games/xnethack/files/patch-src-files.c index d0c30ca9a2d6..a9fc312a5363 100644 --- a/games/xnethack/files/patch-src-files.c +++ b/games/xnethack/files/patch-src-files.c @@ -1,6 +1,6 @@ ---- src/files.c.orig 2025-03-15 15:02:36 UTC +--- src/files.c.orig 2026-02-28 22:45:03 UTC +++ src/files.c -@@ -50,6 +50,7 @@ const +@@ -76,6 +76,7 @@ const #if defined(UNIX) && defined(SELECTSAVED) #include <sys/types.h> diff --git a/games/xnethack/files/patch-src_nhlua.c b/games/xnethack/files/patch-src_nhlua.c index 9afd5a952205..d655a5dadf5b 100644 --- a/games/xnethack/files/patch-src_nhlua.c +++ b/games/xnethack/files/patch-src_nhlua.c @@ -6,9 +6,9 @@ mismatch. To rule out that possibility, the sandbox code is left disabled by default but can be enabled if desired through the SANDBOX option. ---- src/nhlua.c.orig 2025-03-17 12:18:47 UTC +--- src/nhlua.c.orig 2026-02-28 22:45:03 UTC +++ src/nhlua.c -@@ -2236,6 +2236,7 @@ nhl_init(nhl_sandbox_info *sbi) +@@ -2356,6 +2356,7 @@ nhl_init(nhl_sandbox_info *sbi) lua_State * nhl_init(nhl_sandbox_info *sbi) { @@ -16,7 +16,7 @@ default but can be enabled if desired through the SANDBOX option. /* It would be nice to import EXPECTED from each build system. XXX */ /* And it would be nice to do it only once, but it's cheap. */ #ifndef NHL_VERSION_EXPECTED -@@ -2248,6 +2249,7 @@ nhl_init(nhl_sandbox_info *sbi) +@@ -2372,6 +2373,7 @@ nhl_init(nhl_sandbox_info *sbi) "sandbox doesn't know this Lua version: this=%d != expected=%d ", LUA_VERSION_RELEASE_NUM, NHL_VERSION_EXPECTED); } diff --git a/games/xnethack/files/patch-sys-unix-Makefile.doc b/games/xnethack/files/patch-sys-unix-Makefile.doc index 5724617301d7..20bc3521410d 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.doc +++ b/games/xnethack/files/patch-sys-unix-Makefile.doc @@ -1,19 +1,22 @@ ---- sys/unix/Makefile.doc.orig 2025-03-15 15:02:36 UTC +--- sys/unix/Makefile.doc.orig 2026-02-28 22:45:03 UTC +++ sys/unix/Makefile.doc -@@ -80,10 +80,10 @@ $(MAKEDEFS) : ../util/makedefs.c ../include/config.h . +@@ -83,13 +83,13 @@ $(MAKEDEFS) : ../util/makedefs.c ../include/config.h . # (note: 'make makedefs', not 'make $(MAKEDEFS)') $(MAKEDEFS) : ../util/makedefs.c ../include/config.h ../src/mdlib.c \ ../util/mdgrep.h -- ( cd ../util ; make makedefs ) -+ ( cd ../util ; ${MAKE} makedefs ) +- ( cd .. ; make makedefs ) ++ ( cd .. ; $(MAKE) makedefs ) + + ../util/stripbs: ../util/stripbs.c + ( cd .. ; $(MAKE) stripbs ) GAME = xnethack -MANDIR ?= /usr/man/man6 -+MANDIR ?= ${PREFIX}/share/man/man6 ++MANDIR ?= $(PREFIX)/share/man/man6 MANEXT = 6 NROFF ?= nroff -@@ -99,10 +99,10 @@ manpages: $(PREMANPAGES) +@@ -105,10 +105,10 @@ manpages: $(PREMANPAGES) # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - > manpages: $(PREMANPAGES) diff --git a/games/xnethack/files/patch-sys-unix-Makefile.src b/games/xnethack/files/patch-sys-unix-Makefile.src index 33f90a2930ca..a6f2c9b2e56b 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.src +++ b/games/xnethack/files/patch-sys-unix-Makefile.src @@ -1,4 +1,4 @@ ---- sys/unix/Makefile.src.orig 2025-03-15 15:02:36 UTC +--- sys/unix/Makefile.src.orig 2026-02-28 22:45:03 UTC +++ sys/unix/Makefile.src @@ -184,9 +184,17 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $( @@ -17,18 +17,18 @@ +LFLAGS += -L${LUA_LIBDIR} +LINK ?= $(CC) - AR = ar - ARFLAGS = rcs -@@ -194,7 +202,7 @@ ARFLAGS = rcs + #fallback values, only if these are not already set + CFLAGS ?= -I../include +@@ -198,7 +206,7 @@ ARFLAGS = rcs # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LINK line here to get # the C++ libraries linked in. --CXXFLAGS = $(CCXXFLAGS) -I. -I$(QTDIR)/include $(QTCXXFLAGS) +-CXXFLAGS ?= $(CCXXFLAGS) -I. -I$(QTDIR)/include $(QTCXXFLAGS) +CXXFLAGS += $(CCXXFLAGS) -I. -I../include -I$(QTDIR)/include -I${LUA_INCDIR} $(QTCXXFLAGS) CXX ?= g++ MOC ?= moc MOCPATH ?= $(QTDIR)/bin/$(MOC) -@@ -267,7 +275,7 @@ WINX11OBJ = $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o +@@ -271,7 +279,7 @@ WINX11OBJ = $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o WINX11OBJ = $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o $(TARGETPFX)winX.o \ $(TARGETPFX)winmap.o $(TARGETPFX)winmenu.o $(TARGETPFX)winmesg.o \ $(TARGETPFX)winmisc.o $(TARGETPFX)winstat.o $(TARGETPFX)wintext.o \ @@ -37,7 +37,7 @@ # # Files for a Qt 3 interface (renamed since nethack 3.6.x) # -@@ -303,7 +311,7 @@ WINQTOBJ = $(TARGETPFX)qt_bind.o $(TARGETPFX)qt_click. +@@ -307,7 +315,7 @@ WINQTOBJ = $(TARGETPFX)qt_bind.o $(TARGETPFX)qt_click. $(TARGETPFX)qt_msg.o $(TARGETPFX)qt_plsel.o $(TARGETPFX)qt_rip.o \ $(TARGETPFX)qt_set.o $(TARGETPFX)qt_stat.o $(TARGETPFX)qt_str.o \ $(TARGETPFX)qt_streq.o $(TARGETPFX)qt_svsel.o $(TARGETPFX)qt_win.o \ @@ -46,7 +46,7 @@ # Files for Shim windowing interface for libnh -- doesn't do anything, # just passes along the API calls to the library -@@ -328,6 +336,29 @@ WINBEOBJ = +@@ -332,6 +340,29 @@ WINBEOBJ = # Curses - Karl Garrison, Tangles #WINSRC = $(WINCURSESSRC) #WINOBJ = $(WINCURSESOBJ) @@ -76,7 +76,7 @@ # # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -344,6 +375,7 @@ WINBEOBJ = +@@ -348,6 +379,7 @@ WINBEOBJ = # WINTTYLIB = -lcurses16 # WINTTYLIB = -lncurses #WINTTYLIB = -ltermlib @@ -84,7 +84,7 @@ # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -@@ -351,16 +383,19 @@ WINBEOBJ = +@@ -355,16 +387,19 @@ WINBEOBJ = # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 @@ -106,7 +106,7 @@ # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext -@@ -370,7 +405,7 @@ WINBELIB = -lbe +@@ -374,7 +409,7 @@ WINBELIB = -lbe # # libraries for curses port # link with ncurses @@ -115,7 +115,7 @@ # link with pdcurses for SDL, installed in a separate directory #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL # same as above, for XCurses -@@ -380,6 +415,18 @@ WINCURSESLIB = -lncurses +@@ -384,6 +419,18 @@ WINCURSESLIB = -lncurses # # For Curses #WINLIB = $(WINCURSESLIB) @@ -134,7 +134,7 @@ # # some platforms need to build the support libraries # BUILDMORE = $(TARGETPFX)pdcurses.a -@@ -435,7 +482,7 @@ AWK = awk +@@ -443,7 +490,7 @@ AWK = awk # skip it--if nethack's sources don't reside in a git repository than # the script which creates that file will fail benignly and 'makedefs -v' # will proceed without it @@ -143,7 +143,7 @@ # if you change this to 1, feedback while building will omit -Dthis -Wthat # -Isomewhere so that each file being compiled is listed on one short line; -@@ -443,7 +490,7 @@ GITINFO=1 +@@ -451,7 +498,7 @@ GITINFO=1 # (rather than just in suffix default rule), such as is implemented by # gnu make and others which have picked up its extensions; # allowed values are 0, 1, and empty (which behaves like 0) @@ -152,8 +152,8 @@ # ---------------------------------------- # -@@ -505,7 +552,7 @@ LUALIB = ../lib/lua/$(LUABASE) - LUA_VERSION ?=5.4.6 +@@ -513,7 +560,7 @@ LUALIB = ../lib/lua/$(LUABASE) + LUA_VERSION ?=5.4.8 LUABASE = liblua-$(LUA_VERSION).a LUALIB = ../lib/lua/$(LUABASE) -LUALIBS = $(LUALIB) -lm $(DLLIB) @@ -161,8 +161,8 @@ LUAHEADERS = lib/lua-$(LUA_VERSION)/src # timestamp files to reduce `make' overhead and shorten .o dependency lists -@@ -644,7 +691,7 @@ pregame: - pregame: +@@ -658,7 +705,7 @@ pregame: $(RESPONSEFILES) + pregame: $(RESPONSEFILES) $(PREGAME) -$(GAME): pregame $(MAKEDEFS) $(LUALIB) $(WAVS) $(SYSTEM) @@ -170,7 +170,7 @@ @echo "$(GAME) is up to date." Sysunix: $(HOSTOBJ) $(HOBJ) $(TARGET_HACKLIB) $(DATE_O) $(BUILDMORE) Makefile -@@ -730,11 +777,11 @@ qt3_kde0.moc: ../win/Qt3/qt3_kde0.h +@@ -744,11 +791,11 @@ qt3_kde0.moc: ../win/Qt3/qt3_kde0.h # outdated Qt 3 windowport meta-object-compiler output qt3_kde0.moc: ../win/Qt3/qt3_kde0.h diff --git a/games/xnethack/files/patch-sys-unix-Makefile.top b/games/xnethack/files/patch-sys-unix-Makefile.top index 40f580e54f61..c7183353e84c 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.top +++ b/games/xnethack/files/patch-sys-unix-Makefile.top @@ -1,4 +1,4 @@ ---- sys/unix/Makefile.top.orig 2025-03-15 15:02:36 UTC +--- sys/unix/Makefile.top.orig 2026-02-28 22:45:03 UTC +++ sys/unix/Makefile.top @@ -25,15 +25,15 @@ GAME = xnethack GAME = xnethack @@ -62,7 +62,7 @@ @echo '/*nhlua.h*/' >> $@ # LUATESTTARGET is this by default lib/lua-$(LUA_VERSION)/src/lua.h: -@@ -304,39 +303,22 @@ dofiles: +@@ -309,39 +308,22 @@ dofiles: -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} @@ -110,7 +110,7 @@ # # This is not part of the dependency build hierarchy. # It requires an explicit "make fetch-Lua". -@@ -447,24 +429,17 @@ install: rootcheck $(PRECHECK) $(GAME) recover $(VARDA +@@ -460,24 +442,17 @@ install: rootcheck $(PRECHECK) $(GAME) recover $(VARDA true; $(PREINSTALL) # set up the directories # not all mkdirs have -p; those that don't will create a -p directory diff --git a/games/xnethack/files/patch-sys-unix-Makefile.utl b/games/xnethack/files/patch-sys-unix-Makefile.utl index 553be4350043..87ad84e9117a 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.utl +++ b/games/xnethack/files/patch-sys-unix-Makefile.utl @@ -1,11 +1,9 @@ ---- sys/unix/Makefile.utl.orig 2023-05-16 21:33:58 UTC +--- sys/unix/Makefile.utl.orig 2026-02-28 22:45:03 UTC +++ sys/unix/Makefile.utl -@@ -103,18 +103,25 @@ NHSROOT=.. - # flags for debugging: - # CFLAGS = -g -I../include +@@ -106,18 +106,29 @@ NHSROOT=.. + #CFLAGS = -O -I../include + #LFLAGS = --#CFLAGS = -O -I../include --#LFLAGS = +CFLAGS += -I../include -I${LUA_INCDIR} +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +CFLAGS += -DX11_GRAPHICS @@ -16,10 +14,13 @@ +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +CFLAGS += -DGNOME_GRAPHICS +endif ++ + #fallback defaults if not set + CFLAGS ?= -I../include --# -lm required by lua + # -lm required by lua -LFLAGS += -lm -+LFLAGS = -L${LUA_LIBDIR} ++LFLAGS += -L${LUA_LIBDIR} # we specify C preprocessor flags via CFLAGS; files built with default rules # might include $(CPPFLAGS) which could get a value from user's environment; diff --git a/games/xnethack/files/patch-win-tty-termcap.c b/games/xnethack/files/patch-win-tty-termcap.c index 59a1c215512f..94d015d11d2f 100644 --- a/games/xnethack/files/patch-win-tty-termcap.c +++ b/games/xnethack/files/patch-win-tty-termcap.c @@ -1,6 +1,6 @@ ---- win/tty/termcap.c.orig 2025-03-15 15:02:36 UTC +--- win/tty/termcap.c.orig 2026-02-28 22:45:03 UTC +++ win/tty/termcap.c -@@ -195,10 +195,6 @@ term_startup(int *wid, int *hgt) +@@ -196,10 +196,6 @@ term_startup(int *wid, int *hgt) error("Terminal must backspace."); #else if (!(BC = Tgetstr(nhStr("bc")))) { /* termcap also uses bc/bs */ diff --git a/games/xnethack/pkg-plist b/games/xnethack/pkg-plist index dfb0e6722ada..52bbf6f04680 100644 --- a/games/xnethack/pkg-plist +++ b/games/xnethack/pkg-plist @@ -83,6 +83,7 @@ bin/%%HACKNAME%% %%DATADIR%%/bigrm-12.lua %%DATADIR%%/bigrm-13.lua %%DATADIR%%/bigrm-14.lua +%%DATADIR%%/bigrm-15.lua %%DATADIR%%/bigrm-2.lua %%DATADIR%%/bigrm-3.lua %%DATADIR%%/bigrm-4.luahome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69adf747.3f42c.2ffe2b4e>