Attachment #232385 for bug #262483

View | Details | Raw Unified | Return to bug 262483
Collapse All | Expand All




PORTNAME=	xNetHack
DISTVERSIONPREFIX=	xnh
DISTVERSION=	7.0
PORTREVISION=	1
CATEGORIES=	games

MAINTAINER=	fuz@fuz.su

LICENSE_FILE=	${WRKSRC}/dat/license
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

FLAVORS=	x11 nox11 qt
FLAVOR?=	${FLAVORS:[1]}
nox11_PKGNAMESUFFIX=	-nox11
qt_PKGNAMESUFFIX=	-qt

USES=		alias compiler:c11 gmake ncurses tar:tgz lua:54
USE_GITHUB=	yes

.if ${FLAVOR} == "x11"
USES+=		xorg
USE_XORG=	xaw xpm xmu xext xt x11 sm ice
CFLAGS+=	-DUSE_TILES
GRAPHICS=	X11_GRAPHICS
.elif ${FLAVOR} == "nox11"
GRAPHICS=	# none
.elif ${FLAVOR} == "qt"
USES+=		localbase pkgconfig qt:5
USE_QT=		buildtools_build core gui multimedia network widgets
MAKE_ENV+=	MOCPATH=${MOC} LINK="${CXX} -pie"
# Qt wants PIC for some reason.  For C code, PIE should be enough.
CFLAGS+=	-I${QT_INCDIR} -fpie
CXXFLAGS+=	-I${QT_INCDIR} -fpic
GRAPHICS=	QT_GRAPHICS
.endif

CFLAGS+=	-DNOMAIL -DCURSES_GRAPHICS

OPTIONS_DEFINE=	DOCS

.endif

do-configure:
	${TOUCH} ${WRKSRC}/dat/gitinfo.txt
	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
	# work around a race condition
	cd ${WRKSRC}/util; ${MAKE_CMD} tiletxt.c

