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

(-)b/games/nethack36/Makefile (-3 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	nethack36
4
PORTNAME=	nethack36
5
PORTVERSION=	3.6.2
5
PORTVERSION=	3.6.4
6
PORTREVISION=	1
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	https://nethack.org/download/${PORTVERSION}/
7
MASTER_SITES=	https://nethack.org/download/${PORTVERSION}/
9
DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
8
DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
Lines 18-24 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Link Here
18
17
19
USES=		alias compiler:c11 gmake ncurses tar:tgz
18
USES=		alias compiler:c11 gmake ncurses tar:tgz
20
19
21
WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION}
20
WRKSRC=		${WRKDIR}/NetHack-NetHack-${PORTVERSION}_Released
22
21
23
MAKE_ENV=	GRAPHICS="${GRAPHICS}"
22
MAKE_ENV=	GRAPHICS="${GRAPHICS}"
24
PLIST_SUB=	HACKNAME="${HACKNAME}" \
23
PLIST_SUB=	HACKNAME="${HACKNAME}" \
(-)b/games/nethack36/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1557992328
1
TIMESTAMP = 1577684548
2
SHA256 (nethack-362-src.tgz) = fbd00ada6a4ee347ecd4a350a5b2995b4b4ab5dcc63881b3bc4485b0479ddb1d
2
SHA256 (nethack-364-src.tgz) = 0531ab8466032611d61f702cb71fb3ceca78a7a4918885c1b4f2f17cb57dbd59
3
SIZE (nethack-362-src.tgz) = 4908750
3
SIZE (nethack-364-src.tgz) = 5573777
(-)a/games/nethack36/files/patch-dgn_comp.6 (-11 lines)
Removed Link Here
1
--- doc/dgn_comp.6.orig	Mon Apr 12 09:28:09 2004
2
+++ doc/dgn_comp.6	Mon Apr 12 09:28:33 2004
3
@@ -396,7 +396,7 @@
4
 M. Stephenson (from the level compiler by Jean-Christophe Collet).
5
 .SH "SEE ALSO"
6
 .PP
7
-lev_comp(6), nethack(6)
8
+lev_comp%%HACKEXT%%(6), %%HACKNAME%%(6)
9
 .SH BUGS
10
 .PP
11
 Probably infinite.
(-)a/games/nethack36/files/patch-dlb.6 (-11 lines)
Removed Link Here
1
--- doc/dlb.6.orig	Mon Apr 12 09:28:09 2004
2
+++ doc/dlb.6	Mon Apr 12 09:28:54 2004
3
@@ -74,7 +74,7 @@
4
 Kenneth Lorber
5
 .SH "SEE ALSO"
6
 .PP
7
-nethack(6), tar(1)
8
+%%HACKNAME%%(6), tar(1)
9
 .SH BUGS
10
 .PP
11
 Not a good tar emulation; - does not mean stdin or stdout.
(-)b/games/nethack36/files/patch-doc_dgn__comp.6 (+11 lines)
Added Link Here
1
--- doc/dgn_comp.6.orig	2019-12-18 20:29:40 UTC
2
+++ doc/dgn_comp.6
3
@@ -409,7 +409,7 @@ it is in only applies to non-special levels within tha
4
 M. Stephenson (from the level compiler by Jean-Christophe Collet).
5
 .SH "SEE ALSO"
6
 .PP
7
-lev_comp(6), nethack(6)
8
+lev_comp36(6), nethack36(6)
9
 .SH BUGS
10
 .PP
11
 Probably infinite.
(-)b/games/nethack36/files/patch-doc_dlb.6 (+11 lines)
Added Link Here
1
--- doc/dlb.6.orig	2019-12-18 20:29:40 UTC
2
+++ doc/dlb.6
3
@@ -96,7 +96,7 @@ List the contents of the archive 'foo':
4
 Kenneth Lorber
5
 .SH "SEE ALSO"
6
 .PP
7
-nethack(6), tar(1)
8
+nethack36(6), tar(1)
9
 .SH BUGS
10
 .PP
