head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.22 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.20 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.18 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.16 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.14 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.12 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.10 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.8 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.6 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.4 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.2 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.3.0.30 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.28 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.26 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.24 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.22 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.20 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.18 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.16 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.14 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.12 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.10 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.8 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.6 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.2 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.4 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.2.0.16 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.14 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.12 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.10 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.8 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.6 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.4 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.2 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.1.0.54 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.50 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.48 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.46 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.44 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.42 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.40 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.38 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.36 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.34 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.32 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.30 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.28 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.26 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.24 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.22 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.20 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.18 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.16 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.14 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.12 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.10 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.8 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.6 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.4 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.2 pkgsrc-2011Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2023.09.02.13.45.14; author rhialto; state Exp; branches; next 1.4; commitid sZwdIYDMMYR2ucDE; 1.4 date 2023.08.27.15.59.19; author rhialto; state Exp; branches; next 1.3; commitid 3vjfIobl16u9qrCE; 1.3 date 2019.10.24.11.51.23; author pho; state Exp; branches; next 1.2; commitid oPzx28JwVsMd97IB; 1.2 date 2017.12.14.16.13.31; author jperkin; state Exp; branches; next 1.1; commitid SmXUFE0TcxubqSiA; 1.1 date 2011.06.01.11.20.29; author wiz; state Exp; branches; next ; desc @@ 1.5 log @games/nethack*: enable curses user interface The "nethack" wrapper script that papers over the existence of nethack-tty and nethack-x11 has been made more like the original way to select UIs (since there are now 3, and each game binary supports more than one of them). @ text @$NetBSD: patch-sys_unix_Makefile.src,v 1.4 2023/08/27 15:59:19 rhialto Exp $ Make included UI types configurable. --- sys/unix/Makefile.src.orig 2023-02-15 21:52:57.000000000 +0000 +++ sys/unix/Makefile.src @@@@ -41,7 +41,11 @@@@ SHELL=/bin/sh # SHELL=E:/GEMINI2/MUPFEL.TTP # Usually, the C compiler driver is used for linking: -#LINK=$(CC) +.if "${QT_GRAPHICS}" != "" +LINK=$(CXX) +.else +LINK=$(CC) +.endif # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating # system. @@@@ -169,10 +173,17 @@@@ GNOMEINC=-I/usr/lib/glib/include -I/usr/ # flags for debugging: # CFLAGS = -g -I../include +#CFLAGS += -ggdb +#LFLAGS += -ggdb -#CFLAGS = -O -I../include +CFLAGS += -I../include #LFLAGS = +.if "${X11_GRAPHICS}" != "" || "${QT_GRAPHICS}" != "" +CFLAGS += -I${X11BASE}/include +LFLAGS += ${LDFLAGS} +.endif + # 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. @@@@ -267,13 +278,26 @@@@ WINBEOBJ = #WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o # # -#WINSRC = $(WINTTYSRC) -#WINOBJ = $(WINTTYOBJ) +WINSRC = $(WINTTYSRC) +WINOBJ = $(WINTTYOBJ) # # Curses - Karl Garrison, Tangles #WINSRC = $(WINCURSESSRC) #WINOBJ = $(WINCURSESOBJ) -# + +.if "${CURSES_GRAPHICS}" != "" +WINSRC += $(WINCURSESSRC) +WINOBJ += $(WINCURSESOBJ) +.endif +.if "${X11_GRAPHICS}" != "" +WINSRC += $(WINX11SRC) +WINOBJ += $(WINX11OBJ) +.endif +.if "${QT_GRAPHICS}" != "" +WINSRC += $(WINQT4SRC) +WINOBJ += $(WINQT4OBJ) +.endif + # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead # Sysatt uses shared library in lieu of this option @@@@ -292,14 +316,14 @@@@ WINBEOBJ = # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 +WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm # 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 # # # libraries for Qt 3 -WINQTLIB = -L$(QTDIR)/lib -lqt +WINQTLIB = -L$(QTDIR)/lib -lqt-mt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} # # libraries for Qt 4 WINQT4LIB = `pkg-config QtGui --libs` @@@@ -321,17 +345,28 @@@@ WINBELIB = -lbe # # libraries for curses port # link with ncurses -WINCURSESLIB = -lncurses +#WINCURSESLIB = -lncurses # Set from the pkg Makefile instead # link with pdcurses for SDL, installed in a separate directory #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL # same as above, for XCurses #WINCURSESLIB = -L/usr/local/lib/pdcurses -lXCurses -lXawM -lXmu -lXext -lXt -lX11 # -#WINLIB = $(WINTTYLIB) +WINLIB = $(WINTTYLIB) # # For Curses #WINLIB = $(WINCURSESLIB) # + +.if "${CURSES_GRAPHICS}" != "" +WINLIB += $(WINCURSESLIB) +.endif +.if "${X11_GRAPHICS}" != "" +WINLIB += $(WINX11LIB) +.endif +.if "$(QT_GRAPHICS)" != "" +WINLIB += $(WINQTLIB) +.endif + # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) # @ 1.4 log @games/nethack-lib: enhance patches to make wip/nethack-curses possible. @ text @d1 1 a1 1 $NetBSD: patch-sys_unix_Makefile.src,v 1.3 2019/10/24 11:51:23 pho Exp $ d3 1 a3 1 Make window system configurable. d12 1 a12 1 +.if "${GTYPE}" == "-qt" d20 2 a21 1 @@@@ -170,9 +174,24 @@@@ GNOMEINC=-I/usr/lib/glib/include -I/usr/ d24 2 d31 1 a31 1 +.if "${GTYPE}" == "-x11" || "${GTYPE}" == "-qt" a35 10 +.if "${GTYPE}" == "-tty" +CFLAGS += -DGTYPE_TTY +.elif "${GTYPE}" == "-curses" +CFLAGS += -DGTYPE_CURSES +.elif "${GTYPE}" == "-x11" +CFLAGS += -DGTYPE_X11 +.elif "${GTYPE}" == "-qt" +CFLAGS += -DGTYPE_QT +.endif + d39 1 a39 1 @@@@ -267,13 +286,25 @@@@ WINBEOBJ = d53 1 a53 2 +.if "${GTYPE}" == "-tty" +.elif "${GTYPE}" == "-curses" d56 2 a57 1 +.elif "${GTYPE}" == "-x11" d60 2 a61 1 +.elif "$(GTYPE)" == "-qt" d69 1 a69 1 @@@@ -292,14 +323,14 @@@@ WINBEOBJ = d86 1 a86 2 @@@@ -320,18 +351,27 @@@@ WINGEMLIB = -le_gem -lgem WINBELIB = -lbe d89 1 a89 1 -# link with ncurses d91 1 a91 2 +# link with (n)curses +WINCURSESLIB = -lcurses # or -L${PREFIX}/lib -Wl,-R,${PREFIX}/lib -lncurses d102 1 a102 1 -# d104 1 a104 2 +.if "${GTYPE}" == "-tty" +.elif "${GTYPE}" == "-curses" d106 2 a107 1 +.elif "${GTYPE}" == "-x11" d109 2 a110 1 +.elif "${GTYPE}" == "-qt" @ 1.3 log @Update to NetHack 3.6.2 See release notes for the changes from 3.4.3: * http://nethack.org/v360/release.html * http://nethack.org/v361/release.html * http://nethack.org/v362/release.html IMPORTANT NOTICE: Old 3.4.x save files are *incompatible* with this version (which isn't my fault). Files are now saved in /var/games/nethack360. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Make configurable. d5 1 a5 1 --- sys/unix/Makefile.src.orig 2019-05-08 07:00:16.000000000 +0000 d20 1 a20 1 @@@@ -170,9 +174,22 @@@@ GNOMEINC=-I/usr/lib/glib/include -I/usr/ d35 2 d46 1 a46 1 @@@@ -267,13 +284,22 @@@@ WINBEOBJ = d61 3 d75 1 a75 1 @@@@ -292,14 +318,14 @@@@ WINBEOBJ = d92 10 a101 1 @@@@ -327,11 +353,18 @@@@ WINCURSESLIB = -lncurses d113 2 @ 1.2 log @nethack-lib: Honour CFLAGS, simplify and fix patching. @ text @d1 1 a1 1 $NetBSD: patch-sys_unix_Makefile.src,v 1.1 2011/06/01 11:20:29 wiz Exp $ d5 1 a5 1 --- sys/unix/Makefile.src.orig 2003-12-07 23:39:13.000000000 +0000 d7 1 a7 1 @@@@ -36,7 +36,11 @@@@ SHELL=/bin/sh d10 2 a11 1 # Normally, the C compiler driver is used for linking: d15 1 a15 1 LINK=$(CC) d20 1 a20 1 @@@@ -151,15 +155,27 @@@@ GNOMEINC=-I/usr/lib/glib/include -I/usr/ d24 1 a24 1 -CFLAGS = -O -I../include d26 1 a26 1 LFLAGS = d44 14 a57 11 CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -CXX=g++ -#LINK=g++ +#CXX=g++ # For cross-compiling, eg. with gcc on Linux (see also CC further up): #CXX=arm-linux-g++ #LINK=arm-linux-gcc @@@@ -217,6 +233,15 @@@@ WINBEOBJ = WINSRC = $(WINTTYSRC) WINOBJ = $(WINTTYOBJ) d62 3 a64 3 +.elif "${GTYPE}" == "-qt" +WINSRC += $(WINQTSRC) +WINOBJ += $(WINQTOBJ) d70 1 a70 1 @@@@ -235,13 +260,13 @@@@ WINTTYLIB = -ltermlib d74 1 a74 1 -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 d80 2 a81 1 # libraries for Qt d85 13 a97 6 # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext @@@@ -257,6 +282,13 @@@@ WINBELIB = -lbe WINLIB = $(WINTTYLIB) @ 1.1 log @DESTDIRify nethack. Merge patches and distinfo. Some other improvements. From Rhialto in PR 45010. @ text @d1 1 a1 1 $NetBSD$ d19 6 a24 2 @@@@ -154,12 +158,24 @@@@ GNOMEINC=-I/usr/lib/glib/include -I/usr/ CFLAGS = -O -I../include @