From db94b15fb783719c5d81ea0c038b59ba29ca16e7 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 22 Sep 2026 21:28:03 +0100 Subject: [PATCH] Ports: Update nethack to 5.0.0 Notably HACKDIR now gets placed into /home, saving game state in /var doesn't work anymore as of 439428b464. --- Ports/AvailablePorts.md | 2 +- Ports/nethack/package.sh | 9 +- .../0001-Don-t-use-fcntl-on-serenity.patch | 4 +- .../0002-Use-explicitly-sized-types.patch | 187 ------------------ .../0002-Use-host-tools-where-needed.patch | 91 +++++++++ ...atch => 0003-Add-hints-for-serenity.patch} | 8 +- .../0003-Use-host-tools-where-needed.patch | 165 ---------------- .../0004-Set-the-install-path-correctly.patch | 45 ----- Ports/nethack/patches/ReadMe.md | 14 +- 9 files changed, 103 insertions(+), 422 deletions(-) delete mode 100644 Ports/nethack/patches/0002-Use-explicitly-sized-types.patch create mode 100644 Ports/nethack/patches/0002-Use-host-tools-where-needed.patch rename Ports/nethack/patches/{0005-Add-hints-for-serenity.patch => 0003-Add-hints-for-serenity.patch} (89%) delete mode 100644 Ports/nethack/patches/0003-Use-host-tools-where-needed.patch delete mode 100644 Ports/nethack/patches/0004-Set-the-install-path-correctly.patch diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 57620ca4107..700c5159c98 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -238,7 +238,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`neofetch`](neofetch/) | neofetch | 7.1.0 | https://github.com/dylanaraps/neofetch | | [`neovim`](neovim/) | neovim | 0.12.0 | https://neovim.io/ | | [`nesalizer`](nesalizer/) | Nesalizer | 5bb0458 | https://github.com/ulfalizer/nesalizer | -| [`nethack`](nethack/) | nethack | 3.6.7 | https://www.nethack.org/ | +| [`nethack`](nethack/) | nethack | 5.0.0 | https://www.nethack.org/ | | [`ninja`](ninja/) | Ninja | 1.13.2 | https://ninja-build.org/ | | [`nippon`](nippon/) | Nippon Safes Inc. | 1.0 | https://www.scummvm.org/games/#games-nippon | | [`nlohmann-json`](nlohmann-json/) | JSON for Modern C++ | 3.12.0 | https://json.nlohmann.me/ | diff --git a/Ports/nethack/package.sh b/Ports/nethack/package.sh index 957d2a187c3..4126aaae934 100755 --- a/Ports/nethack/package.sh +++ b/Ports/nethack/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh port='nethack' -version='3.6.7' +version='5.0.0' workdir="NetHack-${version}" files=( - "https://www.nethack.org/download/${version}/nethack-${version//.}-src.tgz#98cf67df6debf9668a61745aa84c09bcab362e5d33f5b944ec5155d44d2aacb2" + "https://www.nethack.org/download/${version}/nethack-${version//.}-src.tgz#2959b7886aac76185b90aea0c9f80d14343f604de0ae96b3dd2a760f7ab3bde9" ) depends=( 'ncurses' @@ -12,14 +12,11 @@ depends=( build() { run sys/unix/setup.sh sys/unix/hints/serenity + run make fetch-lua if [ ! -f ${workdir}/util/makedefs.host ]; then host_env run make -C util makedefs "${makeopts[@]}" run cp util/makedefs util/makedefs.host - run make -C util dgn_comp "${makeopts[@]}" - run cp util/dgn_comp util/dgn_comp.host - run make -C util lev_comp "${makeopts[@]}" - run cp util/lev_comp util/lev_comp.host run make -C util dlb "${makeopts[@]}" run cp util/dlb util/dlb.host target_env diff --git a/Ports/nethack/patches/0001-Don-t-use-fcntl-on-serenity.patch b/Ports/nethack/patches/0001-Don-t-use-fcntl-on-serenity.patch index fb299fab781..953141fbbb9 100644 --- a/Ports/nethack/patches/0001-Don-t-use-fcntl-on-serenity.patch +++ b/Ports/nethack/patches/0001-Don-t-use-fcntl-on-serenity.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Don't use fcntl on serenity 1 file changed, 2 insertions(+) diff --git a/include/unixconf.h b/include/unixconf.h -index c126d68..cafe766 100644 +index e7ee915659b4b791ca286494514a7795d2a82f88..5f1e92a8335f6e81b580325463a0c5cff8a20c15 100644 --- a/include/unixconf.h +++ b/include/unixconf.h -@@ -246,8 +246,10 @@ +@@ -240,8 +240,10 @@ * Comment out the USE_FCNTL if for some reason you have a strange * OS/filesystem combination for which fcntl(2) does not work. */ #ifdef POSIX_TYPES diff --git a/Ports/nethack/patches/0002-Use-explicitly-sized-types.patch b/Ports/nethack/patches/0002-Use-explicitly-sized-types.patch deleted file mode 100644 index 170b9780819..00000000000 --- a/Ports/nethack/patches/0002-Use-explicitly-sized-types.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gunnar Beutner -Date: Sun, 11 Apr 2021 23:15:42 +0200 -Subject: [PATCH] Use explicitly sized types - ---- - include/decl.h | 2 +- - include/global.h | 10 +++++----- - include/qtext.h | 4 ++-- - include/unixconf.h | 1 + - src/region.c | 6 +++--- - src/rumors.c | 12 ++++++------ - util/makedefs.c | 4 ++-- - 7 files changed, 20 insertions(+), 19 deletions(-) - -diff --git a/include/decl.h b/include/decl.h -index c6e298b..749757c 100644 ---- a/include/decl.h -+++ b/include/decl.h -@@ -411,7 +411,7 @@ struct opvar { - xchar spovartyp; /* one of SPOVAR_foo */ - union { - char *str; -- long l; -+ int32_t l; - } vardata; - }; - -diff --git a/include/global.h b/include/global.h -index a2b70d2..93e6933 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -293,11 +293,11 @@ extern char *FDECL(dupstr, (const char *)); /* ditto */ - /* Used for consistency checks of various data files; declare it here so - that utility programs which include config.h but not hack.h can see it. */ - struct version_info { -- unsigned long incarnation; /* actual version number */ -- unsigned long feature_set; /* bitmask of config settings */ -- unsigned long entity_count; /* # of monsters and objects */ -- unsigned long struct_sizes1; /* size of key structs */ -- unsigned long struct_sizes2; /* size of more key structs */ -+ uint32_t incarnation; /* actual version number */ -+ uint32_t feature_set; /* bitmask of config settings */ -+ uint32_t entity_count; /* # of monsters and objects */ -+ uint32_t struct_sizes1; /* size of key structs */ -+ uint32_t struct_sizes2; /* size of more key structs */ - }; - - struct savefile_info { -diff --git a/include/qtext.h b/include/qtext.h -index 7529384..e17e2ea 100644 ---- a/include/qtext.h -+++ b/include/qtext.h -@@ -12,7 +12,7 @@ - struct qtmsg { - int msgnum; - char delivery; -- long offset, size, summary_size; -+ int32_t offset, size, summary_size; - }; - - #ifdef MAKEDEFS_C /***** MAKEDEFS *****/ -@@ -27,7 +27,7 @@ struct msghdr { - struct qthdr { - int n_hdr; - char id[N_HDR][LEN_HDR]; -- long offset[N_HDR]; -+ int32_t offset[N_HDR]; - }; - - /* Error message macros */ -diff --git a/include/unixconf.h b/include/unixconf.h -index cafe766..6aba57a 100644 ---- a/include/unixconf.h -+++ b/include/unixconf.h -@@ -323,6 +323,7 @@ - - #if defined(POSIX_TYPES) || defined(__GNUC__) - #include -+#include - #include - #endif - -diff --git a/src/region.c b/src/region.c -index f0b775d..e88f5a6 100644 ---- a/src/region.c -+++ b/src/region.c -@@ -663,7 +663,7 @@ int mode; - bwrite(fd, (genericptr_t) &n, sizeof n); - if (n > 0) - bwrite(fd, (genericptr_t) regions[i]->leave_msg, n); -- bwrite(fd, (genericptr_t) ®ions[i]->ttl, sizeof(long)); -+ bwrite(fd, (genericptr_t) ®ions[i]->ttl, sizeof(int32_t)); - bwrite(fd, (genericptr_t) ®ions[i]->expire_f, sizeof(short)); - bwrite(fd, (genericptr_t) ®ions[i]->can_enter_f, sizeof(short)); - bwrite(fd, (genericptr_t) ®ions[i]->enter_f, sizeof(short)); -@@ -693,7 +693,7 @@ boolean ghostly; /* If a bones file restore */ - { - int i, j; - unsigned n; -- long tmstamp; -+ int32_t tmstamp; - char *msg_buf; - - clear_regions(); /* Just for security */ -@@ -737,7 +737,7 @@ boolean ghostly; /* If a bones file restore */ - } else - regions[i]->leave_msg = (const char *) 0; - -- mread(fd, (genericptr_t) ®ions[i]->ttl, sizeof(long)); -+ mread(fd, (genericptr_t) ®ions[i]->ttl, sizeof(int32_t)); - /* check for expired region */ - if (regions[i]->ttl >= 0L) - regions[i]->ttl = -diff --git a/src/rumors.c b/src/rumors.c -index ac82b44..e7865b7 100644 ---- a/src/rumors.c -+++ b/src/rumors.c -@@ -54,7 +54,7 @@ static long true_rumor_end, false_rumor_end; - /* oracles are handled differently from rumors... */ - static int oracle_flg = 0; /* -1=>don't use, 0=>need init, 1=>init done */ - static unsigned oracle_cnt = 0; --static unsigned long *oracle_loc = 0; -+static uint32_t *oracle_loc = 0; - - STATIC_OVL void - init_rumors(fp) -@@ -384,7 +384,7 @@ dlb *fp; - (void) dlb_fgets(line, sizeof line, fp); - if (sscanf(line, "%5d\n", &cnt) == 1 && cnt > 0) { - oracle_cnt = (unsigned) cnt; -- oracle_loc = (unsigned long *) alloc((unsigned) cnt * sizeof(long)); -+ oracle_loc = (uint32_t *) alloc((unsigned) cnt * sizeof(uint32_t)); - for (i = 0; i < cnt; i++) { - (void) dlb_fgets(line, sizeof line, fp); - (void) sscanf(line, "%5lx\n", &oracle_loc[i]); -@@ -401,7 +401,7 @@ int fd, mode; - bwrite(fd, (genericptr_t) &oracle_cnt, sizeof oracle_cnt); - if (oracle_cnt) - bwrite(fd, (genericptr_t) oracle_loc, -- oracle_cnt * sizeof(long)); -+ oracle_cnt * sizeof(uint32_t)); - } - if (release_data(mode)) { - if (oracle_cnt) { -@@ -417,8 +417,8 @@ int fd; - { - mread(fd, (genericptr_t) &oracle_cnt, sizeof oracle_cnt); - if (oracle_cnt) { -- oracle_loc = (unsigned long *) alloc(oracle_cnt * sizeof(long)); -- mread(fd, (genericptr_t) oracle_loc, oracle_cnt * sizeof(long)); -+ oracle_loc = (uint32_t *) alloc(oracle_cnt * sizeof(uint32_t)); -+ mread(fd, (genericptr_t) oracle_loc, oracle_cnt * sizeof(uint32_t)); - oracle_flg = 1; /* no need to call init_oracles() */ - } - } -@@ -452,7 +452,7 @@ boolean delphi; - if (oracle_cnt <= 1 && !special) - goto close_oracles; /*(shouldn't happen)*/ - oracle_idx = special ? 0 : rnd((int) oracle_cnt - 1); -- (void) dlb_fseek(oracles, (long) oracle_loc[oracle_idx], SEEK_SET); -+ (void) dlb_fseek(oracles, (int32_t) oracle_loc[oracle_idx], SEEK_SET); - if (!special) /* move offset of very last one into this slot */ - oracle_loc[oracle_idx] = oracle_loc[--oracle_cnt]; - -diff --git a/util/makedefs.c b/util/makedefs.c -index cd971bc..de2757e 100644 ---- a/util/makedefs.c -+++ b/util/makedefs.c -@@ -2626,7 +2626,7 @@ adjust_qt_hdrs() - { - int i, j; - long count = 0L, hdr_offset = sizeof(int) -- + (sizeof(char) * LEN_HDR + sizeof(long)) -+ + (sizeof(char) * LEN_HDR + sizeof(int32_t)) - * qt_hdr.n_hdr; - - for (i = 0; i < qt_hdr.n_hdr; i++) { -@@ -2656,7 +2656,7 @@ put_qt_hdrs() - (void) fwrite((genericptr_t) & (qt_hdr.n_hdr), sizeof(int), 1, ofp); - (void) fwrite((genericptr_t) & (qt_hdr.id[0][0]), sizeof(char) * LEN_HDR, - qt_hdr.n_hdr, ofp); -- (void) fwrite((genericptr_t) & (qt_hdr.offset[0]), sizeof(long), -+ (void) fwrite((genericptr_t) & (qt_hdr.offset[0]), sizeof(int32_t), - qt_hdr.n_hdr, ofp); - if (debug) { - for (i = 0; i < qt_hdr.n_hdr; i++) diff --git a/Ports/nethack/patches/0002-Use-host-tools-where-needed.patch b/Ports/nethack/patches/0002-Use-host-tools-where-needed.patch new file mode 100644 index 00000000000..0738826d380 --- /dev/null +++ b/Ports/nethack/patches/0002-Use-host-tools-where-needed.patch @@ -0,0 +1,91 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Sun, 11 Apr 2021 23:15:42 +0200 +Subject: [PATCH] Use host tools where needed + +--- + sys/unix/Makefile.dat | 14 +++++++------- + sys/unix/Makefile.src | 2 +- + sys/unix/Makefile.top | 2 +- + sys/unix/Makefile.utl | 4 ++-- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat +index 85d40ef53a8e1b0672a3889f111317d420d99622..2d7041be2c437c1537bf7b10e0656b88b900e645 100644 +--- a/sys/unix/Makefile.dat ++++ b/sys/unix/Makefile.dat +@@ -95,25 +95,25 @@ GEM_RSC.RSC: + + + data: data.base ../util/makedefs +- ../util/makedefs -d ++ ../util/makedefs.host -d + + rumors: rumors.tru rumors.fal ../util/makedefs +- ../util/makedefs -r ++ ../util/makedefs.host -r + + oracles: oracles.txt ../util/makedefs +- ../util/makedefs -h ++ ../util/makedefs.host -h + + engrave: engrave.txt ../util/makedefs +- ../util/makedefs -2 ++ ../util/makedefs.host -2 + + epitaph: epitaph.txt ../util/makedefs +- ../util/makedefs -1 ++ ../util/makedefs.host -1 + + bogusmon: bogusmon.txt ../util/makedefs +- ../util/makedefs -3 ++ ../util/makedefs.host -3 + + options: ../util/makedefs +- ../util/makedefs -v ++ ../util/makedefs.host -v + + # these don't actually do anything useful now that levcomp and dngcomp are gone + spec_levs: +diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src +index 863fa096c107950ee4e52a86e65b0292e799e736..ce0f00623432ae7a3b26d74fbd477e65ad7379b8 100644 +--- a/sys/unix/Makefile.src ++++ b/sys/unix/Makefile.src +@@ -793,7 +793,7 @@ $(TARGETPFX)date.o: date.c $(HACK_H) $(HACKCSRC) $(HOBJ) $(TARGET_HACKLIB) + # + ../include/date.h: ../util/makedefs $(VERSOURCES) $(HACK_H) + -$(SHELL) ../sys/unix/gitinfo.sh $(GITINFO) #before 'makedefs -v' +- ../util/makedefs -v ++ ../util/makedefs.host -v + + lint: + # lint cannot have -p here because (i) capitals are meaningful: +diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top +index 5ecca32327ab12f44c6321e056e71b6b4782cf5e..a2967bbf5a22188ef32cedb25fed5b476565dd82 100644 +--- a/sys/unix/Makefile.top ++++ b/sys/unix/Makefile.top +@@ -275,7 +275,7 @@ check-dlb: options + + dlb: + ( cd util ; $(MAKE) dlb ) +- ( cd dat ; LC_ALL=C ; ../util/dlb cf nhdat $(DATDLB) ) ++ ( cd dat ; LC_ALL=C ; ../util/dlb.host cf nhdat $(DATDLB) ) + + wasm: + ( cd src ; $(MAKE) CROSS_TO_WASM=1 ../targets/wasm/nethack.js ) +diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl +index ff064a5d7496ce079db041a9a2435cc21fbf7fa1..9af26abefcf2313fedbeae168d4ceafba017ce46 100644 +--- a/sys/unix/Makefile.utl ++++ b/sys/unix/Makefile.utl +@@ -258,9 +258,9 @@ mdgreph: mdgrep.pl + + # These are for reference purposes only. They aren't required in the build. + ../include/onames.h: makedefs ../include/objects.h +- ./makedefs -o ++ ./makedefs.host -o + ../include/pm.h: makedefs ../include/monsters.h +- ./makedefs -p ++ ./makedefs.host -p + + lintdefs: + @lint -axbh -I../include -DLINT $(MAKESRC) $(CMONOBJ) | sed '/_flsbuf/d' diff --git a/Ports/nethack/patches/0005-Add-hints-for-serenity.patch b/Ports/nethack/patches/0003-Add-hints-for-serenity.patch similarity index 89% rename from Ports/nethack/patches/0005-Add-hints-for-serenity.patch rename to Ports/nethack/patches/0003-Add-hints-for-serenity.patch index 4985e2a8aec..a15506f174a 100644 --- a/Ports/nethack/patches/0005-Add-hints-for-serenity.patch +++ b/Ports/nethack/patches/0003-Add-hints-for-serenity.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Add hints for serenity diff --git a/sys/unix/hints/serenity b/sys/unix/hints/serenity new file mode 100644 -index 0000000..1e0ed46 +index 0000000000000000000000000000000000000000..7a5a570f5dafdc68f63796620bab524206117fc3 --- /dev/null +++ b/sys/unix/hints/serenity @@ -0,0 +1,54 @@ @@ -26,16 +26,16 @@ index 0000000..1e0ed46 + +#PREFIX=/usr +PREFIX=/usr/local -+HACKDIR=/var/games/nethack ++HACKDIR=/home/anon/Games/nethack +SHELLDIR = $(SERENITY_BUILD_DIR)/Root/usr/local/bin -+INSTDIR=$(SERENITY_BUILD_DIR)/Root/usr/local/lib/nethack ++INSTDIR=$(SERENITY_BUILD_DIR)/Root$(HACKDIR) +VARDIR = $(SERENITY_BUILD_DIR)/Root$(HACKDIR) + + + +POSTINSTALL=cp -n sys/unix/sysconf $(VARDIR)/sysconf; $(CHOWN) $(GAMEUID) $(VARDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(VARDIR)/sysconf; chmod $(VARFILEPERM) $(VARDIR)/sysconf; + -+CFLAGS=-g -O -I$(SERENITY_BUILD_DIR)/Root/usr/local/include/ncurses -I../include -DNOTPARMDECL ++CFLAGS=-g -O -I$(SERENITY_BUILD_DIR)/Root/usr/local/include/ncurses -I../include -DNOTPARMDECL -D_XOPEN_SOURCE_EXTENDED +CFLAGS+=-DDLB +CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" +CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE diff --git a/Ports/nethack/patches/0003-Use-host-tools-where-needed.patch b/Ports/nethack/patches/0003-Use-host-tools-where-needed.patch deleted file mode 100644 index ce407cdb0c3..00000000000 --- a/Ports/nethack/patches/0003-Use-host-tools-where-needed.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gunnar Beutner -Date: Sun, 11 Apr 2021 23:15:42 +0200 -Subject: [PATCH] Use host tools where needed - ---- - sys/unix/Makefile.dat | 68 +++++++++++++++++++++---------------------- - sys/unix/Makefile.src | 2 +- - sys/unix/Makefile.top | 2 +- - sys/unix/Makefile.utl | 6 ++-- - 4 files changed, 39 insertions(+), 39 deletions(-) - -diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat -index 00f6043..68344d7 100644 ---- a/sys/unix/Makefile.dat -+++ b/sys/unix/Makefile.dat -@@ -101,69 +101,69 @@ GEM_RSC.RSC: - - - data: data.base ../util/makedefs -- ../util/makedefs -d -+ ../util/makedefs.host -d - - rumors: rumors.tru rumors.fal ../util/makedefs -- ../util/makedefs -r -+ ../util/makedefs.host -r - - quest.dat: quest.txt ../util/makedefs -- ../util/makedefs -q -+ ../util/makedefs.host -q - - oracles: oracles.txt ../util/makedefs -- ../util/makedefs -h -+ ../util/makedefs.host -h - - engrave: engrave.txt ../util/makedefs -- ../util/makedefs -s -+ ../util/makedefs.host -s - - epitaph: epitaph.txt ../util/makedefs -- ../util/makedefs -s -+ ../util/makedefs.host -s - - bogusmon: bogusmon.txt ../util/makedefs -- ../util/makedefs -s -+ ../util/makedefs.host -s - - # note: 'options' should have already been made when include/date.h was created - options: ../util/makedefs -- ../util/makedefs -v -+ ../util/makedefs.host -v - - - spec_levs: ../util/lev_comp \ - bigroom.des castle.des endgame.des gehennom.des knox.des medusa.des \ - mines.des oracle.des sokoban.des tower.des yendor.des -- ../util/lev_comp bigroom.des -- ../util/lev_comp castle.des -- ../util/lev_comp endgame.des -- ../util/lev_comp gehennom.des -- ../util/lev_comp knox.des -- ../util/lev_comp medusa.des -- ../util/lev_comp mines.des -- ../util/lev_comp oracle.des -- ../util/lev_comp sokoban.des -- ../util/lev_comp tower.des -- ../util/lev_comp yendor.des -+ ../util/lev_comp.host bigroom.des -+ ../util/lev_comp.host castle.des -+ ../util/lev_comp.host endgame.des -+ ../util/lev_comp.host gehennom.des -+ ../util/lev_comp.host knox.des -+ ../util/lev_comp.host medusa.des -+ ../util/lev_comp.host mines.des -+ ../util/lev_comp.host oracle.des -+ ../util/lev_comp.host sokoban.des -+ ../util/lev_comp.host tower.des -+ ../util/lev_comp.host yendor.des - touch spec_levs - - quest_levs: ../util/lev_comp \ - Arch.des Barb.des Caveman.des Healer.des Knight.des Monk.des \ - Priest.des Ranger.des Rogue.des Samurai.des Tourist.des Valkyrie.des \ - Wizard.des -- ../util/lev_comp Arch.des -- ../util/lev_comp Barb.des -- ../util/lev_comp Caveman.des -- ../util/lev_comp Healer.des -- ../util/lev_comp Knight.des -- ../util/lev_comp Monk.des -- ../util/lev_comp Priest.des -- ../util/lev_comp Ranger.des -- ../util/lev_comp Rogue.des -- ../util/lev_comp Samurai.des -- ../util/lev_comp Tourist.des -- ../util/lev_comp Valkyrie.des -- ../util/lev_comp Wizard.des -+ ../util/lev_comp.host Arch.des -+ ../util/lev_comp.host Barb.des -+ ../util/lev_comp.host Caveman.des -+ ../util/lev_comp.host Healer.des -+ ../util/lev_comp.host Knight.des -+ ../util/lev_comp.host Monk.des -+ ../util/lev_comp.host Priest.des -+ ../util/lev_comp.host Ranger.des -+ ../util/lev_comp.host Rogue.des -+ ../util/lev_comp.host Samurai.des -+ ../util/lev_comp.host Tourist.des -+ ../util/lev_comp.host Valkyrie.des -+ ../util/lev_comp.host Wizard.des - touch quest_levs - - dungeon: dungeon.def ../util/makedefs ../util/dgn_comp -- ../util/makedefs -e -- ../util/dgn_comp dungeon.pdf -+ ../util/makedefs.host -e -+ ../util/dgn_comp.host dungeon.pdf - - # gitinfo.txt is optionally made by src/Makefile when creating date.h - clean: -diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src -index 47ab9e0..5d94487 100644 ---- a/sys/unix/Makefile.src -+++ b/sys/unix/Makefile.src -@@ -670,7 +670,7 @@ tile.c: ../win/share/tilemap.c $(HACK_H) - # up to date before being executed - ../include/date.h: $(VERSOURCES) $(HACK_H) - -$(SHELL) ../sys/unix/gitinfo.sh $(GITINFO) #before 'makedefs -v' -- ../util/makedefs -v -+ ../util/makedefs.host -v - - - lint: -diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top -index ad7607c..f0ee25d 100644 ---- a/sys/unix/Makefile.top -+++ b/sys/unix/Makefile.top -@@ -188,7 +188,7 @@ check-dlb: options - - dlb: - ( cd util ; $(MAKE) dlb ) -- ( cd dat ; LC_ALL=C ; ../util/dlb cf nhdat $(DATDLB) ) -+ ( cd dat ; LC_ALL=C ; ../util/dlb.host cf nhdat $(DATDLB) ) - - # recover can be used when INSURANCE is defined in include/config.h - # and the checkpoint option is true -diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl -index 78e9d72..1a7efca 100644 ---- a/sys/unix/Makefile.utl -+++ b/sys/unix/Makefile.utl -@@ -239,11 +239,11 @@ mdgreph: mdgrep.pl - perl mdgrep.pl - - ../include/onames.h: makedefs -- ./makedefs -o -+ ./makedefs.host -o - ../include/pm.h: makedefs -- ./makedefs -p -+ ./makedefs.host -p - ../include/vis_tab.h: makedefs -- ./makedefs -z -+ ./makedefs.host -z - # makedefs -z makes both vis_tab.h and vis_tab.c, but writes the .h first - ../src/vis_tab.c: ../include/vis_tab.h - diff --git a/Ports/nethack/patches/0004-Set-the-install-path-correctly.patch b/Ports/nethack/patches/0004-Set-the-install-path-correctly.patch deleted file mode 100644 index 1a76b448456..00000000000 --- a/Ports/nethack/patches/0004-Set-the-install-path-correctly.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gunnar Beutner -Date: Thu, 15 Apr 2021 15:43:18 +0200 -Subject: [PATCH] Set the install path correctly - ---- - sys/unix/Makefile.top | 4 ++-- - sys/unix/nethack.sh | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top -index f0ee25d..1dc6e9c 100644 ---- a/sys/unix/Makefile.top -+++ b/sys/unix/Makefile.top -@@ -223,9 +223,9 @@ dofiles: - chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi - - dofiles-dlb: check-dlb -- ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) ) -+ ( cd dat ; cp nhdat $(DATNODLB) $(VARDIR) ) - # set up their permissions -- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \ -+ -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \ - $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \ - chmod $(FILEPERM) nhdat $(DATNODLB) ) - -diff --git a/sys/unix/nethack.sh b/sys/unix/nethack.sh -index 2c2b62c..70857b6 100755 ---- a/sys/unix/nethack.sh -+++ b/sys/unix/nethack.sh -@@ -1,11 +1,11 @@ --#!/bin/sh -+#!/bin/bash - # NetHack 3.6 nethack.sh $NHDT-Date: 1552425075 2019/03/12 21:11:15 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.20 $ - # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland - # NetHack may be freely redistributed. See license for details. - --HACKDIR=/usr/games/lib/nethackdir -+HACKDIR=/var/games/nethack/ - export HACKDIR --HACK=$HACKDIR/nethack -+HACK=/usr/local/lib/nethack/nethack - - # Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH - case "x$XUSERFILESEARCHPATH" in diff --git a/Ports/nethack/patches/ReadMe.md b/Ports/nethack/patches/ReadMe.md index f36e3776135..1e25653a3af 100644 --- a/Ports/nethack/patches/ReadMe.md +++ b/Ports/nethack/patches/ReadMe.md @@ -5,22 +5,12 @@ Don't use fcntl on serenity -## `0002-Use-explicitly-sized-types.patch` - -Use explicitly sized types - - -## `0003-Use-host-tools-where-needed.patch` +## `0002-Use-host-tools-where-needed.patch` Use host tools where needed -## `0004-Set-the-install-path-correctly.patch` - -Set the install path correctly - - -## `0005-Add-hints-for-serenity.patch` +## `0003-Add-hints-for-serenity.patch` Add hints for serenity