11
 Not a good tar emulation; - does not mean stdin or stdout.
(-)b/games/nethack36/files/patch-doc_lev__comp.6 (+11 lines)
Added Link Here
1
--- doc/lev_comp.6.orig	2019-12-18 20:29:40 UTC
2
+++ doc/lev_comp.6
3
@@ -577,7 +577,7 @@ level, regardless of the placement of the current MAP 
4
 Jean-Christophe Collet, David Cohrs.
5
 .SH "SEE ALSO"
6
 .PP
7
-dgn_comp(6), nethack(6)
8
+dgn_comp36(6), nethack36(6)
9
 .SH BUGS
10
 .PP
11
 Probably infinite.
(-)b/games/nethack36/files/patch-doc_nethack.6 (-10 / +10 lines)
Lines 1-38 Link Here
1
--- doc/nethack.6.orig	2018-04-27 05:07:22.000000000 -0700
1
--- doc/nethack.6.orig	2019-12-18 20:29:40 UTC
2
+++ doc/nethack.6	2019-03-12 14:51:23.925413000 -0700
2
+++ doc/nethack.6
3
@@ -17,7 +17,7 @@
3
@@ -17,7 +17,7 @@ nethack \- Exploring The Mazes of Menace
4
 .SH SYNOPSIS
4
 .SH SYNOPSIS
5
 .na
5
 .na
6
 .hy 0
6
 .hy 0