post-install:
	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover

	@${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample
	# Make "sample" files from records to prevent them being removed
	# if they have been altered
	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/livelog.sample
	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample
	@${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample
	@${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample

Lines 1-3 Link Here

(-)b/games/xnethack/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620650405	1	TIMESTAMP = 1646737487
2	SHA256 (copperwater-xNetHack-xnh6.1_GH0.tar.gz) = 48cdb14a0b30cd439e04ccc3daa21d4db8b2abe9090dd7dcb2fdfa839a9572d8	2	SHA256 (copperwater-xNetHack-xnh7.0_GH0.tar.gz) = d2f9ed47a2dde9d1dfeba073f4f2cbb6c226f8d98457a860b56ec00551429725
3	SIZE (copperwater-xNetHack-xnh6.1_GH0.tar.gz) = 5850953	3	SIZE (copperwater-xNetHack-xnh7.0_GH0.tar.gz) = 5985717

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-doc_dlb.6 (-2 / +2 lines)
1	--- doc/dlb.6.orig 2021-03-22 22:28:14 UTC	1	--- doc/dlb.6.orig 2022-03-07 23:57:15 UTC
2	+++ doc/dlb.6	2	+++ doc/dlb.6
3	@@ -96,7 +96,7 @@ List the contents of the archive 'foo':	3	@@ -95,7 +95,7 @@ List the contents of the archive 'foo':
4	Kenneth Lorber	4	Kenneth Lorber
5	.SH "SEE ALSO"	5	.SH "SEE ALSO"
6	.PP	6	.PP




--- doc/nethack.6.orig	2022-03-07 23:57:15 UTC
+++ doc/nethack.6
@@ -16,7 +16,7 @@ nethack \- Exploring The Mazes of Menace
 .SH SYNOPSIS
 .na
 .hy 0

 [
 .B \-d
 .I directory
@@ -218,7 +218,7 @@ option, which must be the first argument if it appears
 supplies a directory which is to serve as the playground.
 It overrides the value from NETHACKDIR, HACKDIR,
 or the directory specified by the game administrator during compilation

 This option is usually only useful to the game administrator.
 The playground must contain several auxiliary files such as help files,
 the list of top scorers, and a subdirectory
@@ -264,7 +264,7 @@ name is '.xnethackrc' in the user's home directory.
 
 .br
 All other files are in the playground directory,

 If DLB was defined during the compile, the data files and special levels
 will be inside a larger file, normally nhdat, instead of being separate
 files.
@@ -392,7 +392,7 @@ SHOPTYPE and SPLEVTYPE can be used in debugging (wizar
 DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
 .SH "SEE ALSO"
 .PP
-recover(6)
+recover(6)
 .SH BUGS
 .PP
 Probably infinite.

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-doc_recover.6 (-3 / +3 lines)
1	--- doc/recover.6.orig 2021-03-22 22:28:14 UTC	1	--- doc/recover.6.orig 2022-03-07 23:57:15 UTC
2	+++ doc/recover.6	2	+++ doc/recover.6
3	@@ -43,7 +43,7 @@ option, which must be the first argument if it appears	3	@@ -42,7 +42,7 @@ option, which must be the first argument if it appears
4	supplies a directory which is the NetHack playground.	4	supplies a directory which is the NetHack playground.
5	It overrides the value from NETHACKDIR, HACKDIR, or the directory	5	It overrides the value from NETHACKDIR, HACKDIR, or the directory
6	specified by the game administrator during compilation	6	specified by the game administrator during compilation
Lines 9-15 Link Here
9	.PP	9	.PP
10	^?ALLDOCS	10	^?ALLDOCS
11	For recovery to be possible,	11	For recovery to be possible,
12	@@ -130,7 +130,7 @@ but even a compression-using	12	@@ -129,7 +129,7 @@ but even a compression-using
13	.I nethack	13	.I nethack
14	will find them in the uncompressed form.	14	will find them in the uncompressed form.
15	.SH "SEE ALSO"	15	.SH "SEE ALSO"




--- include/config.h.orig	2022-03-07 23:57:15 UTC
+++ include/config.h
@@ -303,11 +303,11 @@
 
 #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
 /* path and file name extension for compression program */

 #endif
 
 #ifndef COMPRESS
@@ -392,7 +392,7 @@
  * otherwise it will be the current directory.
  */
 #ifndef HACKDIR

 #endif
 
 /*
@@ -653,7 +653,7 @@ typedef unsigned char uchar;
 #ifdef DUMPLOG
 
 #ifndef DUMPLOG_FILE

Lines 1-4 Link Here

(-)b/games/xnethack/files/patch-include-unixconf.h (-2 / +2 lines)
1	--- include/unixconf.h.orig 2021-03-22 22:28:14 UTC	1	--- include/unixconf.h.orig 2022-03-07 23:57:15 UTC
2	+++ include/unixconf.h	2	+++ include/unixconf.h
3	@@ -20,13 +20,13 @@	3	@@ -20,13 +20,13 @@
4	*/	4	*/
Lines 16-22 Link Here
16	/* of Linux */	16	/* of Linux */
17	/* #define HPUX / / Hewlett-Packard's Unix, version 6.5 or higher */	17	/* #define HPUX / / Hewlett-Packard's Unix, version 6.5 or higher */
18	/* use SYSV for < v6.5 */	18	/* use SYSV for < v6.5 */
19	@@ -315,7 +315,7 @@	19	@@ -317,7 +317,7 @@
20	#endif	20	#endif
21		21
22	#if defined(BSD) \|\| defined(ULTRIX)	22	#if defined(BSD) \|\| defined(ULTRIX)

Lines 1-8 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.doc (-5 / +8 lines)
1	--- sys/unix/Makefile.doc.orig 2021-03-22 22:28:14 UTC	1	--- sys/unix/Makefile.doc.orig 2022-03-07 23:57:15 UTC
2	+++ sys/unix/Makefile.doc	2	+++ sys/unix/Makefile.doc
3	@@ -66,15 +66,15 @@ Guidebook.dvi: Guidebook.tex	3	@@ -73,17 +73,17 @@ Guidebook.dvi : Guidebook.tex
4	latex Guidebook.tex	4	# (note: 'make makedefs', not 'make $(MAKEDEFS)')
5		5	$(MAKEDEFS) : ../util/makedefs.c ../include/config.h ../src/mdlib.c \
		6	../util/mdgrep.h
		7	- ( cd ../util ; make makedefs )
		8	+ ( cd ../util ; ${MAKE} makedefs )
6		9
7	-GAME = nethack	10	-GAME = nethack
8	-MANDIR = /usr/man/man6	11	-MANDIR = /usr/man/man6
Lines 22-28 Link Here
22	# manual installation for most SYSV-style systems	25	# manual installation for most SYSV-style systems
23	# GAMEMANCREATE = cat nethack.6 \| $(NHGREP) \| nroff -man - >	26	# GAMEMANCREATE = cat nethack.6 \| $(NHGREP) \| nroff -man - >
24	# RCVRMANCREATE = cat recover.6 \| $(NHGREP) \| nroff -man - >	27	# RCVRMANCREATE = cat recover.6 \| $(NHGREP) \| nroff -man - >
25	@@ -82,10 +82,10 @@ MDMANCREATE = cat makedefs.6 \| $(NHGREP) >	28	@@ -91,10 +91,10 @@ MDMANCREATE = cat makedefs.6 \| $(NHGREP) >
26	# MDMANCREATE = cat makedefs.6 \| $(NHGREP) \| nroff -man - >	29	# MDMANCREATE = cat makedefs.6 \| $(NHGREP) \| nroff -man - >
27		30
28	manpages:	31	manpages:

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.src (-30 / +42 lines)
1	--- sys/unix/Makefile.src.orig 2021-03-22 22:28:14 UTC	1	--- sys/unix/Makefile.src.orig 2022-03-07 23:57:15 UTC
2	+++ sys/unix/Makefile.src	2	+++ sys/unix/Makefile.src
3	@@ -169,9 +169,17 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $(	3	@@ -169,14 +169,22 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $(
4		4
5	# flags for debugging:	5	# flags for debugging:
6	# CFLAGS = -g -I../include	6	# CFLAGS = -g -I../include
Lines 15-25 Link Here
15	#CFLAGS = -O -I../include	15	#CFLAGS = -O -I../include
16	-#LFLAGS =	16	-#LFLAGS =
17	+LFLAGS += -L${LUA_LIBDIR}	17	+LFLAGS += -L${LUA_LIBDIR}
18	+LINK = $(CC)	18	+LINK ?= $(CC)
19		19
20	# The Qt and Be window systems are written in C++, while the rest of	20	# The Qt and Be window systems are written in C++, while the rest of
21	# NetHack is standard C. If using Qt, uncomment the LINK line here to get	21	# NetHack is standard C. If using Qt, uncomment the LINK line here to get
22	@@ -297,6 +305,29 @@ WINBEOBJ =	22	# the C++ libraries linked in.
		23	-CXXFLAGS = $(CCXXFLAGS) -I. -I$(QTDIR)/include $(QTCXXFLAGS)
		24	+CXXFLAGS += -I. -I../include -I${LUA_INCDIR}
		25	CXX ?= g++
		26	MOC ?= moc
		27	MOCPATH ?= $(QTDIR)/bin/$(MOC)
		28	@@ -305,6 +313,29 @@ WINBEOBJ =
23	# Curses - Karl Garrison, Tangles	29	# Curses - Karl Garrison, Tangles
24	#WINSRC = $(WINCURSESSRC)	30	#WINSRC = $(WINCURSESSRC)
25	#WINOBJ = $(WINCURSESOBJ)	31	#WINOBJ = $(WINCURSESOBJ)
Lines 49-55 Link Here
49	#	55	#
50	# on some systems the termcap library is in -ltermcap or -lcurses	56	# on some systems the termcap library is in -ltermcap or -lcurses
51	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead	57	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
52	@@ -313,6 +344,7 @@ WINBEOBJ =	58	@@ -321,6 +352,7 @@ WINBEOBJ =
53	# WINTTYLIB = -lcurses16	59	# WINTTYLIB = -lcurses16
54	# WINTTYLIB = -lncurses	60	# WINTTYLIB = -lncurses
55	#WINTTYLIB = -ltermlib	61	#WINTTYLIB = -ltermlib
Lines 57-63 Link Here
57	#	63	#
58	# libraries for X11	64	# libraries for X11
59	# If USE_XPM is defined in config.h, you will also need -lXpm here.	65	# If USE_XPM is defined in config.h, you will also need -lXpm here.
60	@@ -320,10 +352,13 @@ WINBEOBJ =	66	@@ -328,16 +360,19 @@ WINBEOBJ =
61	# WINX11LIB = -lXaw -lXmu -lXt -lX11	67	# WINX11LIB = -lXaw -lXmu -lXt -lX11
62	# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm	68	# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
63	# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0	69	# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
Lines 67-78 Link Here
67	# libraries for Qt 3	73	# libraries for Qt 3
68	-WINQT3LIB = -L$(QTDIR)/lib -lqt	74	-WINQT3LIB = -L$(QTDIR)/lib -lqt
69	+#WINQTLIB = -L$(QTDIR)/lib -lqt	75	+#WINQTLIB = -L$(QTDIR)/lib -lqt
70	+WINQT3LIB = ${QTCFGLIBS} ${LIBQT}	76	+#WINQT3LIB = ${QTCFGLIBS} ${LIBQT}
71	+WINQTLIB = ${QTCFGLIBS} ${LIBQT}	77	+#WINQTLIB = ${QTCFGLIBS} ${LIBQT}
72	#	78	#
73	# libraries for Qt 4	79	# libraries for Qt 4
74	WINQT4LIB = `pkg-config QtGui --libs`	80	WINQT4LIB = `pkg-config QtGui --libs`
75	@@ -339,7 +374,7 @@ WINBELIB = -lbe	81	#
		82	# libraries for Qt 5 (use with WINQTSRC and WINQTOBJ)
		83	-WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
		84	+WINQTLIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
		85	#
		86	# libraries for KDE (with Qt)
		87	WINKDELIB = -lkdecore -lkdeui -lXext
		88	@@ -347,7 +382,7 @@ WINBELIB = -lbe
76	#	89	#
77	# libraries for curses port	90	# libraries for curses port
78	# link with ncurses	91	# link with ncurses
Lines 81-87 Link Here
81	# link with pdcurses for SDL, installed in a separate directory	94	# link with pdcurses for SDL, installed in a separate directory
82	#WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL	95	#WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL
83	# same as above, for XCurses	96	# same as above, for XCurses
84	@@ -349,6 +384,18 @@ WINCURSESLIB = -lncurses	97	@@ -357,6 +392,18 @@ WINCURSESLIB = -lncurses
85	#	98	#
86	# For Curses	99	# For Curses
87	#WINLIB = $(WINCURSESLIB)	100	#WINLIB = $(WINCURSESLIB)
Lines 100-115 Link Here
100	#	113	#
101	# some platforms need to build the support libraries	114	# some platforms need to build the support libraries
102	# BUILDMORE = $(TARGETPFX)pdcurses.a	115	# BUILDMORE = $(TARGETPFX)pdcurses.a
103	@@ -384,7 +431,7 @@ WINCURSESLIB = -lncurses	116	@@ -412,7 +459,7 @@ AWK = awk
104	# LIBS =	117	# skip it--if nethack's sources don't reside in a git repository than
105		118	# the script which creates that file will fail benignly and 'makedefs -v'
106	# make NetHack	119	# will proceed without it
107	-GAME = xnethack	120	-GITINFO=1
108	+GAME = xnethack	121	+GITINFO=0
109	# GAME = nethack.prg
110	GAMEBIN = $(GAME)
111		122
112	@@ -412,7 +459,7 @@ GITINFO=1	123	# if you change this to 1, feedback while building will omit -Dthis -Wthat
		124	# -Isomewhere so that each file being compiled is listed on one short line;
		125	@@ -420,7 +467,7 @@ GITINFO=1
113	# (rather than just in suffix default rule), such as is implemented by	126	# (rather than just in suffix default rule), such as is implemented by
114	# gnu make and others which have picked up its extensions;	127	# gnu make and others which have picked up its extensions;
115	# allowed values are 0, 1, and empty (which behaves like 0)	128	# allowed values are 0, 1, and empty (which behaves like 0)
Lines 118-134 Link Here
118		131
119	# ----------------------------------------	132	# ----------------------------------------
120	#	133	#
121	@@ -465,7 +512,8 @@ PACKAGE=@true	134	@@ -473,7 +520,7 @@ PACKAGE=@true
122	MAKEDEFS = ../util/makedefs	135	MAKEDEFS = ../util/makedefs
123		136
124	# -lm required by lua	137	# -lm required by lua
125	-LUALIB = ../lib/lua/liblua.a -lm	138	-LUALIB = ../lib/lua/liblua.a -lm $(DLLIB)
126	+#LUALIB = ../lib/lua/liblua.a -lm	139	+LUALIB = -llua-${LUA_VER} -lm $(DLLIB)
127	+LUALIB = -llua-${LUA_VER} -lm
128		140
129	# timestamp files to reduce `make' overhead and shorten .o dependency lists	141	# timestamp files to reduce `make' overhead and shorten .o dependency lists
130	CONFIG_H = ../src/config.h-t	142	CONFIG_H = ../src/config.h-t
131	@@ -654,7 +702,7 @@ DUMB.Setup: ../include/extern.h	143	@@ -668,7 +715,7 @@ DUMB.Setup: ../include/extern.h
132	cp ../include/extern.DUMB ../include/extern.h	144	cp ../include/extern.DUMB ../include/extern.h
133	@touch DUMB.Setup	145	@touch DUMB.Setup
134		146
Lines 137-145 Link Here
137	@( cd .. ; $(MAKE) lua_support )	149	@( cd .. ; $(MAKE) lua_support )
138		150
139	# dependencies for makedefs and its outputs, which the util	151	# dependencies for makedefs and its outputs, which the util
140	@@ -673,11 +721,11 @@ objects.o:	152	@@ -687,11 +734,11 @@ objects.o:
141		153
142	# Qt 3 windowport meta-object-compiler output	154	# outdated Qt 3 windowport meta-object-compiler output
143	qt3_kde0.moc: ../win/Qt3/qt3_kde0.h	155	qt3_kde0.moc: ../win/Qt3/qt3_kde0.h
144	- $(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h	156	- $(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h
145	+ ${MOC} -o qt3kde0.moc ../win/Qt3/qt3_kde0.h	157	+ ${MOC} -o qt3kde0.moc ../win/Qt3/qt3_kde0.h
Lines 147-154 Link Here
147	- $(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h	159	- $(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h
148	+ ${MOC} -o qt3win.moc ../win/Qt3/qt3_win.h	160	+ ${MOC} -o qt3win.moc ../win/Qt3/qt3_win.h
149	qt3tableview.moc: ../win/Qt3/qt3tableview.h	161	qt3tableview.moc: ../win/Qt3/qt3tableview.h
150	- $(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt/qt3tableview.h	162	- $(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt3/qt3tableview.h
151	+ ${MOC} -o qt3tableview.moc ../win/Qt/qt3tableview.h	163	+ ${MOC} -o qt3tableview.moc ../win/Qt3/qt3tableview.h
152		164
153	# Qt 4 windowport meta-object-compiler output	165	# build monst.o and objects.o before executing '$(MAKE) makedefs'
154	qt_kde0.moc : ../win/Qt/qt_kde0.h	166	$(MAKEDEFS): $(FIRSTOBJ) \




--- sys/unix/Makefile.top.orig	2022-03-07 23:57:15 UTC
+++ sys/unix/Makefile.top
@@ -25,15 +25,15 @@ NHSROOT=.
 GAME     = xnethack
 # make NetHack
 #PREFIX	 = /usr
-GAME     = xnethack
+GAME     = xnethack
 # GAME     = nethack.prg
 #GAMEUID  = games
-#GAMEGRP  = bin
+GAMEGRP  = games
 
 #	Permissions - some places use setgid instead of setuid, for instance.
 #	See also the option "SECURE" in include/config.h.
-#GAMEPERM = 04755
-FILEPERM = 0644
+GAMEPERM = 02755
 FILEPERM = 0644
 # VARFILEPERM = 0644
 EXEPERM  = 0755
-DIRPERM  = 0755
+DIRPERM  = 0775
 # VARDIRPERM = 0755
 
 #	VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
@@ -44,10 +44,12 @@ DIRPERM  = 0755
 #	keep (if there is, you'll have to do the installation by hand or
 #	modify the install commands below).
 #HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
-#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
-#VARDIR  = $(HACKDIR)
+HACKDIR = %%HACKDIR%%
+INSTDIR = ${HACKDIR}
+VARDIR  = $(HACKDIR)
 #	Where nethack.sh is installed (as 'nethack').
 #	If this is not defined, the shell wrapper script is not used.
-#SHELLDIR = $(PREFIX)/games
+SHELLDIR = $(PREFIX)/bin
 
 #	Extra data files depending upon the interface(s) built into nethack.
 # per discussion in Install.X11 and Install.Qt
@@ -62,7 +64,7 @@ DIRPERM  = 0755
 #	X11 with GRAPHIC_TOMBSTONE (requires 'xpm'):
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
 #	both X11 and Qt:
-# VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
+VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
 #	Qt without X11; assumes GRAPHIC_TOMBSTONE:
 # VARDATND = nhtiles.bmp pet_mark.xbm pilemark.xbm rip.xpm
 
 # Lua version
-LUA_VERSION = 5.4.2
+LUA_VERSION = ${LUA_VER}
 
@@ -123,7 +125,7 @@ all:    $(ALLDEP)
 # end of configuration
@@ -108,7 +109,7 @@ all:    $(ALLDEP)
 $(GAME): lua_support
 	( cd src ; $(MAKE) $(GAME) )
 
-lua_support: $(TOPLUALIB) include/nhlua.h
+lua_support: include/nhlua.h
 	@true
 $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
 	( cd $(LUATOP) \
@@ -131,13 +133,11 @@ $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
 lib/lua/liblua.a: $(LUATOP)/liblua.a
 	@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
 	cp $(LUATOP)/liblua.a $@
-include/nhlua.h: $(TOPLUALIB)
+include/nhlua.h:
 	echo '/* nhlua.h - generated by top Makefile */' > $@
-	@echo '#include "../$(LUAHEADERS)/lua.h"' >> $@
-	@sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \
-		< $(LUAHEADERS)/lua.h >> $@
-	@echo '#include "../$(LUAHEADERS)/lualib.h"' >> $@
-	@echo '#include "../$(LUAHEADERS)/lauxlib.h"' >> $@
+	@echo '#include <lua.h>' >> $@
+	@echo '#include <lualib.h>' >> $@
+	@echo '#include <lauxlib.h>' >> $@
 	@echo '/*nhlua.h*/' >> $@
 # LUATESTTARGET is this by default
 lib/lua-$(LUA_VERSION)/src/lua.h:
@@ -258,39 +258,22 @@ dofiles:
 		-e '}' 					\
 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
 	$(MAKE) dofiles-$${target-nodlb}
-	cp src/$(GAME) $(INSTDIR)
-	cp util/recover $(INSTDIR)
-	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
-	if test -n '$(SHELLDIR)'; then \
+	cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)
+	cp util/recover ${DESTDIR}$(INSTDIR)
+	-if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
+	if test -n '${DESTDIR}$(SHELLDIR)'; then \
 		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
 		< sys/unix/nethack.sh \

 #
 # This is not part of the dependency build hierarchy.
 # It requires an explicit "make fetch-Lua".
@@ -327,25 +310,17 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs
 update: $(GAME) recover $(VARDAT) spec_levs
 #	(don't yank the old version out from under people who're playing it)
 	-mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old
-	-mv $(INSTDIR)/nhdat $(INSTDIR)/nhdat.old
+	-mv ${DESTDIR}$(INSTDIR)/nhdat ${DESTDIR}$(INSTDIR)/nhdat.old
 # set up new versions of the game files
 	( $(MAKE) dofiles )
-# touch time-sensitive files
-	-touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
-	-touch -c $(VARDIR)/save/* $(VARDIR)/whereis/*
-	touch $(VARDIR)/perm $(VARDIR)/record
 # and a reminder
 	@echo You may also want to install the man pages via the doc Makefile.
 
@@ -300,25 +278,16 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs
 	true; $(PREINSTALL)
 # set up the directories
 # not all mkdirs have -p; those that don't will create a -p directory

+	-if test -n '${DESTDIR}$(SHELLDIR)'; then \
+		mkdir -p ${DESTDIR}$(SHELLDIR); fi
+	rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
+	-mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)/save ${DESTDIR}$(VARDIR)/whereis
 	if test -d ./-p; then rmdir ./-p; fi
-	-$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
-	$(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis

 # set up the game files
 	( $(MAKE) dofiles )
 # set up some additional files
-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile \
-         $(VARDIR)/livelog
-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile livelog ; \
-			$(CHGRP) $(GAMEGRP) perm record logfile xlogfile livelog ; \
-			chmod $(VARFILEPERM) perm record logfile xlogfile livelog )
-	true; $(POSTINSTALL)
+	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record \
+            ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile ${DESTDIR}$(VARDIR)/livelog
 # and a reminder
 	@echo You may also want to reinstall the man pages via the doc Makefile.
 

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.utl (-2 / +2 lines)
1	--- sys/unix/Makefile.utl.orig 2021-03-22 22:28:14 UTC	1	--- sys/unix/Makefile.utl.orig 2022-03-07 23:57:15 UTC
2	+++ sys/unix/Makefile.utl	2	+++ sys/unix/Makefile.utl
3	@@ -93,18 +93,25 @@ NHSROOT=..	3	@@ -98,18 +98,25 @@ NHSROOT=..
4	# flags for debugging:	4	# flags for debugging:
5	# CFLAGS = -g -I../include	5	# CFLAGS = -g -I../include
6		6

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-sys-unix-sysconf (-2 / +2 lines)
1	--- sys/unix/sysconf.orig 2021-03-22 22:28:14 UTC	1	--- sys/unix/sysconf.orig 2022-03-07 23:57:15 UTC
2	+++ sys/unix/sysconf	2	+++ sys/unix/sysconf
3	@@ -136,7 +136,7 @@ LLC_TURNS=3000	3	@@ -134,7 +134,7 @@ LIVELOG=0x1FFF
4	# %D current time, YYYYMMDDhhmmss format	4	# %D current time, YYYYMMDDhhmmss format
5	# %n player name	5	# %n player name
6	# %N first character of player name	6	# %N first character of player name




--- util/makedefs.c.orig	2022-03-07 23:57:15 UTC
+++ util/makedefs.c
@@ -116,6 +116,7 @@ static struct version_info version;
 #define MAXFNAMELEN 600

 
 #ifdef FILE_PREFIX
 /* if defined, a first argument not starting with - is
@@ -230,6 +231,12 @@ main(int argc, char *argv[])
         return 1;
     }
 

 #ifdef FILE_PREFIX
     if (argc >= 2 && argv[1][0] != '-') {
         file_prefix = argv[1];
@@ -989,12 +996,12 @@ do_rnd_access_file(
         Strcat(buf, "\n"); /* so make sure that the default one does too    */
     (void) fputs(xcrypt(padline(buf, padlength)), ofp);
 
-    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
+    tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);

+    ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
 #endif
     while ((line = fgetline(ifp)) != 0) {
         if (line[0] != '#' && line[0] != '\n') {
@@ -1007,7 +1014,7 @@ do_rnd_access_file(
     Fclose(ofp);
 
 #ifdef HAS_NO_MKSTEMP

 #endif
     return;
 }
@@ -1791,12 +1798,12 @@ do_dungeon(void)
     }
     Fprintf(ofp, "%s", Dont_Edit_Data);
 

 #endif
     while ((line = fgetline(ifp)) != 0) {
         SpinCursor(3);
@@ -1812,7 +1819,7 @@ do_dungeon(void)
     Fclose(ofp);
 
 #ifdef HAS_NO_MKSTEMP

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-win-tty-termcap.c (-2 / +2 lines)
1	--- win/tty/termcap.c.orig 2021-03-22 22:28:14 UTC	1	--- win/tty/termcap.c.orig 2022-03-07 23:57:15 UTC
2	+++ win/tty/termcap.c	2	+++ win/tty/termcap.c
3	@@ -185,10 +185,6 @@ tty_startup(int wid, int hgt)	3	@@ -188,10 +188,6 @@ tty_startup(int wid, int hgt)
4	error("Terminal must backspace.");	4	error("Terminal must backspace.");
5	#else	5	#else
6	if (!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */	6	if (!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */

Added Link Here

(-)b/games/xnethack/files/patch-win_Qt_qt__pre.h (+11 lines)
1	--- win/Qt/qt_pre.h.orig 2022-03-11 00:02:45 UTC
2	+++ win/Qt/qt_pre.h
3	@@ -28,7 +28,7 @@
4	#pragma GCC diagnostic ignored "-Wshadow"
5	#endif
6
7	-#include <QtGlobal>
8	+#include <QtCore/QtGlobal>
9
10	/* QFontMetrics::width was deprecated in Qt 5.11 */
11	#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)




%%DATADIR%%/bigrm-1.lua
%%DATADIR%%/bigrm-10.lua
%%DATADIR%%/bigrm-11.lua
%%DATADIR%%/bigrm-12.lua
%%DATADIR%%/bigrm-2.lua
%%DATADIR%%/bigrm-3.lua
%%DATADIR%%/bigrm-4.lua

%%DATADIR%%/help
%%DATADIR%%/hh
%%DATADIR%%/history
%%DATADIR%%/invocation.lua
%%DATADIR%%/juiblex.lua
%%DATADIR%%/keyhelp
%%DATADIR%%/knox.lua
%%DATADIR%%/license
@sample(games,games,664) %%DATADIR%%/livelog.sample
@sample(games,games,664) %%DATADIR%%/logfile.sample
%%DATADIR%%/medusa-1.lua
%%DATADIR%%/medusa-2.lua

%%DATADIR%%/minetn-6.lua
%%DATADIR%%/minetn-7.lua
%%DATADIR%%/minetn-8.lua
%%DATADIR%%/nhcore.lua
%%DATADIR%%/nhlib.lua
%%DATADIR%%/nhtiles.bmp
%%DATADIR%%/opthelp
%%DATADIR%%/options
%%DATADIR%%/optmenu
%%DATADIR%%/oracle-1.lua
%%DATADIR%%/oracle-2.lua
%%DATADIR%%/oracle-3.lua

@mode 02755
%%DATADIR%%/recover
@mode
%%DATADIR%%/rip.xpm
%%DATADIR%%/rumors
%%DATADIR%%/sanctum.lua
%%DATADIR%%/shirts

%%DATADIR%%/tower1.lua
%%DATADIR%%/tower2.lua
%%DATADIR%%/tower3.lua
%%DATADIR%%/tower4.lua
%%DATADIR%%/tribute
%%DATADIR%%/valley.lua
%%DATADIR%%/water.lua
- 

Return to bug 262483

Lines 1-7 Link Here

(-)b/games/xnethack/Makefile (-4 / +17 lines)
1	PORTNAME= xNetHack	1	PORTNAME= xNetHack
2	DISTVERSIONPREFIX= xnh	2	DISTVERSIONPREFIX= xnh
3	DISTVERSION= 6.1	3	DISTVERSION= 7.0
4	PORTREVISION= 1
5	CATEGORIES= games	4	CATEGORIES= games
6		5
7	MAINTAINER= fuz@fuz.su	6	MAINTAINER= fuz@fuz.su
Lines 12-20 LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE Link Here
12	LICENSE_FILE= ${WRKSRC}/dat/license	11	LICENSE_FILE= ${WRKSRC}/dat/license
13	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	12	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
14		13
15	FLAVORS= x11 nox11	14	FLAVORS= x11 nox11 qt
16	FLAVOR?= ${FLAVORS:[1]}	15	FLAVOR?= ${FLAVORS:[1]}
17	nox11_PKGNAMESUFFIX= -nox11	16	nox11_PKGNAMESUFFIX= -nox11
		17	qt_PKGNAMESUFFIX= -qt
18		18
19	USES= alias compiler:c11 gmake ncurses tar:tgz lua:54	19	USES= alias compiler:c11 gmake ncurses tar:tgz lua:54
20	USE_GITHUB= yes	20	USE_GITHUB= yes
Lines 33-43 DOCSDIR= ${PREFIX}/share/doc/${HACKNAME} Link Here
33	.if ${FLAVOR} == "x11"	33	.if ${FLAVOR} == "x11"
34	USES+= xorg	34	USES+= xorg
35	USE_XORG= xaw xpm xmu xext xt x11 sm ice	35	USE_XORG= xaw xpm xmu xext xt x11 sm ice
36	CFLAGS+= -DX11_GRAPHICS -DUSE_TILES	36	CFLAGS+= -DUSE_TILES
37	GRAPHICS= X11_GRAPHICS	37	GRAPHICS= X11_GRAPHICS
38	.elif ${FLAVOR} == "nox11"	38	.elif ${FLAVOR} == "nox11"
39	GRAPHICS= # none	39	GRAPHICS= # none
		40	.elif ${FLAVOR} == "qt"
		41	USES+= localbase pkgconfig qt:5
		42	USE_QT= buildtools_build core gui multimedia network widgets
		43	MAKE_ENV+= MOCPATH=${MOC} LINK="${CXX} -pie"
		44	# Qt wants PIC for some reason. For C code, PIE should be enough.
		45	CFLAGS+= -I${QT_INCDIR} -fpie
		46	CXXFLAGS+= -I${QT_INCDIR} -fpic
		47	GRAPHICS= QT_GRAPHICS
40	.endif	48	.endif
		49
41	CFLAGS+= -DNOMAIL -DCURSES_GRAPHICS	50	CFLAGS+= -DNOMAIL -DCURSES_GRAPHICS
42		51
43	OPTIONS_DEFINE= DOCS	52	OPTIONS_DEFINE= DOCS
Lines 63-69 post-patch: Link Here
63	.endif	72	.endif
64		73
65	do-configure:	74	do-configure:
		75	${TOUCH} ${WRKSRC}/dat/gitinfo.txt
66	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh	76	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
		77	# work around a race condition
		78	cd ${WRKSRC}/util; ${MAKE_CMD} tiletxt.c
67		79
68	post-install:	80	post-install:
69	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover	81	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover
Lines 75-80 post-install: Link Here
75	@${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample	87	@${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample
76	# Make "sample" files from records to prevent them being removed	88	# Make "sample" files from records to prevent them being removed
77	# if they have been altered	89	# if they have been altered
		90	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/livelog.sample
78	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample	91	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample
79	@${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample	92	@${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample
80	@${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample	93	@${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-doc_nethack.6 (-13 / +4 lines)
1	--- doc/nethack.6.orig 2021-03-22 22:28:14 UTC	1	--- doc/nethack.6.orig 2022-03-07 23:57:15 UTC
2	+++ doc/nethack.6	2	+++ doc/nethack.6
3	@@ -17,7 +17,7 @@ nethack \- Exploring The Mazes of Menace	3	@@ -16,7 +16,7 @@ nethack \- Exploring The Mazes of Menace
4	.SH SYNOPSIS	4	.SH SYNOPSIS
5	.na	5	.na
6	.hy 0	6	.hy 0
Lines 9-15 Link Here
9	[	9	[
10	.B \-d	10	.B \-d
11	.I directory	11	.I directory
12	@@ -219,7 +219,7 @@ option, which must be the first argument if it appears	12	@@ -218,7 +218,7 @@ option, which must be the first argument if it appears
13	supplies a directory which is to serve as the playground.	13	supplies a directory which is to serve as the playground.
14	It overrides the value from NETHACKDIR, HACKDIR,	14	It overrides the value from NETHACKDIR, HACKDIR,
15	or the directory specified by the game administrator during compilation	15	or the directory specified by the game administrator during compilation
Lines 18-24 Link Here
18	This option is usually only useful to the game administrator.	18	This option is usually only useful to the game administrator.
19	The playground must contain several auxiliary files such as help files,	19	The playground must contain several auxiliary files such as help files,
20	the list of top scorers, and a subdirectory	20	the list of top scorers, and a subdirectory
21	@@ -265,7 +265,7 @@ name is '.xnethackrc' in the user's home directory.	21	@@ -264,7 +264,7 @@ name is '.xnethackrc' in the user's home directory.
22		22
23	.br	23	.br
24	All other files are in the playground directory,	24	All other files are in the playground directory,
Lines 27-38 Link Here
27	If DLB was defined during the compile, the data files and special levels	27	If DLB was defined during the compile, the data files and special levels
28	will be inside a larger file, normally nhdat, instead of being separate	28	will be inside a larger file, normally nhdat, instead of being separate
29	files.	29	files.
30	@@ -392,7 +392,7 @@ SHOPTYPE and SPLEVTYPE can be used in debugging (wizar
31	DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
32	.SH "SEE ALSO"
33	.PP
34	-recover(6)
35	+recover(6)
36	.SH BUGS
37	.PP
38	Probably infinite.

Lines 1-6 Link Here

(-)b/games/xnethack/files/patch-include-config.h (-4 / +4 lines)
1	--- include/config.h.orig 2021-03-22 22:28:14 UTC	1	--- include/config.h.orig 2022-03-07 23:57:15 UTC
2	+++ include/config.h	2	+++ include/config.h
3	@@ -294,11 +294,11 @@	3	@@ -303,11 +303,11 @@
4		4
5	#if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)	5	#if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
6	/* path and file name extension for compression program */	6	/* path and file name extension for compression program */
Lines 16-22 Link Here
16	#endif	16	#endif
17		17
18	#ifndef COMPRESS	18	#ifndef COMPRESS
19	@@ -383,7 +383,7 @@	19	@@ -392,7 +392,7 @@
20	* otherwise it will be the current directory.	20	* otherwise it will be the current directory.
21	*/	21	*/
22	#ifndef HACKDIR	22	#ifndef HACKDIR
Lines 25-31 Link Here
25	#endif	25	#endif
26		26
27	/*	27	/*
28	@@ -646,7 +646,7 @@ typedef unsigned char uchar;	28	@@ -653,7 +653,7 @@ typedef unsigned char uchar;
29	#ifdef DUMPLOG	29	#ifdef DUMPLOG
30		30
31	#ifndef DUMPLOG_FILE	31	#ifndef DUMPLOG_FILE

Lines 1-96 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.top (-75 / +52 lines)
1	--- sys/unix/Makefile.top.orig 2021-03-22 22:28:14 UTC	1	--- sys/unix/Makefile.top.orig 2022-03-07 23:57:15 UTC
2	+++ sys/unix/Makefile.top	2	+++ sys/unix/Makefile.top
3	@@ -20,18 +20,18 @@ NHSROOT=.	3	@@ -25,15 +25,15 @@ NHSROOT=.
4		4	GAME = xnethack
5	# make NetHack
6	#PREFIX = /usr
7	-GAME = xnethack
8	+GAME = xnethack
9	# GAME = nethack.prg	5	# GAME = nethack.prg
10	#GAMEUID = games	6	#GAMEUID = games
11	-#GAMEGRP = bin	7	-#GAMEGRP = bin
12	+GAMEGRP = games	8	+GAMEGRP = games
13		9
14	# Permissions - some places use setgid instead of setuid, for instance	10	# Permissions - some places use setgid instead of setuid, for instance.
15	# See also the option "SECURE" in include/config.h	11	# See also the option "SECURE" in include/config.h.
16	-#GAMEPERM = 04755	12	-#GAMEPERM = 04755
17	-FILEPERM = 0644
18	+GAMEPERM = 02755	13	+GAMEPERM = 02755
19	+FILEPERM = 0664	14	FILEPERM = 0644
20	# VARFILEPERM = 0644	15	# VARFILEPERM = 0644
21	EXEPERM = 0755	16	EXEPERM = 0755
22	-DIRPERM = 0755	17	-DIRPERM = 0755
23	+DIRPERM = 0775	18	+DIRPERM = 0775
24	# VARDIRPERM = 0755	19	# VARDIRPERM = 0755
25		20
26	# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR	21	# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
27	@@ -41,14 +41,15 @@ DIRPERM = 0755	22	@@ -44,10 +44,12 @@ DIRPERM = 0755
28	# therefore there should not be anything in HACKDIR that you want to keep	23	# keep (if there is, you'll have to do the installation by hand or
29	# (if there is, you'll have to do the installation by hand or modify the	24	# modify the install commands below).
30	# instructions)	25	#HACKDIR = $(PREFIX)/games/lib/$(GAME)dir
31	-#HACKDIR = $(PREFIX)/games/lib/$(GAME)dir
32	-#VARDIR = $(HACKDIR)	26	-#VARDIR = $(HACKDIR)
33	+HACKDIR = %%HACKDIR%%	27	+HACKDIR = %%HACKDIR%%
		28	+INSTDIR = ${HACKDIR}
34	+VARDIR = $(HACKDIR)	29	+VARDIR = $(HACKDIR)
35	+INSTDIR = $(HACKDIR)	30	# Where nethack.sh is installed (as 'nethack').
36	# Where nethack.sh in installed. If this is not defined, the wrapper is not used.	31	# If this is not defined, the shell wrapper script is not used.
37	-#SHELLDIR = $(PREFIX)/games	32	-#SHELLDIR = $(PREFIX)/games
38	+SHELLDIR = ${PREFIX}/bin	33	+SHELLDIR = $(PREFIX)/bin
39		34
		35	# Extra data files depending upon the interface(s) built into nethack.
40	# per discussion in Install.X11 and Install.Qt	36	# per discussion in Install.X11 and Install.Qt
41	#VARDATND =	37	@@ -62,7 +64,7 @@ DIRPERM = 0755
42	# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm	38	# X11 with GRAPHIC_TOMBSTONE (requires 'xpm'):
43	-# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm	39	# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
44	+VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm	40	# both X11 and Qt:
45	# for Atari/Gem	41	-# VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
46	# VARDATND = nh16.img title.img GEM_RSC.RSC rip.img	42	+VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
47	@@ -75,7 +76,7 @@ VARDAT = $(VARDATD) $(VARDATND)	43	# Qt without X11; assumes GRAPHIC_TOMBSTONE:
48	#CHGRP = chgrp	44	# VARDATND = nhtiles.bmp pet_mark.xbm pilemark.xbm rip.xpm
49
50	# Lua version
51	-LUA_VERSION = 5.4.2
52	+LUA_VERSION = ${LUA_VER}
53		45
54	#	46	@@ -123,7 +125,7 @@ all: $(ALLDEP)
55	# end of configuration
56	@@ -108,7 +109,7 @@ all: $(ALLDEP)
57	$(GAME): lua_support	47	$(GAME): lua_support
58	( cd src ; $(MAKE) $(GAME) )	48	( cd src ; $(MAKE) $(GAME) )
59		49
60	-lua_support: $(TOPLUALIB) include/nhlua.h	50	-lua_support: $(TOPLUALIB) include/nhlua.h
61	+lua_support: include/nhlua.h	51	+lua_support: include/nhlua.h
62	@true	52	@true
63	lib/lua-$(LUA_VERSION)/src/liblua.a: lib/lua-$(LUA_VERSION)/src/lua.h	53	$(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
64	( cd lib/lua-$(LUA_VERSION)/src \	54	( cd $(LUATOP) \
65	@@ -116,13 +117,11 @@ lib/lua-$(LUA_VERSION)/src/liblua.a: lib/lua-$(LUA_VER	55	@@ -131,13 +133,11 @@ $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h
66	lib/lua/liblua.a: lib/lua-$(LUA_VERSION)/src/liblua.a	56	lib/lua/liblua.a: $(LUATOP)/liblua.a
67	@( if [ ! -d lib/lua ] ; then mkdir -p lib/lua ; fi )	57	@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
68	cp lib/lua-$(LUA_VERSION)/src/liblua.a $@	58	cp $(LUATOP)/liblua.a $@
69	-include/nhlua.h: $(TOPLUALIB)	59	-include/nhlua.h: $(TOPLUALIB)
70	+include/nhlua.h:	60	+include/nhlua.h:
71	echo '/* nhlua.h - generated by top Makefile */' > $@	61	echo '/* nhlua.h - generated by top Makefile */' > $@
72	- @echo '#include "../lib/lua-$(LUA_VERSION)/src/lua.h"' >> $@	62	- @echo '#include "../$(LUAHEADERS)/lua.h"' >> $@
73	- @sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \	63	- @sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \
74	- < lib/lua-$(LUA_VERSION)/src/lua.h >> $@	64	- < $(LUAHEADERS)/lua.h >> $@
75	- @echo '#include "../lib/lua-$(LUA_VERSION)/src/lualib.h"' >> $@	65	- @echo '#include "../$(LUAHEADERS)/lualib.h"' >> $@
76	- @echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@	66	- @echo '#include "../$(LUAHEADERS)/lauxlib.h"' >> $@
77	+ @echo '#include <lua.h>' >> $@	67	+ @echo '#include <lua.h>' >> $@
78	+ @echo '#include <lualib.h>' >> $@	68	+ @echo '#include <lualib.h>' >> $@
79	+ @echo '#include <lauxlib.h>' >> $@	69	+ @echo '#include <lauxlib.h>' >> $@
80	@echo '/nhlua.h/' >> $@	70	@echo '/nhlua.h/' >> $@
81		71	# LUATESTTARGET is this by default
82	# Note: many of the dependencies below are here to allow parallel make	72	lib/lua-$(LUA_VERSION)/src/lua.h:
83	@@ -234,39 +233,22 @@ dofiles:	73	@@ -258,39 +258,22 @@ dofiles:
84	-e '}' \	74	-e '}' \
85	-e '$$s/.*/nodlb/p' < dat/options` ; \	75	-e '$$s/.*/nodlb/p' < dat/options` ; \
86	$(MAKE) dofiles-$${target-nodlb}	76	$(MAKE) dofiles-$${target-nodlb}
87	- cp src/$(GAME) $(INSTDIR)	77	- cp src/$(GAME) $(INSTDIR)
88	- cp util/recover $(INSTDIR)	78	- cp util/recover $(INSTDIR)
89	- -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi	79	- -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
		80	- if test -n '$(SHELLDIR)'; then \
90	+ cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)	81	+ cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)
91	+ cp util/recover ${DESTDIR}$(INSTDIR)	82	+ cp util/recover ${DESTDIR}$(INSTDIR)
92	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi	83	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
93	if test -n '$(SHELLDIR)'; then \	84	+ if test -n '${DESTDIR}$(SHELLDIR)'; then \
94	sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \	85	sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
95	-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \	86	-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
96	< sys/unix/nethack.sh \	87	< sys/unix/nethack.sh \
Lines 127-148 Link Here
127	#	118	#
128	# This is not part of the dependency build hierarchy.	119	# This is not part of the dependency build hierarchy.
129	# It requires an explicit "make fetch-Lua".	120	# It requires an explicit "make fetch-Lua".
130	@@ -283,13 +265,9 @@ fetch-Lua:	121	@@ -327,25 +310,17 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs
131	update: $(GAME) recover $(VARDAT) spec_levs
132	# (don't yank the old version out from under people who're playing it)
133	-mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old
134	- -mv $(INSTDIR)/nhdat $(INSTDIR)/nhdat.old
135	+ -mv ${DESTDIR}$(INSTDIR)/nhdat ${DESTDIR}$(INSTDIR)/nhdat.old
136	# set up new versions of the game files
137	( $(MAKE) dofiles )
138	-# touch time-sensitive files
139	- -touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
140	- -touch -c $(VARDIR)/save/* $(VARDIR)/whereis/*
141	- touch $(VARDIR)/perm $(VARDIR)/record
142	# and a reminder
143	@echo You may also want to install the man pages via the doc Makefile.
144
145	@@ -300,25 +278,16 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs
146	true; $(PREINSTALL)	122	true; $(PREINSTALL)
147	# set up the directories	123	# set up the directories
148	# not all mkdirs have -p; those that don't will create a -p directory	124	# not all mkdirs have -p; those that don't will create a -p directory
Lines 153-159 Link Here
153	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then \	129	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then \
154	+ mkdir -p ${DESTDIR}$(SHELLDIR); fi	130	+ mkdir -p ${DESTDIR}$(SHELLDIR); fi
155	+ rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)	131	+ rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
156	+ -mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save ${DESTDIR}$(VARDIR)/whereis	132	+ -mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)/save ${DESTDIR}$(VARDIR)/whereis
157	if test -d ./-p; then rmdir ./-p; fi	133	if test -d ./-p; then rmdir ./-p; fi
158	- -$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis	134	- -$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
159	- $(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis	135	- $(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
Lines 163-175 Link Here
163	# set up the game files	139	# set up the game files
164	( $(MAKE) dofiles )	140	( $(MAKE) dofiles )
165	# set up some additional files	141	# set up some additional files
166	- touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile \	142	- touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile \
167	- $(VARDIR)/xlogfile $(VARDIR)/livelog	143	- $(VARDIR)/livelog
168	- -( cd $(VARDIR) ; \	144	- -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile livelog ; \
169	- $(CHOWN) $(GAMEUID) perm record logfile xlogfile livelog ; \	145	- $(CHGRP) $(GAMEGRP) perm record logfile xlogfile livelog ; \
170	- $(CHGRP) $(GAMEGRP) perm record logfile xlogfile livelog ; \	146	- chmod $(VARFILEPERM) perm record logfile xlogfile livelog )
171	- chmod $(VARFILEPERM) perm record logfile xlogfile livelog )	147	- true; $(POSTINSTALL)
172	+ touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile	148	+ touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record \
173	true; $(POSTINSTALL)	149	+ ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile ${DESTDIR}$(VARDIR)/livelog
174	# and a reminder	150	# and a reminder
175	@echo You may also want to reinstall the man pages via the doc Makefile.	151	@echo You may also want to reinstall the man pages via the doc Makefile.
		152

Lines 1-4 Link Here

(-)b/games/xnethack/files/patch-util-makedefs.c (-9 / +9 lines)
1	--- util/makedefs.c.orig 2021-03-22 22:28:14 UTC	1	--- util/makedefs.c.orig 2022-03-07 23:57:15 UTC
2	+++ util/makedefs.c	2	+++ util/makedefs.c
3	@@ -116,6 +116,7 @@ static struct version_info version;	3	@@ -116,6 +116,7 @@ static struct version_info version;
4	#define MAXFNAMELEN 600	4	#define MAXFNAMELEN 600
Lines 8-14 Link Here
8		8
9	#ifdef FILE_PREFIX	9	#ifdef FILE_PREFIX
10	/* if defined, a first argument not starting with - is	10	/* if defined, a first argument not starting with - is
11	@@ -229,6 +230,12 @@ main(int argc, char *argv[])	11	@@ -230,6 +231,12 @@ main(int argc, char *argv[])
12	return 1;	12	return 1;
13	}	13	}
14		14
Lines 21-29 Link Here
21	#ifdef FILE_PREFIX	21	#ifdef FILE_PREFIX
22	if (argc >= 2 && argv[1][0] != '-') {	22	if (argc >= 2 && argv[1][0] != '-') {
23	file_prefix = argv[1];	23	file_prefix = argv[1];
24	@@ -964,12 +971,12 @@ do_rnd_access_file(const char* fname, const char* defl	24	@@ -989,12 +996,12 @@ do_rnd_access_file(
25	more likely to be picked than normal but it's nothing to worry about */	25	Strcat(buf, "\n"); /* so make sure that the default one does too */
26	(void) fputs(xcrypt(deflt_content), ofp);	26	(void) fputs(xcrypt(padline(buf, padlength)), ofp);
27		27
28	- tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);	28	- tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
29	+ tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);	29	+ tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);
Lines 35-42 Link Here
35	+ ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);	35	+ ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
36	#endif	36	#endif
37	while ((line = fgetline(ifp)) != 0) {	37	while ((line = fgetline(ifp)) != 0) {
38	if (line[0] != '#' && line[0] != '\n')	38	if (line[0] != '#' && line[0] != '\n') {
39	@@ -980,7 +987,7 @@ do_rnd_access_file(const char* fname, const char* defl	39	@@ -1007,7 +1014,7 @@ do_rnd_access_file(
40	Fclose(ofp);	40	Fclose(ofp);
41		41
42	#ifdef HAS_NO_MKSTEMP	42	#ifdef HAS_NO_MKSTEMP
Lines 45-51 Link Here
45	#endif	45	#endif
46	return;	46	return;
47	}	47	}
48	@@ -1758,12 +1765,12 @@ do_dungeon(void)	48	@@ -1791,12 +1798,12 @@ do_dungeon(void)
49	}	49	}
50	Fprintf(ofp, "%s", Dont_Edit_Data);	50	Fprintf(ofp, "%s", Dont_Edit_Data);
51		51
Lines 60-66 Link Here
60	#endif	60	#endif
61	while ((line = fgetline(ifp)) != 0) {	61	while ((line = fgetline(ifp)) != 0) {
62	SpinCursor(3);	62	SpinCursor(3);
63	@@ -1779,7 +1786,7 @@ do_dungeon(void)	63	@@ -1812,7 +1819,7 @@ do_dungeon(void)
64	Fclose(ofp);	64	Fclose(ofp);
65		65
66	#ifdef HAS_NO_MKSTEMP	66	#ifdef HAS_NO_MKSTEMP

Lines 79-84 bin/%%HACKNAME%% Link Here

(-)b/games/xnethack/pkg-plist (-1 / +8 lines)
79	%%DATADIR%%/bigrm-1.lua	79	%%DATADIR%%/bigrm-1.lua
80	%%DATADIR%%/bigrm-10.lua	80	%%DATADIR%%/bigrm-10.lua
81	%%DATADIR%%/bigrm-11.lua	81	%%DATADIR%%/bigrm-11.lua
		82	%%DATADIR%%/bigrm-12.lua
82	%%DATADIR%%/bigrm-2.lua	83	%%DATADIR%%/bigrm-2.lua
83	%%DATADIR%%/bigrm-3.lua	84	%%DATADIR%%/bigrm-3.lua
84	%%DATADIR%%/bigrm-4.lua	85	%%DATADIR%%/bigrm-4.lua
Lines 101-110 bin/%%HACKNAME%% Link Here
101	%%DATADIR%%/help	102	%%DATADIR%%/help
102	%%DATADIR%%/hh	103	%%DATADIR%%/hh
103	%%DATADIR%%/history	104	%%DATADIR%%/history
		105	%%DATADIR%%/invocation.lua
104	%%DATADIR%%/juiblex.lua	106	%%DATADIR%%/juiblex.lua
105	%%DATADIR%%/keyhelp	107	%%DATADIR%%/keyhelp
106	%%DATADIR%%/knox.lua	108	%%DATADIR%%/knox.lua
107	%%DATADIR%%/license	109	%%DATADIR%%/license
		110	@sample(games,games,664) %%DATADIR%%/livelog.sample
108	@sample(games,games,664) %%DATADIR%%/logfile.sample	111	@sample(games,games,664) %%DATADIR%%/logfile.sample
109	%%DATADIR%%/medusa-1.lua	112	%%DATADIR%%/medusa-1.lua
110	%%DATADIR%%/medusa-2.lua	113	%%DATADIR%%/medusa-2.lua
Lines 123-131 bin/%%HACKNAME%% Link Here
123	%%DATADIR%%/minetn-6.lua	126	%%DATADIR%%/minetn-6.lua
124	%%DATADIR%%/minetn-7.lua	127	%%DATADIR%%/minetn-7.lua
125	%%DATADIR%%/minetn-8.lua	128	%%DATADIR%%/minetn-8.lua
		129	%%DATADIR%%/nhcore.lua
126	%%DATADIR%%/nhlib.lua	130	%%DATADIR%%/nhlib.lua
		131	%%DATADIR%%/nhtiles.bmp
127	%%DATADIR%%/opthelp	132	%%DATADIR%%/opthelp
128	%%DATADIR%%/options	133	%%DATADIR%%/options
		134	%%DATADIR%%/optmenu
129	%%DATADIR%%/oracle-1.lua	135	%%DATADIR%%/oracle-1.lua
130	%%DATADIR%%/oracle-2.lua	136	%%DATADIR%%/oracle-2.lua
131	%%DATADIR%%/oracle-3.lua	137	%%DATADIR%%/oracle-3.lua
Lines 141-146 bin/%%HACKNAME%% Link Here
141	@mode 02755	147	@mode 02755
142	%%DATADIR%%/recover	148	%%DATADIR%%/recover
143	@mode	149	@mode
		150	%%DATADIR%%/rip.xpm
144	%%DATADIR%%/rumors	151	%%DATADIR%%/rumors
145	%%DATADIR%%/sanctum.lua	152	%%DATADIR%%/sanctum.lua
146	%%DATADIR%%/shirts	153	%%DATADIR%%/shirts
Lines 158-163 bin/%%HACKNAME%% Link Here
158	%%DATADIR%%/tower1.lua	165	%%DATADIR%%/tower1.lua
159	%%DATADIR%%/tower2.lua	166	%%DATADIR%%/tower2.lua
160	%%DATADIR%%/tower3.lua	167	%%DATADIR%%/tower3.lua
		168	%%DATADIR%%/tower4.lua
161	%%DATADIR%%/tribute	169	%%DATADIR%%/tribute
162	%%DATADIR%%/valley.lua	170	%%DATADIR%%/valley.lua
163	%%DATADIR%%/water.lua	171	%%DATADIR%%/water.lua
164	-