7
-.B nethack
7
-.B nethack
8
+.B %%HACKNAME%%
8
+.B nethack36
9
 [
9
 [
10
 .B \-d
10
 .B \-d
11
 .I directory
11
 .I directory
12
@@ -216,7 +216,7 @@
12
@@ -219,7 +219,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
16
-(usually /usr/games/lib/nethackdir).
16
-(usually /usr/games/lib/nethackdir).
17
+(usually %%HACKDIR%%).
17
+(usually /usr/local/share/nethack36).
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
@@ -258,7 +258,7 @@
21
@@ -265,7 +265,7 @@ name is '.nethackrc' 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,
25
-normally /usr/games/lib/nethackdir.
25
-normally /usr/games/lib/nethackdir.
26
+normally %%HACKDIR%%.
26
+normally /usr/local/share/nethack36.
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
@@ -386,7 +386,7 @@
30
@@ -393,7 +393,7 @@ SHOPTYPE and SPLEVTYPE can be used in debugging (wizar
31
 DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
31
 DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
32
 .SH "SEE ALSO"
32
 .SH "SEE ALSO"
33
 .PP
33
 .PP
34
-dgn_comp(6), lev_comp(6), recover(6)
34
-dgn_comp(6), lev_comp(6), recover(6)
35
+dgn_comp%%HACKEXT%%(6), lev_comp%%HACKEXT%%(6), recover%%HACKEXT%%(6)
35
+dgn_comp36(6), lev_comp36(6), recover36(6)
36
 .SH BUGS
36
 .SH BUGS
37
 .PP
37
 .PP
38
 Probably infinite.
38
 Probably infinite.
(-)b/games/nethack36/files/patch-doc_recover.6 (-7 / +7 lines)
Lines 1-20 Link Here
1
--- doc/recover.6.orig	Mon Apr 12 09:28:09 2004
1
--- doc/recover.6.orig	2019-12-18 20:29:40 UTC
2
+++ doc/recover.6	Mon Apr 12 09:31:27 2004
2
+++ doc/recover.6
3
@@ -31,7 +31,7 @@
3
@@ -43,7 +43,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
7
-(usually /usr/games/lib/nethackdir).
7
-(usually /usr/games/lib/nethackdir).
8
+(usually %%HACKDIR%%).
8
+(usually /usr/local/share/nethack36).
9
 .PP
9
 .PP
10
 ^?ALLDOCS
10
 For recovery to be possible,
11
 For recovery to be possible,
11
 .I nethack
12
@@ -130,7 +130,7 @@ but even a compression-using
12
@@ -103,7 +103,7 @@
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"
16
-nethack(6)
16
-nethack(6)
17
+%%HACKNAME%%(6)
17
+nethack36(6)
18
 .SH BUGS
18
 .SH BUGS
19
 .PP
19
 .PP
20
 .I recover
20
 .I recover
(-)b/games/nethack36/files/patch-include_config.h (-9 / +9 lines)
Lines 1-6 Link Here
1
--- include/config.h.orig	2018-04-27 05:07:22.000000000 -0700
1
--- include/config.h.orig	2019-12-18 20:29:40 UTC
2
+++ include/config.h	2019-04-26 07:32:12.113908000 -0700
2
+++ include/config.h
3
@@ -256,11 +256,11 @@
3
@@ -263,11 +263,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-32 Link Here
16
 #endif
16
 #endif
17
 
17
 
18
 #ifndef COMPRESS
18
 #ifndef COMPRESS
19
@@ -345,7 +345,7 @@
19
@@ -352,7 +352,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
23
-#define HACKDIR "/usr/games/lib/nethackdir"
23
-#define HACKDIR "/usr/games/lib/nethackdir"
24
+#define HACKDIR "%%PREFIX%%/share/nethack"
24
+#define HACKDIR "/usr/local/share/nethack"
25
 #endif
25
 #endif
26
 
26
 
27
 /*
27
 /*
28
@@ -520,7 +520,7 @@
28
@@ -543,7 +543,7 @@ typedef unsigned char uchar;
29
    (within the same session) */
29
    whole thing, then type a new end for the text. */
30
 /* #define EDIT_GETLIN */
30
 /* #define EDIT_GETLIN */
31
 
31
 
32
-/* #define DUMPLOG */  /* End-of-game dump logs */
32
-/* #define DUMPLOG */  /* End-of-game dump logs */
Lines 34-40 Link Here
34
 #ifdef DUMPLOG
34
 #ifdef DUMPLOG
35
 
35
 
36
 #ifndef DUMPLOG_MSG_COUNT
36
 #ifndef DUMPLOG_MSG_COUNT
37
@@ -528,7 +528,7 @@
37
@@ -551,7 +551,7 @@ typedef unsigned char uchar;
38
 #endif
38
 #endif
39
 
39
 
40
 #ifndef DUMPLOG_FILE
40
 #ifndef DUMPLOG_FILE
Lines 42-45 Link Here
42
+#define DUMPLOG_FILE        "/tmp/nethack.%v.%u.%n.%D.log"
42
+#define DUMPLOG_FILE        "/tmp/nethack.%v.%u.%n.%D.log"
43
 /* DUMPLOG_FILE allows following placeholders:
43
 /* DUMPLOG_FILE allows following placeholders:
44
    %% literal '%'
44
    %% literal '%'
45
    %v version (eg. "3.6.1-0")
45
    %v version (eg. "3.6.3-0")
(-)b/games/nethack36/files/patch-include_system.h (-2 / +2 lines)
Lines 1-6 Link Here
1
--- include/system.h.orig	2015-12-07 08:26:01 UTC
1
--- include/system.h.orig	2019-12-18 20:29:40 UTC
2
+++ include/system.h
2
+++ include/system.h
3
@@ -81,7 +81,9 @@ typedef long off_t;
3
@@ -82,7 +82,9 @@ typedef long off_t;
4
 #if !defined(__SC__) && !defined(LINUX)
4
 #if !defined(__SC__) && !defined(LINUX)
5
 E long NDECL(random);
5
 E long NDECL(random);
6
 #endif
6
 #endif
(-)b/games/nethack36/files/patch-include_unixconf.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- include/unixconf.h.orig	2015-11-17 10:54:25 UTC
1
--- include/unixconf.h.orig	2019-12-18 20:29:40 UTC
2
+++ include/unixconf.h
2
+++ include/unixconf.h
3
@@ -19,13 +19,13 @@
3
@@ -20,13 +20,13 @@
4
  */
4
  */
5
 
5
 
6
 /* define exactly one of the following four choices */
6
 /* define exactly one of the following four choices */
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
@@ -297,7 +297,7 @@
19
@@ -330,7 +330,7 @@
20
 #endif
20
 #endif
21
 
21
 
22
 #if defined(BSD) || defined(ULTRIX)
22
 #if defined(BSD) || defined(ULTRIX)
(-)a/games/nethack36/files/patch-lev_comp.6 (-11 lines)
Removed Link Here
1
--- doc/lev_comp.6.orig	Mon Apr 12 09:28:09 2004
2
+++ doc/lev_comp.6	Mon Apr 12 09:29:20 2004
3
@@ -563,7 +563,7 @@
4
 Jean-Christophe Collet, David Cohrs.
5
 .SH "SEE ALSO"
6
 .PP
7
-dgn_comp(6), nethack(6)
8
+dgn_comp%%HACKEXT%%(6), %%HACKNAME%%(6)
9
 .SH BUGS
10
 .PP
11
 Probably infinite.
(-)a/games/nethack36/files/patch-qt_win.cpp (-14 lines)
Removed Link Here
1
--- win/Qt/qt_win.cpp.orig	Tue Oct 14 11:29:05 2003
2
+++ win/Qt/qt_win.cpp	Tue Oct 14 11:29:52 2003
3
@@ -75,6 +75,11 @@
4
 #undef yn
5
 #endif
6
 
7
+#ifdef Invisible
8
+/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
9
+#undef Invisible
10
+#endif
11
+
12
 #include "qt_win.h"
13
 #include <qregexp.h>
14
 #include <qpainter.h>
(-)b/games/nethack36/files/patch-src_files.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/files.c.orig	2015-12-07 08:26:01 UTC
1
--- src/files.c.orig	2019-12-18 20:29:40 UTC
2
+++ src/files.c
2
+++ src/files.c
3
@@ -40,6 +40,7 @@ const
3
@@ -43,6 +43,7 @@ const
4
 
4
 
5
 #if defined(UNIX) && defined(QT_GRAPHICS)
5
 #if defined(UNIX) && defined(QT_GRAPHICS)
6
 #include <sys/types.h>
6
 #include <sys/types.h>
(-)b/games/nethack36/files/patch-sys_unix_Makefile.doc (-11 / +11 lines)
Lines 1-12 Link Here
1
--- ./sys/unix/Makefile.doc.orig	2015-06-12 08:32:45.000000000 +0200
1
--- sys/unix/Makefile.doc.orig	2019-12-18 20:29:40 UTC
2
+++ ./sys/unix/Makefile.doc	2016-01-20 14:52:36.968982348 +0100
2
+++ sys/unix/Makefile.doc
3
@@ -57,17 +57,17 @@
3
@@ -61,17 +61,17 @@ Guidebook.dvi:	Guidebook.tex
4
 	latex Guidebook.tex
4
 	latex Guidebook.tex
5
 
5
 
6
 
6
 
7
-GAME	= nethack
7
-GAME	= nethack
8
-MANDIR	= /usr/man/man6
8
-MANDIR	= /usr/man/man6
9
+GAME	= nethack%%HACKEXT%%
9
+GAME	= nethack36
10
+MANDIR	= ${PREFIX}/man/man
10
+MANDIR	= ${PREFIX}/man/man
11
 MANEXT	= 6
11
 MANEXT	= 6
12
 
12
 
Lines 26-32 Link Here
26
 # manual installation for most SYSV-style systems
26
 # manual installation for most SYSV-style systems
27
 # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
27
 # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
28
 # LEVMANCREATE = cat lev_comp.6 | $(NHGREP) | nroff -man - >
28
 # LEVMANCREATE = cat lev_comp.6 | $(NHGREP) | nroff -man - >
29
@@ -77,12 +77,12 @@
29
@@ -81,12 +81,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP) >
30
 # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
30
 # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
31
 
31
 
32
 manpages:
32
 manpages:
Lines 36-47 Link Here
36
-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
36
-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
37
-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
37
-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
38
-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
38
-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
39
+	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/nethack%%HACKEXT%%.$(MANEXT)
39
+	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/nethack36.$(MANEXT)
40
+	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp%%HACKEXT%%.$(MANEXT)
40
+	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp36.$(MANEXT)
41
+	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp%%HACKEXT%%.$(MANEXT)
41
+	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp36.$(MANEXT)
42
+	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover%%HACKEXT%%.$(MANEXT)
42
+	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover36.$(MANEXT)
43
+	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb%%HACKEXT%%.$(MANEXT)
43
+	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb36.$(MANEXT)
44
+	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs%%HACKEXT%%.$(MANEXT)
44
+	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs36.$(MANEXT)
45
 
45
 
46
 # manual creation for distribution
46
 # manual creation for distribution
47
 DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
47
 DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
(-)b/games/nethack36/files/patch-sys_unix_Makefile.src (-12 / +12 lines)
Lines 1-6 Link Here
1
--- sys/unix/Makefile.src.orig	2019-05-08 00:00:16.000000000 -0700
1
--- sys/unix/Makefile.src.orig	2019-12-18 20:29:40 UTC
2
+++ sys/unix/Makefile.src	2019-05-16 08:16:17.494864000 -0700
2
+++ sys/unix/Makefile.src
3
@@ -165,13 +165,24 @@
3
@@ -165,13 +165,24 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixr
4
 # directories.  The ones given below is the usual spot for linux systems.
4
 # directories.  The ones given below is the usual spot for linux systems.
5
 # The paths are for glibconfig.h and gnomesupport.h respectively.
5
 # The paths are for glibconfig.h and gnomesupport.h respectively.
6
 #
6
 #
Lines 26-32 Link Here
26
 
26
 
27
 # The Qt and Be window systems are written in C++, while the rest of
27
 # The Qt and Be window systems are written in C++, while the rest of
28
 # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
28
 # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
29
@@ -273,6 +284,29 @@
29
@@ -273,6 +284,29 @@ WINBEOBJ =
30
 # Curses - Karl Garrison, Tangles
30
 # Curses - Karl Garrison, Tangles
31
 #WINSRC = $(WINCURSESSRC)
31
 #WINSRC = $(WINCURSESSRC)
32
 #WINOBJ = $(WINCURSESOBJ)
32
 #WINOBJ = $(WINCURSESOBJ)
Lines 56-62 Link Here
56
 #
56
 #
57
 # on some systems the termcap library is in -ltermcap or -lcurses
57
 # on some systems the termcap library is in -ltermcap or -lcurses
58
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
58
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
59
@@ -289,6 +323,7 @@
59
@@ -289,6 +323,7 @@ WINBEOBJ =
60
 # WINTTYLIB = -lcurses16
60
 # WINTTYLIB = -lcurses16
61
 # WINTTYLIB = -lncurses
61
 # WINTTYLIB = -lncurses
62
 #WINTTYLIB = -ltermlib
62
 #WINTTYLIB = -ltermlib
Lines 64-70 Link Here
64
 #
64
 #
65
 # libraries for X11
65
 # libraries for X11
66
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
66
 # If USE_XPM is defined in config.h, you will also need -lXpm here.
67
@@ -296,10 +331,12 @@
67
@@ -296,10 +331,12 @@ WINBEOBJ =
68
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
68
 # WINX11LIB = -lXaw -lXmu -lXt -lX11
69
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
69
 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
70
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
70
 # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
Lines 78-84 Link Here
78
 #
78
 #
79
 # libraries for Qt 4
79
 # libraries for Qt 4
80
 WINQT4LIB = `pkg-config QtGui --libs`
80
 WINQT4LIB = `pkg-config QtGui --libs`
81
@@ -311,7 +348,8 @@
81
@@ -311,7 +348,8 @@ WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedi
82
 WINKDELIB = -lkdecore -lkdeui -lXext
82
 WINKDELIB = -lkdecore -lkdeui -lXext
83
 #
83
 #
84
 # libraries for Gnome
84
 # libraries for Gnome
Lines 88-94 Link Here
88
 #
88
 #
89
 # libraries for Gem port
89
 # libraries for Gem port
90
 WINGEMLIB = -le_gem -lgem
90
 WINGEMLIB = -le_gem -lgem
91
@@ -321,7 +359,7 @@
91
@@ -321,7 +359,7 @@ WINBELIB = -lbe
92
 #
92
 #
93
 # libraries for curses port
93
 # libraries for curses port
94
 # link with ncurses
94
 # link with ncurses
Lines 97-103 Link Here
97
 # link with pdcurses for SDL, installed in a separate directory
97
 # link with pdcurses for SDL, installed in a separate directory
98
 #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL
98
 #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL
99
 # same as above, for XCurses
99
 # same as above, for XCurses
100
@@ -331,6 +369,18 @@
100
@@ -331,6 +369,18 @@ WINCURSESLIB = -lncurses
101
 #
101
 #
102
 # For Curses
102
 # For Curses
103
 #WINLIB = $(WINCURSESLIB)
103
 #WINLIB = $(WINCURSESLIB)
Lines 116-131 Link Here
116
 #
116
 #
117
 # any other strange libraries your system needs (for Sysunix only -- the more
117
 # any other strange libraries your system needs (for Sysunix only -- the more
118
 # specialized targets should already be right)
118
 # specialized targets should already be right)
119
@@ -363,7 +413,7 @@
119
@@ -363,7 +413,7 @@ WINCURSESLIB = -lncurses
120
 LIBS =
120
 LIBS =
121
 
121
 
122
 # make NetHack
122
 # make NetHack
123
-GAME     = nethack
123
-GAME     = nethack
124
+GAME     = nethack%%HACKEXT%%
124
+GAME     = nethack36
125
 # GAME     = nethack.prg
125
 # GAME     = nethack.prg
126
 
126
 
127
 # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
127
 # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
128
@@ -597,13 +647,13 @@
128
@@ -597,13 +647,13 @@ objects.o:
129
 
129
 
130
 # Qt 3 windowport meta-object-compiler output
130
 # Qt 3 windowport meta-object-compiler output
131
 qt_kde0.moc: ../include/qt_kde0.h
131
 qt_kde0.moc: ../include/qt_kde0.h
(-)b/games/nethack36/files/patch-sys_unix_Makefile.top (-9 / +9 lines)
Lines 1-11 Link Here
1
--- sys/unix/Makefile.top.orig	2018-04-27 05:07:22.000000000 -0700
1
--- sys/unix/Makefile.top.orig	2019-12-18 20:29:40 UTC
2
+++ sys/unix/Makefile.top	2019-03-12 15:05:31.025765000 -0700
2
+++ sys/unix/Makefile.top
3
@@ -20,18 +20,18 @@
3
@@ -20,18 +20,18 @@ NHSROOT=.
4
 
4
 
5
 # make NetHack
5
 # make NetHack
6
 #PREFIX	 = /usr
6
 #PREFIX	 = /usr
7
-GAME     = nethack
7
-GAME     = nethack
8
+GAME     = nethack%%HACKEXT%%
8
+GAME     = nethack36
9
 # GAME     = nethack.prg
9
 # GAME     = nethack.prg
10
 #GAMEUID  = games
10
 #GAMEUID  = games
11
-#GAMEGRP  = bin
11
-#GAMEGRP  = bin
Lines 24-36 Link Here
24
 # VARDIRPERM = 0755
24
 # VARDIRPERM = 0755
25
 
25
 
26
 # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
26
 # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
27
@@ -41,10 +41,11 @@
27
@@ -41,10 +41,11 @@ DIRPERM  = 0755
28
 # therefore there should not be anything in HACKDIR that you want to keep
28
 # therefore there should not be anything in HACKDIR that you want to keep
29
 # (if there is, you'll have to do the installation by hand or modify the
29
 # (if there is, you'll have to do the installation by hand or modify the
30
 # instructions)
30
 # instructions)
31
-#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
31
-#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
32
-#VARDIR  = $(HACKDIR)
32
-#VARDIR  = $(HACKDIR)
33
+HACKDIR  = ${PREFIX}/share/nethack%%HACKEXT%%
33
+HACKDIR  = ${PREFIX}/share/nethack36
34
+VARDIR  = $(HACKDIR)
34
+VARDIR  = $(HACKDIR)
35
+INSTDIR = $(HACKDIR)
35
+INSTDIR = $(HACKDIR)
36
 # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
36
 # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
Lines 39-45 Link Here
39
 
39
 
40
 # per discussion in Install.X11 and Install.Qt
40
 # per discussion in Install.X11 and Install.Qt
41
 #VARDATND = 
41
 #VARDATND = 
42
@@ -55,7 +56,7 @@
42
@@ -55,7 +56,7 @@ DIRPERM  = 0755
43
 # for BeOS
43
 # for BeOS
44
 # VARDATND = beostiles
44
 # VARDATND = beostiles
45
 # for Gnome
45
 # for Gnome
Lines 48-54 Link Here
48
 
48
 
49
 VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
49
 VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
50
 VARDAT = $(VARDATD) $(VARDATND)
50
 VARDAT = $(VARDATD) $(VARDATND)
51
@@ -203,52 +204,33 @@
51
@@ -203,52 +204,33 @@ dofiles:
52
 		-e '}' 					\
52
 		-e '}' 					\
53
 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
53
 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
54
 	$(MAKE) dofiles-$${target-nodlb}
54
 	$(MAKE) dofiles-$${target-nodlb}
Lines 110-116 Link Here
110
 	touch $(VARDIR)/perm $(VARDIR)/record
110
 	touch $(VARDIR)/perm $(VARDIR)/record
111
 # and a reminder
111
 # and a reminder
112
 	@echo You may also want to install the man pages via the doc Makefile.
112
 	@echo You may also want to install the man pages via the doc Makefile.
113
@@ -260,23 +242,16 @@
113
@@ -260,23 +242,16 @@ install: rootcheck $(GAME) recover $(VARDAT) dungeon s
114
 	true; $(PREINSTALL)
114
 	true; $(PREINSTALL)
115
 # set up the directories
115
 # set up the directories
116
 # not all mkdirs have -p; those that don't will create a -p directory
116
 # not all mkdirs have -p; those that don't will create a -p directory
(-)b/games/nethack36/files/patch-sys_unix_Makefile.utl (-4 / +4 lines)
Lines 1-6 Link Here
1
--- sys/unix/Makefile.utl.orig	2015-12-07 08:26:01 UTC
1
--- sys/unix/Makefile.utl.orig	2019-12-18 20:29:40 UTC
2
+++ sys/unix/Makefile.utl
2
+++ sys/unix/Makefile.utl
3
@@ -92,8 +92,18 @@ NHSROOT=..
3
@@ -94,8 +94,18 @@ NHSROOT=..
4
 # flags for debugging:
4
 # flags for debugging:
5
 # CFLAGS = -g -I../include
5
 # CFLAGS = -g -I../include
6
 
6
 
Lines 19-23 Link Here
19
+
19
+
20
+LFLAGS =
20
+LFLAGS =
21
 
21
 
22
 LIBS =
22
 # we specify C preprocessor flags via CFLAGS; files built with default rules
23
 
23
 # might include $(CPPFLAGS) which could get a value from user's environment;
(-)b/games/nethack36/files/patch-sys_unix_sysconf (-3 / +3 lines)
Lines 1-6 Link Here
1
--- sys/unix/sysconf.orig	2019-05-09 08:15:39.750365000 -0700
1
--- sys/unix/sysconf.orig	2019-12-18 20:29:40 UTC
2
+++ sys/unix/sysconf	2019-05-09 08:16:22.900472000 -0700
2
+++ sys/unix/sysconf
3
@@ -98,7 +98,7 @@
3
@@ -103,7 +103,7 @@ MAXPLAYERS=10
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
(-)b/games/nethack36/files/patch-util_makedefs.c (-8 / +8 lines)
Lines 1-6 Link Here
1
--- util/makedefs.c.orig	2019-05-08 00:00:16.000000000 -0700
1
--- util/makedefs.c.orig	2019-12-18 20:29:40 UTC
2
+++ util/makedefs.c	2019-05-16 08:21:09.868001000 -0700
2
+++ util/makedefs.c
3
@@ -139,6 +139,7 @@
3
@@ -139,6 +139,7 @@ static char xclear[MAX_ROW][MAX_COL];
4
 #define MAXFNAMELEN 600
4
 #define MAXFNAMELEN 600
5
 
5
 
6
 static char filename[MAXFNAMELEN];
6
 static char filename[MAXFNAMELEN];
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
@@ -272,6 +273,12 @@
11
@@ -279,6 +280,12 @@ char *argv[];
12
         return 1;
12
         return 1;
13
     }
13
     }
14
 
14
 
Lines 21-27 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
@@ -967,9 +974,9 @@
24
@@ -974,9 +981,9 @@ const char *fname;
25
     }
25
     }
26
     Fprintf(ofp, "%s", Dont_Edit_Data);
26
     Fprintf(ofp, "%s", Dont_Edit_Data);
27
 
27
 
Lines 33-39 Link Here
33
 
33
 
34
     while ((line = fgetline(ifp)) != 0) {
34
     while ((line = fgetline(ifp)) != 0) {
35
         if (line[0] != '#' && line[0] != '\n')
35
         if (line[0] != '#' && line[0] != '\n')
36
@@ -979,7 +986,7 @@
36
@@ -986,7 +993,7 @@ const char *fname;
37
     Fclose(ifp);
37
     Fclose(ifp);
38
     Fclose(ofp);
38
     Fclose(ofp);
39
 
39
 
Lines 42-48 Link Here
42
     return;
42
     return;
43
 }
43
 }
44
 
44
 
45
@@ -2230,9 +2237,9 @@
45
@@ -2272,9 +2279,9 @@ do_dungeon()
46
     }
46
     }
47
     Fprintf(ofp, "%s", Dont_Edit_Data);
47
     Fprintf(ofp, "%s", Dont_Edit_Data);
48
 
48
 
Lines 54-60 Link Here
54
 
54
 
55
     while ((line = fgetline(ifp)) != 0) {
55
     while ((line = fgetline(ifp)) != 0) {
56
         SpinCursor(3);
56
         SpinCursor(3);
57
@@ -2247,7 +2254,7 @@
57
@@ -2289,7 +2296,7 @@ do_dungeon()
58
     Fclose(ifp);
58
     Fclose(ifp);
59
     Fclose(ofp);
59
     Fclose(ofp);
60
 
60
 
(-)b/games/nethack36/files/patch-win_Qt_qt__win.cpp (+23 lines)
Added Link Here
1
--- win/Qt/qt_win.cpp.orig	2019-12-18 20:29:40 UTC
2
+++ win/Qt/qt_win.cpp
3
@@ -74,6 +74,11 @@ extern "C" {
4
 
5
 }
6
 
7
+#ifdef Invisible
8
+/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
9
+#undef Invisible
10
+#endif
11
+
12
 #include "qt_win.h"
13
 #include <qregexp.h>
14
 #include <qpainter.h>
15
@@ -105,7 +110,7 @@ extern "C" {
16
 #ifdef Q_WS_MACX
17
 #  include <sys/malloc.h>
18
 #else
19
-#  include <malloc.h>
20
+#  include <stdlib.h>
21
 #endif
22
 
23
 #ifdef _WS_X11_
(-)b/games/nethack36/files/patch-win_tty_termcap.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- win/tty/termcap.c.orig	2015-11-11 10:05:22 UTC
1
--- win/tty/termcap.c.orig	2019-12-18 20:29:40 UTC
2
+++ win/tty/termcap.c
2
+++ win/tty/termcap.c
3
@@ -206,10 +206,6 @@ int *wid, *hgt;
3
@@ -199,10 +199,6 @@ int *wid, *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 */

Return to bug 242978