Attachment #164178 for bug #205255

Lines 627-632 Link Here

(-)games/Makefile (+1 lines)
627	SUBDIR += nethack33-nox11	627	SUBDIR += nethack33-nox11
628	SUBDIR += nethack34	628	SUBDIR += nethack34
629	SUBDIR += nethack34-nox11	629	SUBDIR += nethack34-nox11
		630	SUBDIR += nethack36
630	SUBDIR += netherearth	631	SUBDIR += netherearth
631	SUBDIR += netpanzer	632	SUBDIR += netpanzer
632	SUBDIR += netradiant	633	SUBDIR += netradiant




# $FreeBSD$

PORTNAME=	nethack
PORTVERSION=	3.6.0
PORTREVISION=	8
CATEGORIES=	games
MASTER_SITES=	SF
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src

.else
.if ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS=	# none
#
# Patch notes:
# 1) hpmon and statuscolors conflict with one another
# 2) menucolors patch must be applied before statuscolors
#
.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
IGNORE=		you cannot enable both HPMON and STATUSCOLORS
.endif
.if defined(WITH_MENUCOLORS)
PATCHFILES+=	nh343-menucolor.diff
PATCH_SITES+=	http://bilious.alt.org/~paxed/nethack/
PATCH_DIST_STRIP=	-p1
CFLAGS+=	-DMENU_COLOR_REGEX_POSIX
.endif
CFLAGS+=	-DNOMAIL -DSYSCF -USYSCF_FILE
PATCHFILES+=	nh343-statuscolors.fixed.patch
PATCH_SITES+=	http://jdc.koitsu.org/nethack/ \
		LOCAL/wxs
PATCH_DIST_STRIP=	-p1
.endif
.if defined(WITH_HPMON)
PATCHFILES+=	hpmon.diff
PATCH_SITES+=	http://www.netsonic.fi/~walker/nh/ \
		LOCAL/wxs
PATCH_DIST_STRIP=	-p1
CFLAGS+=	-DHPMON
.endif
.endif
.endif

OPTIONS_DEFINE=	DOCS

# The data files which are generated with makedefs
# are all suceptible to a race: temporary files called
# grep.tmp are generated and deleted, and doing them in
# parallel will overwrite each other's data.
MAKE_JOBS_UNSAFE=yes

.include <bsd.port.pre.mk>

pre-everything::

Lines 1-8 Link Here

(-)games/nethack36/distinfo (-8 / +2 lines)
1	SHA256 (nethack-343-src.tgz) = bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4	1	SHA256 (nethack-360-src.tgz) = 1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a
2	SIZE (nethack-343-src.tgz) = 3497458	2	SIZE (nethack-360-src.tgz) = 4261282
3	SHA256 (nh343-menucolor.diff) = 21f37f759686ac405f1032648d38977096930200e04aeec989d8a450d5532733
4	SIZE (nh343-menucolor.diff) = 20010
5	SHA256 (nh343-statuscolors.fixed.patch) = 1c0c7a5e7a5cd564b5bd3fa790393f13ea584bdb0cbd4c34942e551cb9a6656e
6	SIZE (nh343-statuscolors.fixed.patch) = 19090
7	SHA256 (hpmon.diff) = d9369768f81f06e75b7349609bdff6fd9deff226452f04a89597190e4489074f
8	SIZE (hpmon.diff) = 2041




--- include/config.h.orig	2015-11-17 05:58:34 UTC
+++ include/config.h
@@ -250,11 +250,11 @@
 #ifdef QT_GRAPHICS
 # define DEFAULT_WC_TILED_MAP   /* Default to tiles if users doesn't say wc_ascii_map */
 # define USER_SOUNDS		/* Use sounds */
-# ifndef __APPLE__
-#  define USER_SOUNDS_REGEX
-# endif
 # define USE_XPM		/* Use XPM format for images (required) */
 # define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.ppm) */
 # ifndef DEFAULT_WINDOW_SYS
@@ -126,7 +123,7 @@
  * would allow:
  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
  */
-/* # define USE_XPM */		/* Disable if you do not have the XPM library */
+# define USE_XPM		/* Disable if you do not have the XPM library */
 # ifdef USE_XPM
 #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
 # endif
@@ -169,11 +166,11 @@
 
 #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-#define COMPRESS_EXTENSION ".Z"      /* compress's extension */
+/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
+/* #define COMPRESS_EXTENSION ".Z"      */ /* compress's extension */
 /* An example of one alternative you might want to use: */
-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
-/* #define COMPRESS_EXTENSION ".gz" */       /* normal gzip extension */
+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
+#define COMPRESS_EXTENSION ".gz"       /* normal gzip extension */
 #endif
 
 #ifndef COMPRESS
@@ -317,7 +317,7 @@
  * otherwise it will be the current directory.
  */
 #ifndef HACKDIR
-#define HACKDIR "/usr/games/lib/nethackdir"
+#define HACKDIR "/usr/local/share/nethack"
 #endif
 
 /*




--- include/system.h.orig	2015-12-07 08:26:01 UTC
+++ include/system.h
@@ -81,7 +81,9 @@ typedef long off_t;
 #if !defined(__SC__) && !defined(LINUX)
 E long NDECL(random);
 #endif
-#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
+# if defined(__FreeBSD__)
+E void FDECL(srandom, (unsigned long));
+#elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
     || defined(RANDOM)
 E void FDECL(srandom, (unsigned int));
 #else
 #  if !defined(bsdi) && !defined(__FreeBSD__)




--- include/unixconf.h.orig	2015-11-17 10:54:25 UTC
+++ include/unixconf.h
@@ -19,13 +19,13 @@
  */
 
 /* define exactly one of the following four choices */
-/* #define BSD 1 */  /* define for 4.n/Free/Open/Net BSD  */
+#define BSD 1        /* define for 4.n/Free/Open/Net BSD  */
                      /* also for relatives like SunOS 4.x, DG/UX, and */
                      /* older versions of Linux */
 /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
                      /* Use BSD for < v3.0 */
                      /* "ULTRIX" not to be confused with "ultrix" */
-#define SYSV         /* define for System V, Solaris 2.x, newer versions */
+/* #define SYSV */   /* define for System V, Solaris 2.x, newer versions */
                      /* of Linux */
 /* #define HPUX */   /* Hewlett-Packard's Unix, version 6.5 or higher */
                      /* use SYSV for < v6.5 */
@@ -46,7 +46,7 @@
                         * job control (note that AIX is SYSV otherwise)
                         * Also define this for AIX 3.2 */
 
-#define TERMINFO       /* uses terminfo rather than termcap */
+/* #define TERMINFO */ /* uses terminfo rather than termcap */
                        /* Should be defined for most SYSV, SVR4 (including
                         * Solaris 2+), HPUX, and Linux systems.  In
                         * particular, it should NOT be defined for the UNIXPC
@@ -297,7 +297,7 @@
  * A stat system call is done on the mailbox every MAILCKFREQ moves.
  */
 
-#define MAIL			/* Deliver mail during the game */
+/* #define MAIL */			/* Deliver mail during the game */
 
 /* The Andrew Message System does mail a little differently from normal
  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
@@ -284,7 +284,7 @@
 #endif
 
 #if defined(BSD) || defined(ULTRIX)
-#if !defined(DGUX) && !defined(SUNOS4)
+#if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
 #define memcpy(d, s, n) bcopy(s, d, n)
 #define memcmp(s1, s2, n) bcmp(s2, s1, n)
 #endif




--- src/files.c.orig	2015-12-07 08:26:01 UTC
+++ src/files.c
@@ -40,6 +40,7 @@ const
 #endif
 
 #if defined(UNIX) && defined(QT_GRAPHICS)
 #include <sys/types.h>
+#include <limits.h>
 #include <dirent.h>
 #include <stdlib.h>
 #endif
 




--- sys/unix/Makefile.doc.orig	2015-06-12 06:32:45 UTC
+++ sys/unix/Makefile.doc
@@ -58,16 +58,16 @@ Guidebook.dvi:	Guidebook.tex
 
 
 GAME	= nethack

 MANEXT	= 6
 
 # manual installation for most BSD-style systems
-GAMEMANCREATE = cat nethack.6 | $(NHGREP) >
-LEVMANCREATE = cat lev_comp.6 | $(NHGREP) >
-DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) >
-RCVRMANCREATE = cat recover.6 | $(NHGREP) >
-DLBMANCREATE = cat dlb.6 | $(NHGREP) >
-MDMANCREATE = cat makedefs.6 | $(NHGREP) >
+GAMEMANCREATE = cat nethack.6 | $(NHGREP) > nethack.6.out ; ${BSD_INSTALL_MAN} nethack.6.out
+LEVMANCREATE = cat lev_comp.6 | $(NHGREP) > lev_comp.6.out ; ${BSD_INSTALL_MAN} lev_comp.6.out
+DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) > dgn_comp.6.out ; ${BSD_INSTALL_MAN} dgn_comp.6.out
+RCVRMANCREATE = cat recover.6 | $(NHGREP) > recover.6.out ; ${BSD_INSTALL_MAN} recover.6.out
+DLBMANCREATE = cat dlb.6 | $(NHGREP) > dlb.6.out ; ${BSD_INSTALL_MAN} dlb.6.out
+MDMANCREATE = cat makedefs.6 | $(NHGREP) > makedefs.6.out ; ${BSD_INSTALL_MAN} makedefs.6.out
 # manual installation for most SYSV-style systems
 # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
 # LEVMANCREATE = cat lev_comp.6 | $(NHGREP) | nroff -man - >
@@ -77,12 +77,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP)
 # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
 
 manpages:
-	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)

-	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
+	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
+	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
+	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
+	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover.$(MANEXT)
+	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs.$(MANEXT)
 
 # manual creation for distribution
 DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \




--- sys/unix/Makefile.src.orig	2015-11-12 07:51:56 UTC
+++ sys/unix/Makefile.src
@@ -149,19 +149,30 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
@@ -146,19 +146,29 @@
 # directories.  The ones given below is the usual spot for linux systems.
 # The paths are for glibconfig.h and gnomesupport.h respectively.
 #
-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
+GNOMEINC=  $(shell ${GNOME_CONFIG} --cflags gnomeui)
 
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include
+CFLAGS += -I../include
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
+CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include

+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
+CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
+endif
 #CFLAGS = -O -I../include
 #LFLAGS = 
+LINK = $(CC)
 
 # 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

-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
-CXX=g++
+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
+# CXX=g++
 #LINK=g++
 #	For cross-compiling, eg. with gcc on Linux (see also CC further up):
 #CXX=arm-linux-g++
@@ -222,8 +233,28 @@ WINBEOBJ =
 
 #
 #
-#WINSRC = $(WINTTYSRC)
-#WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC)
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
+WINSRC += $(WINX11SRC)
+endif

+WINSRC += $(WINGNOMESRC)
+endif
+
+WINOBJ = $(WINTTYOBJ)
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
+WINOBJ += $(WINX11OBJ)
+endif

+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
+WINOBJ += $(WINGNOMEOBJ)
+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
@@ -239,23 +270,23 @@ WINBEOBJ =
 # WINTTYLIB = -lcurses
 # WINTTYLIB = -lcurses16
 # WINTTYLIB = -lncurses
-#WINTTYLIB = -ltermlib
+WINTTYLIB = -ltermlib
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.

 #
 # libraries for Gem port
 WINGEMLIB = -le_gem -lgem
@@ -263,7 +294,17 @@ WINGEMLIB = -le_gem -lgem
 # libraries for BeOS 
 WINBELIB = -lbe
 
-#WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB)
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
+WINLIB += $(WINX11LIB)
+endif

+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
+WINLIB += $(WINGNOMELIB)
+endif
+
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)
@@ -482,13 +523,13 @@ objects.o:
 
 # Qt windowport meta-object-compiler output
 qt_kde0.moc: ../include/qt_kde0.h




--- sys/unix/Makefile.top.orig	2015-11-18 20:54:59 UTC
+++ sys/unix/Makefile.top
@@ -21,15 +21,15 @@ NHSROOT=.
 GAME     = nethack
 
 # make NetHack
-PREFIX	 = /usr
-GAME     = nethack
+GAME     = %%HACKNAME%%
 # 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 = 0664
 # VARFILEPERM = 0644
 EXEPERM  = 0755
-DIRPERM  = 0755
+DIRPERM  = 0775
 # VARDIRPERM = 0755
 
 # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
@@ -39,10 +39,11 @@ DIRPERM  = 0755
 # therefore there should not be anything in HACKDIR that you want to keep
 # therefore there should not be anything in GAMEDIR that you want to keep
 # (if there is, you'll have to do the installation by hand or modify the
 # instructions)
-#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
-#VARDIR  = $(HACKDIR)
+HACKDIR  = ${PREFIX}/share/nethack
+VARDIR  = $(HACKDIR)
+INSTDIR = $(HACKDIR)
 # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
-#SHELLDIR = $(PREFIX)/games
+SHELLDIR = ${PREFIX}/bin
 
 # per discussion in Install.X11 and Install.Qt
 #VARDATND = 
@@ -53,7 +54,7 @@ DIRPERM  = 0755
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm
 # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 # for Atari/Gem
@@ -48,7 +47,7 @@
 # for BeOS
 # VARDATND = beostiles
 # for Gnome
-# VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
+VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
 
 VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
 VARDAT = $(VARDATD) $(VARDATND)
@@ -201,56 +202,34 @@ dofiles:
 		-e '}' 					\
 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
 	$(MAKE) dofiles-$${target-nodlb}
-	(cd dat ; cp symbols $(INSTDIR) )
-	cp src/$(GAME) $(INSTDIR)
-	cp util/recover $(INSTDIR)
-	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
+	(cd dat ; cp symbols ${DESTDIR}$(INSTDIR) )
+	cp src/$(GAME) ${DESTDIR}$(INSTDIR)
+	cp util/recover ${DESTDIR}$(INSTDIR)
+	-if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
 	if test -n '$(SHELLDIR)'; then \
 		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
 		< sys/unix/nethack.sh \
-		> $(SHELLDIR)/$(GAME) ; fi
-# set up their permissions
-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
-			$(CHGRP) $(GAMEGRP) $(GAME) recover )
-	chmod $(GAMEPERM) $(INSTDIR)/$(GAME)
-	chmod $(EXEPERM) $(INSTDIR)/recover
-	-if test -n '$(SHELLDIR)'; then \
-		$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi
-	if test -n '$(SHELLDIR)'; then \
-		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
-		chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
-			$(CHGRP) $(GAMEGRP) symbols ; \
-			chmod $(FILEPERM) symbols )
+		> ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
 
 dofiles-dlb: check-dlb
-	( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
-# set up their permissions
-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
-			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
-			chmod $(FILEPERM) nhdat $(DATNODLB) )
+	( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(INSTDIR) )
 
 dofiles-nodlb:
 # copy over the game files
-	( cd dat ; cp $(DAT) $(INSTDIR) )
-# set up their permissions
-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
-			$(CHGRP) $(GAMEGRP) $(DAT) ; \
-			chmod $(FILEPERM) $(DAT) )
+	( cd dat ; cp $(DAT) ${DESTDIR}$(INSTDIR) )
 
 update: $(GAME) recover $(VARDAT) dungeon spec_levs
 #	(don't yank the old version out from under people who're playing it)
-	-mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old
+	-mv ${DESTDIR}$(INSTDIR)/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME).old
 #	quest.dat is also kept open and has the same problems over NFS
 #	(quest.dat may be inside nhdat if dlb is in use)
-	-mv $(INSTDIR)/quest.dat $(INSTDIR)/quest.dat.old
-	-mv $(INSTDIR)/nhdat $(INSTDIR)/nhdat.old
+	-mv ${DESTDIR}$(INSTDIR)/quest.dat ${DESTDIR}$(INSTDIR)/quest.dat.old
+	-mv ${DESTDIR}$(INSTDIR)/nhdat ${DESTDIR}$(INSTDIR)/nhdat.old
 # set up new versions of the game files
 	( $(MAKE) dofiles )
 # touch time-sensitive files

 	touch $(VARDIR)/perm $(VARDIR)/record
 # and a reminder
 	@echo You may also want to install the man pages via the doc Makefile.
@@ -262,23 +241,16 @@ install: rootcheck $(GAME) recover $(VAR
 	true; $(PREINSTALL)
 # set up the directories
 # not all mkdirs have -p; those that don't will create a -p directory
-	-if test -n '$(SHELLDIR)'; then \
-		mkdir -p $(SHELLDIR); fi
-	rm -rf $(INSTDIR) $(VARDIR)
-	-mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save
+	-if test -n '${DESTDIR}$(SHELLDIR)'; then \
+		mkdir -p ${DESTDIR}$(SHELLDIR); fi
+	rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
+	-mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
 	if test -d ./-p; then rmdir ./-p; fi
-	-$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save
-	$(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save
 # order counts here:
-	chmod $(DIRPERM) $(INSTDIR)
-	chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save
 # set up the game files
 	( $(MAKE) dofiles )
 # set up some additional files
-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile
-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile ; \
-			$(CHGRP) $(GAMEGRP) perm record logfile xlogfile ; \
-			chmod $(VARFILEPERM) perm record logfile xlogfile )
+	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile
 	true; $(POSTINSTALL)
 # and a reminder
 	@echo You may also want to reinstall the man pages via the doc Makefile.
 




--- sys/unix/Makefile.utl.orig	2015-12-07 08:26:01 UTC
+++ sys/unix/Makefile.utl
@@ -92,8 +92,18 @@ NHSROOT=..
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-#CFLAGS = -O -I../include
-#LFLAGS =
+CFLAGS += -I../include
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
+CFLAGS += -DX11_GRAPHICS

+CFLAGS += -DGNOME_GRAPHICS
+endif
+
+LFLAGS =
 
 LIBS =
 




--- win/tty/termcap.c.orig	2015-11-11 10:05:22 UTC
+++ win/tty/termcap.c
@@ -206,10 +206,6 @@ int *wid, *hgt;
         error("Terminal must backspace.");
 #else
         if (!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */
-#ifndef MINIMAL_TERM
-            if (!tgetflag("bs"))
-                error("Terminal must backspace.");
-#endif
             BC = tbufptr;
             tbufptr += 2;
             *BC = '\b';




--- win/Qt/qt_win.cpp.orig	2015-06-12 06:32:45 UTC
+++ win/Qt/qt_win.cpp
@@ -74,6 +74,11 @@ extern "C" {
 
 }
 
+#ifdef Invisible
+/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
+#undef Invisible
+#endif
+
 #include "qt_win.h"
 #include <qregexp.h>
 #include <qpainter.h>
@@ -105,7 +110,7 @@ extern "C" {
 #ifdef Q_WS_MACX
 #  include <sys/malloc.h>
 #else
-#  include <malloc.h>
+#  include <stdlib.h>
 #endif
 
 #ifdef _WS_X11_

Lines 79-89 Link Here

(-)games/nethack36/pkg-plist (+18 lines)
79	%%DATADIR%%/bigrm-3.lev	79	%%DATADIR%%/bigrm-3.lev
80	%%DATADIR%%/bigrm-4.lev	80	%%DATADIR%%/bigrm-4.lev
81	%%DATADIR%%/bigrm-5.lev	81	%%DATADIR%%/bigrm-5.lev
		82	%%DATADIR%%/bigrm-10.lev
		83	%%DATADIR%%/bigrm-6.lev
		84	%%DATADIR%%/bigrm-7.lev
		85	%%DATADIR%%/bigrm-8.lev
		86	%%DATADIR%%/bigrm-9.lev
		87	%%DATADIR%%/bogusmon
82	%%DATADIR%%/castle.lev	88	%%DATADIR%%/castle.lev
83	%%DATADIR%%/cmdhelp	89	%%DATADIR%%/cmdhelp
84	%%DATADIR%%/data	90	%%DATADIR%%/data
85	%%DATADIR%%/dungeon	91	%%DATADIR%%/dungeon
86	%%DATADIR%%/earth.lev	92	%%DATADIR%%/earth.lev
		93	%%DATADIR%%/engrave
		94	%%DATADIR%%/epitaph
87	%%DATADIR%%/fakewiz1.lev	95	%%DATADIR%%/fakewiz1.lev
88	%%DATADIR%%/fakewiz2.lev	96	%%DATADIR%%/fakewiz2.lev
89	%%DATADIR%%/fire.lev	97	%%DATADIR%%/fire.lev
Lines 99-104 Link Here
99	%%DATADIR%%/mapbg.xpm	107	%%DATADIR%%/mapbg.xpm
100	%%DATADIR%%/medusa-1.lev	108	%%DATADIR%%/medusa-1.lev
101	%%DATADIR%%/medusa-2.lev	109	%%DATADIR%%/medusa-2.lev
		110	%%DATADIR%%/medusa-3.lev
		111	%%DATADIR%%/medusa-4.lev
102	%%DATADIR%%/minefill.lev	112	%%DATADIR%%/minefill.lev
103	%%DATADIR%%/minend-1.lev	113	%%DATADIR%%/minend-1.lev
104	%%DATADIR%%/minend-2.lev	114	%%DATADIR%%/minend-2.lev
Lines 115-122 Link Here
115	%%DATADIR%%/oracle.lev	125	%%DATADIR%%/oracle.lev
116	%%DATADIR%%/oracles	126	%%DATADIR%%/oracles
117	%%DATADIR%%/orcus.lev	127	%%DATADIR%%/orcus.lev
		128	@mode 664
118	%%DATADIR%%/perm	129	%%DATADIR%%/perm
		130	@mode
119	%%DATADIR%%/pet_mark.xbm	131	%%DATADIR%%/pet_mark.xbm
		132	%%DATADIR%%/pilemark.xbm
120	%%DATADIR%%/quest.dat	133	%%DATADIR%%/quest.dat
121	@mode 664	134	@mode 664
122	%%DATADIR%%/record	135	%%DATADIR%%/record
Lines 135-143 Link Here
135	%%DATADIR%%/soko3-2.lev	148	%%DATADIR%%/soko3-2.lev
136	%%DATADIR%%/soko4-1.lev	149	%%DATADIR%%/soko4-1.lev
137	%%DATADIR%%/soko4-2.lev	150	%%DATADIR%%/soko4-2.lev
		151	%%DATADIR%%/symbols
138	%%DATADIR%%/tower1.lev	152	%%DATADIR%%/tower1.lev
139	%%DATADIR%%/tower2.lev	153	%%DATADIR%%/tower2.lev
140	%%DATADIR%%/tower3.lev	154	%%DATADIR%%/tower3.lev
		155	%%DATADIR%%/tribute
141	%%DATADIR%%/valley.lev	156	%%DATADIR%%/valley.lev
142	%%DATADIR%%/water.lev	157	%%DATADIR%%/water.lev
143	%%DATADIR%%/wizard1.lev	158	%%DATADIR%%/wizard1.lev
Lines 145-150 Link Here
145	%%DATADIR%%/wizard3.lev	160	%%DATADIR%%/wizard3.lev
146	%%DATADIR%%/wizhelp	161	%%DATADIR%%/wizhelp
147	%%DATADIR%%/x11tiles	162	%%DATADIR%%/x11tiles
		163	@mode 664
		164	%%DATADIR%%/xlogfile
148	@mode	165	@mode
149	@owner	166	@owner
150	@group	167	@group
Lines 151-156 Link Here
151	man/man6/dgn_comp.6.gz	168	man/man6/dgn_comp.6.gz
152	man/man6/dlb.6.gz	169	man/man6/dlb.6.gz
153	man/man6/lev_comp.6.gz	170	man/man6/lev_comp.6.gz
		171	man/man6/makedefs.6.gz
154	man/man6/%%HACKNAME%%.6.gz	172	man/man6/%%HACKNAME%%.6.gz
155	man/man6/recover.6.gz	173	man/man6/recover.6.gz
156	%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt	174	%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt

Return to bug 205255

Lines 2-9 Link Here

(-)games/nethack36/Makefile (-29 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nethack	4	PORTNAME= nethack
5	PORTVERSION= 3.4.3	5	PORTVERSION= 3.6.0
6	PORTREVISION= 8
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src	8	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
Lines 36-73 Link Here
36	.else	35	.else
37	.if ${PKGNAMESUFFIX} == "-nox11"	36	.if ${PKGNAMESUFFIX} == "-nox11"
38	GRAPHICS= # none	37	GRAPHICS= # none
39	#
40	# Patch notes:
41	# 1) hpmon and statuscolors conflict with one another
42	# 2) menucolors patch must be applied before statuscolors
43	#
44	.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
45	IGNORE= you cannot enable both HPMON and STATUSCOLORS
46	.endif	38	.endif
47	.if defined(WITH_MENUCOLORS)
48	PATCHFILES+= nh343-menucolor.diff
49	PATCH_SITES+= http://bilious.alt.org/~paxed/nethack/
50	PATCH_DIST_STRIP= -p1
51	CFLAGS+= -DMENU_COLOR_REGEX_POSIX
52	.endif	39	.endif
53	.if defined(WITH_STATUSCOLORS)	40	CFLAGS+= -DNOMAIL -DSYSCF -USYSCF_FILE
54	PATCHFILES+= nh343-statuscolors.fixed.patch
55	PATCH_SITES+= http://jdc.koitsu.org/nethack/ \
56	LOCAL/wxs
57	PATCH_DIST_STRIP= -p1
58	.endif
59	.if defined(WITH_HPMON)
60	PATCHFILES+= hpmon.diff
61	PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \
62	LOCAL/wxs
63	PATCH_DIST_STRIP= -p1
64	CFLAGS+= -DHPMON
65	.endif
66	.endif
67	.endif
68		41
69	OPTIONS_DEFINE= DOCS	42	OPTIONS_DEFINE= DOCS
70		43
		44	# The data files which are generated with makedefs
		45	# are all suceptible to a race: temporary files called
		46	# grep.tmp are generated and deleted, and doing them in
		47	# parallel will overwrite each other's data.
		48	MAKE_JOBS_UNSAFE=yes
		49
71	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
72		51
73	pre-everything::	52	pre-everything::

Lines 1-46 Link Here

(-)games/nethack36/files/patch-include-config.h (-36 / +17 lines)
1	--- include/config.h.orig Mon Dec 8 00:39:13 2003	1	--- include/config.h.orig 2015-11-17 05:58:34 UTC
2	+++ include/config.h Sun Sep 3 12:17:19 2006	2	+++ include/config.h
3	@@ -85,9 +85,6 @@	3	@@ -250,11 +250,11 @@
4	#ifdef QT_GRAPHICS
5	# define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
6	# define USER_SOUNDS /* Use sounds */
7	-# ifndef __APPLE__
8	-# define USER_SOUNDS_REGEX
9	-# endif
10	# define USE_XPM /* Use XPM format for images (required) */
11	# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
12	# ifndef DEFAULT_WINDOW_SYS
13	@@ -126,7 +123,7 @@
14	* would allow:
15	* xpmtoppm <x11tiles.xpm \| pnmscale 1.25 \| ppmquant 90 >x11tiles_big.xpm
16	*/
17	-/* # define USE_XPM / / Disable if you do not have the XPM library */
18	+# define USE_XPM /* Disable if you do not have the XPM library */
19	# ifdef USE_XPM
20	# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
21	# endif
22	@@ -169,11 +166,11 @@
23		4
24	#ifdef UNIX	5	#if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
25	/* path and file name extension for compression program */	6	/* path and file name extension for compression program */
26	-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */	7	-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
27	-#define COMPRESS_EXTENSION ".Z" /* compress's extension */	8	-#define COMPRESS_EXTENSION ".Z" /* compress's extension */
28	+/* #define COMPRESS "/usr/bin/compress"/ / Lempel-Ziv compression */	9	+/* #define COMPRESS "/usr/bin/compress" / / Lempel-Ziv compression */
29	+/* #define COMPRESS_EXTENSION ".Z" / / compress's extension */	10	+/* #define COMPRESS_EXTENSION ".Z" / / compress's extension */
30	/* An example of one alternative you might want to use: */	11	/* An example of one alternative you might want to use: */
31	-/* #define COMPRESS "/usr/local/bin/gzip" / / FSF gzip compression */	12	-/* #define COMPRESS "/usr/local/bin/gzip" / / FSF gzip compression */
32	-/* #define COMPRESS_EXTENSION ".gz" / / normal gzip extension */	13	-/* #define COMPRESS_EXTENSION ".gz" / / normal gzip extension */
33	+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */	14	+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
34	+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */	15	+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */
35	#endif	16	#endif
36		17
37	#ifndef COMPRESS	18	#ifndef COMPRESS
38	@@ -204,7 +201,7 @@	19	@@ -317,7 +317,7 @@
39	* otherwise it will be the current directory.	20	* otherwise it will be the current directory.
40	*/	21	*/
41	# ifndef HACKDIR	22	#ifndef HACKDIR
42	-# define HACKDIR "/usr/games/lib/nethackdir"	23	-#define HACKDIR "/usr/games/lib/nethackdir"
43	+# define HACKDIR "%%HACKDIR%%"	24	+#define HACKDIR "/usr/local/share/nethack"
44	# endif	25	#endif
45		26
46	/*	27	/*

Lines 1-13 Link Here

(-)games/nethack36/files/patch-include-system.h (-10 / +10 lines)
1	--- include/system.h.orig Sat Aug 30 09:07:23 2003	1	--- include/system.h.orig 2015-12-07 08:26:01 UTC
2	+++ include/system.h Tue Sep 2 00:39:39 2003	2	+++ include/system.h
3	@@ -79,7 +79,9 @@	3	@@ -81,7 +81,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
7	-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \|\| defined(RANDOM)	7	-#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
8	+# if defined(__FreeBSD__)	8	+# if defined(__FreeBSD__)
9	+E void FDECL(srandom, (unsigned long));	9	+E void FDECL(srandom, (unsigned long));
10	+# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \|\| defined(RANDOM)	10	+#elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
		11	\|\| defined(RANDOM)
11	E void FDECL(srandom, (unsigned int));	12	E void FDECL(srandom, (unsigned int));
12	# else	13	#else
13	# if !defined(bsdi) && !defined(__FreeBSD__)

Lines 1-45 Link Here

(-)games/nethack36/files/patch-include-unixconf.h (-37 / +28 lines)
1	--- include/unixconf.h.orig Mon Sep 1 22:34:19 2003	1	--- include/unixconf.h.orig 2015-11-17 10:54:25 UTC
2	+++ include/unixconf.h Mon Sep 1 22:35:16 2003	2	+++ include/unixconf.h
3	@@ -19,13 +19,13 @@	3	@@ -19,13 +19,13 @@
4	*/	4	*/
5		5
6	/* define exactly one of the following four choices */	6	/* define exactly one of the following four choices */
7	-/* #define BSD 1 / / define for 4.n/Free/Open/Net BSD */	7	-/* #define BSD 1 / / define for 4.n/Free/Open/Net BSD */
8	+#define BSD 1 /* define for 4.n/Free/Open/Net BSD */	8	+#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
9	/* also for relatives like SunOS 4.x, DG/UX, and */	9	/* also for relatives like SunOS 4.x, DG/UX, and */
10	/* older versions of Linux */	10	/* older versions of Linux */
11	/* #define ULTRIX / / define for Ultrix v3.0 or higher (but not lower) */	11	/* #define ULTRIX / / define for Ultrix v3.0 or higher (but not lower) */
12	/* Use BSD for < v3.0 */	12	/* Use BSD for < v3.0 */
13	/* "ULTRIX" not to be confused with "ultrix" */	13	/* "ULTRIX" not to be confused with "ultrix" */
14	-#define SYSV /* define for System V, Solaris 2.x, newer versions */	14	-#define SYSV /* define for System V, Solaris 2.x, newer versions */
15	+/* #define SYSV / / define for System V, Solaris 2.x, newer versions */	15	+/* #define SYSV / / define for System V, Solaris 2.x, newer versions */
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	@@ -47,7 +47,7 @@	19	@@ -46,7 +46,7 @@
20	* job control (note that AIX is SYSV otherwise)	20	* job control (note that AIX is SYSV otherwise)
21	* Also define this for AIX 3.2 */	21	* Also define this for AIX 3.2 */
22		22
23	-#define TERMINFO /* uses terminfo rather than termcap */	23	-#define TERMINFO /* uses terminfo rather than termcap */
24	+/* #define TERMINFO / / uses terminfo rather than termcap */	24	+/* #define TERMINFO / / uses terminfo rather than termcap */
25	/* Should be defined for most SYSV, SVR4 (including	25	/* Should be defined for most SYSV, SVR4 (including
26	* Solaris 2+), HPUX, and Linux systems. In	26	* Solaris 2+), HPUX, and Linux systems. In
27	* particular, it should NOT be defined for the UNIXPC	27	* particular, it should NOT be defined for the UNIXPC
28	@@ -143,7 +143,7 @@	28	@@ -297,7 +297,7 @@
29	* A stat system call is done on the mailbox every MAILCKFREQ moves.
30	*/
31
32	-#define MAIL /* Deliver mail during the game */
33	+/* #define MAIL / / Deliver mail during the game */
34
35	/* The Andrew Message System does mail a little differently from normal
36	* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
37	@@ -284,7 +284,7 @@
38	#endif	29	#endif
39		30
40	#if defined(BSD) \|\| defined(ULTRIX)	31	#if defined(BSD) \|\| defined(ULTRIX)
41	-# if !defined(DGUX) && !defined(SUNOS4)	32	-#if !defined(DGUX) && !defined(SUNOS4)
42	+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)	33	+#if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
43	#define memcpy(d, s, n) bcopy(s, d, n)	34	#define memcpy(d, s, n) bcopy(s, d, n)
44	#define memcmp(s1, s2, n) bcmp(s2, s1, n)	35	#define memcmp(s1, s2, n) bcmp(s2, s1, n)
45	# endif	36	#endif

Lines 1-10 Link Here

(-)games/nethack36/files/patch-src-files.c (-5 / +5 lines)
1	--- src/files.c.orig Sun Feb 23 23:43:26 2003	1	--- src/files.c.orig 2015-12-07 08:26:01 UTC
2	+++ src/files.c Thu Jun 19 11:51:59 2003	2	+++ src/files.c
3	@@ -29,6 +29,7 @@	3	@@ -40,6 +40,7 @@ const
4	#endif
5		4
6	#if defined(UNIX) && defined(QT_GRAPHICS)	5	#if defined(UNIX) && defined(QT_GRAPHICS)
		6	#include <sys/types.h>
7	+#include <limits.h>	7	+#include <limits.h>
8	#include <dirent.h>	8	#include <dirent.h>
		9	#include <stdlib.h>
9	#endif	10	#endif
10

Lines 1-6 Link Here

(-)games/nethack36/files/patch-sys-unix-Makefile.doc (-18 / +22 lines)
1	--- sys/unix/Makefile.doc.orig 2003-12-07 15:39:13.000000000 -0800	1	--- sys/unix/Makefile.doc.orig 2015-06-12 06:32:45 UTC
2	+++ sys/unix/Makefile.doc 2014-06-28 23:05:31.000000000 -0700	2	+++ sys/unix/Makefile.doc
3	@@ -41,15 +41,15 @@	3	@@ -58,16 +58,16 @@ Guidebook.dvi: Guidebook.tex
4		4
5		5
6	GAME = nethack	6	GAME = nethack
Lines 9-29 Link Here
9	MANEXT = 6	9	MANEXT = 6
10		10
11	# manual installation for most BSD-style systems	11	# manual installation for most BSD-style systems
12	-GAMEMANCREATE = cp nethack.6	12	-GAMEMANCREATE = cat nethack.6 \| $(NHGREP) >
13	-LEVMANCREATE = cp lev_comp.6	13	-LEVMANCREATE = cat lev_comp.6 \| $(NHGREP) >
14	-DGNMANCREATE = cp dgn_comp.6	14	-DGNMANCREATE = cat dgn_comp.6 \| $(NHGREP) >
15	-RCVRMANCREATE = cp recover.6	15	-RCVRMANCREATE = cat recover.6 \| $(NHGREP) >
16	-DLBMANCREATE = cp dlb.6	16	-DLBMANCREATE = cat dlb.6 \| $(NHGREP) >
17	+GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6	17	-MDMANCREATE = cat makedefs.6 \| $(NHGREP) >
18	+LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6	18	+GAMEMANCREATE = cat nethack.6 \| $(NHGREP) > nethack.6.out ; ${BSD_INSTALL_MAN} nethack.6.out
19	+DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6	19	+LEVMANCREATE = cat lev_comp.6 \| $(NHGREP) > lev_comp.6.out ; ${BSD_INSTALL_MAN} lev_comp.6.out
20	+RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6	20	+DGNMANCREATE = cat dgn_comp.6 \| $(NHGREP) > dgn_comp.6.out ; ${BSD_INSTALL_MAN} dgn_comp.6.out
21	+DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6	21	+RCVRMANCREATE = cat recover.6 \| $(NHGREP) > recover.6.out ; ${BSD_INSTALL_MAN} recover.6.out
		22	+DLBMANCREATE = cat dlb.6 \| $(NHGREP) > dlb.6.out ; ${BSD_INSTALL_MAN} dlb.6.out
		23	+MDMANCREATE = cat makedefs.6 \| $(NHGREP) > makedefs.6.out ; ${BSD_INSTALL_MAN} makedefs.6.out
22	# manual installation for most SYSV-style systems	24	# manual installation for most SYSV-style systems
23	# GAMEMANCREATE = nroff -man nethack.6 >	25	# GAMEMANCREATE = cat nethack.6 \| $(NHGREP) \| nroff -man - >
24	# LEVMANCREATE = nroff -man lev_comp.6 >	26	# LEVMANCREATE = cat lev_comp.6 \| $(NHGREP) \| nroff -man - >
25	@@ -58,11 +58,11 @@	27	@@ -77,12 +77,12 @@ MDMANCREATE = cat makedefs.6 \| $(NHGREP)
26	# DLBMANCREATE = nroff -man dlb.6 >	28	# MDMANCREATE = cat makedefs.6 \| $(NHGREP) \| nroff -man - >
27		29
28	manpages:	30	manpages:
29	- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)	31	- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
Lines 31-41 Link Here
31	- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)	33	- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
32	- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)	34	- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
33	- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)	35	- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
		36	- -$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
34	+ -$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)	37	+ -$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
35	+ -$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)	38	+ -$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
36	+ -$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)	39	+ -$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
37	+ -$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover.$(MANEXT)	40	+ -$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover.$(MANEXT)
38	+ -$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb.$(MANEXT)	41	+ -$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb.$(MANEXT)
		42	+ -$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs.$(MANEXT)
39		43
40	# manual creation for distribution	44	# manual creation for distribution
41	DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt	45	DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \

Lines 1-17 Link Here

(-)games/nethack36/files/patch-sys-unix-Makefile.src (-17 / +24 lines)
1	diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src	1	--- sys/unix/Makefile.src.orig 2015-11-12 07:51:56 UTC
2	--- sys.orig/unix/Makefile.src Sun Dec 7 15:39:13 2003	2	+++ sys/unix/Makefile.src
3	+++ sys/unix/Makefile.src Wed Jun 30 08:27:32 2004	3	@@ -149,19 +149,30 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
4	@@ -146,19 +146,29 @@
5	# 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.
6	# The paths are for glibconfig.h and gnomesupport.h respectively.	5	# The paths are for glibconfig.h and gnomesupport.h respectively.
7	#	6	#
8	-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome	7	-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
9	+GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)	8	+GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
10		9
11	# flags for debugging:	10	# flags for debugging:
12	# CFLAGS = -g -I../include	11	# CFLAGS = -g -I../include
13		12
14	-CFLAGS = -O -I../include
15	+CFLAGS += -I../include	13	+CFLAGS += -I../include
16	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")	14	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
17	+CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include	15	+CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
Lines 22-29 Link Here
22	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")	20	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
23	+CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}	21	+CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
24	+endif	22	+endif
25	+	23	#CFLAGS = -O -I../include
26	LFLAGS =	24	#LFLAGS =
		25	+LINK = $(CC)
27		26
28	# 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
29	# 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
Lines 31-44 Link Here
31	-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include	30	-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
32	-CXX=g++	31	-CXX=g++
33	+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}	32	+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
34	+#CXX=g++	33	+# CXX=g++
35	#LINK=g++	34	#LINK=g++
36	# For cross-compiling, eg. with gcc on Linux (see also CC further up):	35	# For cross-compiling, eg. with gcc on Linux (see also CC further up):
37	#CXX=arm-linux-g++	36	#CXX=arm-linux-g++
38	@@ -215,7 +225,26 @@	37	@@ -222,8 +233,28 @@ WINBEOBJ =
		38
39	#	39	#
40	#	40	#
41	WINSRC = $(WINTTYSRC)	41	-#WINSRC = $(WINTTYSRC)
		42	-#WINOBJ = $(WINTTYOBJ)
		43	+WINSRC = $(WINTTYSRC)
42	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")	44	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
43	+WINSRC += $(WINX11SRC)	45	+WINSRC += $(WINX11SRC)
44	+endif	46	+endif
Lines 49-55 Link Here
49	+WINSRC += $(WINGNOMESRC)	51	+WINSRC += $(WINGNOMESRC)
50	+endif	52	+endif
51	+	53	+
52	WINOBJ = $(WINTTYOBJ)	54	+WINOBJ = $(WINTTYOBJ)
53	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")	55	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
54	+WINOBJ += $(WINX11OBJ)	56	+WINOBJ += $(WINX11OBJ)
55	+endif	57	+endif
Lines 59-72 Link Here
59	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")	61	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
60	+WINOBJ += $(WINGNOMEOBJ)	62	+WINOBJ += $(WINGNOMEOBJ)
61	+endif	63	+endif
		64	+
62		65
63	# on some systems the termcap library is in -ltermcap or -lcurses	66	# on some systems the termcap library is in -ltermcap or -lcurses
64	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead	67	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
65	@@ -231,23 +260,23 @@	68	@@ -239,23 +270,23 @@ WINBEOBJ =
66	# WINTTYLIB = -lcurses	69	# WINTTYLIB = -lcurses
67	# WINTTYLIB = -lcurses16	70	# WINTTYLIB = -lcurses16
68	# WINTTYLIB = -lncurses	71	# WINTTYLIB = -lncurses
69	WINTTYLIB = -ltermlib	72	-#WINTTYLIB = -ltermlib
		73	+WINTTYLIB = -ltermlib
70	#	74	#
71	# libraries for X11	75	# libraries for X11
72	# If USE_XPM is defined in config.h, you will also need -lXpm here.	76	# If USE_XPM is defined in config.h, you will also need -lXpm here.
Lines 89-98 Link Here
89	#	93	#
90	# libraries for Gem port	94	# libraries for Gem port
91	WINGEMLIB = -le_gem -lgem	95	WINGEMLIB = -le_gem -lgem
92	@@ -256,6 +285,15 @@	96	@@ -263,7 +294,17 @@ WINGEMLIB = -le_gem -lgem
		97	# libraries for BeOS
93	WINBELIB = -lbe	98	WINBELIB = -lbe
94		99
95	WINLIB = $(WINTTYLIB)	100	-#WINLIB = $(WINTTYLIB)
		101	+WINLIB = $(WINTTYLIB)
96	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")	102	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
97	+WINLIB += $(WINX11LIB)	103	+WINLIB += $(WINX11LIB)
98	+endif	104	+endif
Lines 102-111 Link Here
102	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")	108	+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
103	+WINLIB += $(WINGNOMELIB)	109	+WINLIB += $(WINGNOMELIB)
104	+endif	110	+endif
		111	+
105		112
106	# any other strange libraries your system needs (for Sysunix only -- the more	113	# any other strange libraries your system needs (for Sysunix only -- the more
107	# specialized targets should already be right)	114	# specialized targets should already be right)
108	@@ -461,13 +499,13 @@	115	@@ -482,13 +523,13 @@ objects.o:
109		116
110	# Qt windowport meta-object-compiler output	117	# Qt windowport meta-object-compiler output
111	qt_kde0.moc: ../include/qt_kde0.h	118	qt_kde0.moc: ../include/qt_kde0.h

Lines 1-105 Link Here

(-)games/nethack36/files/patch-sys-unix-Makefile.top (-75 / +82 lines)
1	--- sys/unix/Makefile.top.orig 2003-12-07 15:39:13.000000000 -0800	1	--- sys/unix/Makefile.top.orig 2015-11-18 20:54:59 UTC
2	+++ sys/unix/Makefile.top 2014-06-28 23:20:31.000000000 -0700	2	+++ sys/unix/Makefile.top
3	@@ -14,18 +14,17 @@	3	@@ -21,15 +21,15 @@ NHSROOT=.
4	# MAKE = make	4	GAME = nethack
5
6	# make NetHack
7	-PREFIX = /usr
8	-GAME = nethack
9	+GAME = %%HACKNAME%%
10	# GAME = nethack.prg	5	# GAME = nethack.prg
11	GAMEUID = games	6	#GAMEUID = games
12	-GAMEGRP = bin	7	-#GAMEGRP = bin
13	+GAMEGRP = games	8	+GAMEGRP = games
14		9
15	# Permissions - some places use setgid instead of setuid, for instance	10	# Permissions - some places use setgid instead of setuid, for instance
16	# See also the option "SECURE" in include/config.h	11	# See also the option "SECURE" in include/config.h
17	-GAMEPERM = 04755	12	-#GAMEPERM = 04755
18	-FILEPERM = 0644	13	-FILEPERM = 0644
19	+GAMEPERM = 02755	14	+GAMEPERM = 02755
20	+FILEPERM = 0664	15	+FILEPERM = 0664
		16	# VARFILEPERM = 0644
21	EXEPERM = 0755	17	EXEPERM = 0755
22	-DIRPERM = 0755	18	-DIRPERM = 0755
23	+DIRPERM = 0775	19	+DIRPERM = 0775
		20	# VARDIRPERM = 0755
24		21
25	# GAMEDIR also appears in config.h as "HACKDIR".	22	# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
26	# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR	23	@@ -39,10 +39,11 @@ DIRPERM = 0755
27	@@ -35,12 +34,12 @@	24	# therefore there should not be anything in HACKDIR that you want to keep
28	# therefore there should not be anything in GAMEDIR that you want to keep
29	# (if there is, you'll have to do the installation by hand or modify the	25	# (if there is, you'll have to do the installation by hand or modify the
30	# instructions)	26	# instructions)
31	-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir	27	-#HACKDIR = $(PREFIX)/games/lib/$(GAME)dir
32	+GAMEDIR = ${PREFIX}/share/%%HACKNAME%%	28	-#VARDIR = $(HACKDIR)
33	VARDIR = $(GAMEDIR)	29	+HACKDIR = ${PREFIX}/share/nethack
34	-SHELLDIR = $(PREFIX)/games	30	+VARDIR = $(HACKDIR)
		31	+INSTDIR = $(HACKDIR)
		32	# Where nethack.sh in installed. If this is not defined, the wrapper is not used.
		33	-#SHELLDIR = $(PREFIX)/games
35	+SHELLDIR = ${PREFIX}/bin	34	+SHELLDIR = ${PREFIX}/bin
36		35
37	# per discussion in Install.X11 and Install.Qt	36	# per discussion in Install.X11 and Install.Qt
38	-VARDATND =	37	#VARDATND =
39	+# VARDATND =	38	@@ -53,7 +54,7 @@ DIRPERM = 0755
40	# VARDATND = x11tiles NetHack.ad pet_mark.xbm
41	# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
42	# for Atari/Gem
43	@@ -48,7 +47,7 @@
44	# for BeOS	39	# for BeOS
45	# VARDATND = beostiles	40	# VARDATND = beostiles
46	# for Gnome	41	# for Gnome
47	-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm	42	-# VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
48	+VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm	43	+VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
49		44
50	VARDATD = data oracles options quest.dat rumors	45	VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
51	VARDAT = $(VARDATD) $(VARDATND)	46	VARDAT = $(VARDATD) $(VARDATND)
52	@@ -183,49 +182,32 @@	47	@@ -201,56 +202,34 @@ dofiles:
53	-e '}' \	48	-e '}' \
54	-e '$$s/.*/nodlb/p' < dat/options` ; \	49	-e '$$s/.*/nodlb/p' < dat/options` ; \
55	$(MAKE) dofiles-$${target-nodlb}	50	$(MAKE) dofiles-$${target-nodlb}
56	- cp src/$(GAME) $(GAMEDIR)	51	- (cd dat ; cp symbols $(INSTDIR) )
57	- cp util/recover $(GAMEDIR)	52	- cp src/$(GAME) $(INSTDIR)
58	- -rm -f $(SHELLDIR)/$(GAME)	53	- cp util/recover $(INSTDIR)
59	+ cp src/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME)	54	- -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
60	+ cp util/recover ${DESTDIR}$(GAMEDIR)	55	+ (cd dat ; cp symbols ${DESTDIR}$(INSTDIR) )
61	+ -rm -f ${DESTDIR}$(SHELLDIR)/$(GAME)	56	+ cp src/$(GAME) ${DESTDIR}$(INSTDIR)
62	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \	57	+ cp util/recover ${DESTDIR}$(INSTDIR)
		58	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
		59	if test -n '$(SHELLDIR)'; then \
		60	sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
63	-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \	61	-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
64	< sys/unix/nethack.sh \	62	< sys/unix/nethack.sh \
65	- > $(SHELLDIR)/$(GAME)	63	- > $(SHELLDIR)/$(GAME) ; fi
66	-# set up their permissions	64	-# set up their permissions
67	- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \	65	- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
68	- $(CHGRP) $(GAMEGRP) $(GAME) recover )	66	- $(CHGRP) $(GAMEGRP) $(GAME) recover )
69	- chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)	67	- chmod $(GAMEPERM) $(INSTDIR)/$(GAME)
70	- chmod $(EXEPERM) $(GAMEDIR)/recover	68	- chmod $(EXEPERM) $(INSTDIR)/recover
71	- -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)	69	- -if test -n '$(SHELLDIR)'; then \
72	- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)	70	- $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi
73	- chmod $(EXEPERM) $(SHELLDIR)/$(GAME)	71	- if test -n '$(SHELLDIR)'; then \
74	+ > ${DESTDIR}$(SHELLDIR)/$(GAME)	72	- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
		73	- chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
		74	- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
		75	- $(CHGRP) $(GAMEGRP) symbols ; \
		76	- chmod $(FILEPERM) symbols )
		77	+ > ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
75		78
76	dofiles-dlb: check-dlb	79	dofiles-dlb: check-dlb
77	- ( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )	80	- ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
78	-# set up their permissions	81	-# set up their permissions
79	- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \	82	- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
80	- $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \	83	- $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
81	- chmod $(FILEPERM) nhdat $(DATNODLB) )	84	- chmod $(FILEPERM) nhdat $(DATNODLB) )
82	+ ( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(GAMEDIR) )	85	+ ( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(INSTDIR) )
83		86
84	dofiles-nodlb:	87	dofiles-nodlb:
85	# copy over the game files	88	# copy over the game files
86	- ( cd dat ; cp $(DAT) $(GAMEDIR) )	89	- ( cd dat ; cp $(DAT) $(INSTDIR) )
87	-# set up their permissions	90	-# set up their permissions
88	- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \	91	- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
89	- $(CHGRP) $(GAMEGRP) $(DAT) ; \	92	- $(CHGRP) $(GAMEGRP) $(DAT) ; \
90	- chmod $(FILEPERM) $(DAT) )	93	- chmod $(FILEPERM) $(DAT) )
91	+ ( cd dat ; cp $(DAT) ${DESTDIR}$(GAMEDIR) )	94	+ ( cd dat ; cp $(DAT) ${DESTDIR}$(INSTDIR) )
92		95
93	update: $(GAME) recover $(VARDAT) dungeon spec_levs	96	update: $(GAME) recover $(VARDAT) dungeon spec_levs
94	# (don't yank the old version out from under people who're playing it)	97	# (don't yank the old version out from under people who're playing it)
95	- -mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old	98	- -mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old
96	+ -mv ${DESTDIR}$(GAMEDIR)/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME).old	99	+ -mv ${DESTDIR}$(INSTDIR)/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME).old
97	# quest.dat is also kept open and has the same problems over NFS	100	# quest.dat is also kept open and has the same problems over NFS
98	# (quest.dat may be inside nhdat if dlb is in use)	101	# (quest.dat may be inside nhdat if dlb is in use)
99	- -mv $(GAMEDIR)/quest.dat $(GAMEDIR)/quest.dat.old	102	- -mv $(INSTDIR)/quest.dat $(INSTDIR)/quest.dat.old
100	- -mv $(GAMEDIR)/nhdat $(GAMEDIR)/nhdat.old	103	- -mv $(INSTDIR)/nhdat $(INSTDIR)/nhdat.old
101	+ -mv ${DESTDIR}$(GAMEDIR)/quest.dat ${DESTDIR}$(GAMEDIR)/quest.dat.old	104	+ -mv ${DESTDIR}$(INSTDIR)/quest.dat ${DESTDIR}$(INSTDIR)/quest.dat.old
102	+ -mv ${DESTDIR}$(GAMEDIR)/nhdat ${DESTDIR}$(GAMEDIR)/nhdat.old	105	+ -mv ${DESTDIR}$(INSTDIR)/nhdat ${DESTDIR}$(INSTDIR)/nhdat.old
103	# set up new versions of the game files	106	# set up new versions of the game files
104	( $(MAKE) dofiles )	107	( $(MAKE) dofiles )
105	# touch time-sensitive files	108	# touch time-sensitive files
Lines 108-135 Link Here
108	touch $(VARDIR)/perm $(VARDIR)/record	111	touch $(VARDIR)/perm $(VARDIR)/record
109	# and a reminder	112	# and a reminder
110	@echo You may also want to install the man pages via the doc Makefile.	113	@echo You may also want to install the man pages via the doc Makefile.
111	@@ -233,20 +215,14 @@	114	@@ -262,23 +241,16 @@ install: rootcheck $(GAME) recover $(VAR
112	install: $(GAME) recover $(VARDAT) dungeon spec_levs	115	true; $(PREINSTALL)
113	# set up the directories	116	# set up the directories
114	# not all mkdirs have -p; those that don't will create a -p directory	117	# not all mkdirs have -p; those that don't will create a -p directory
115	- -mkdir -p $(SHELLDIR)	118	- -if test -n '$(SHELLDIR)'; then \
116	- -rm -rf $(GAMEDIR) $(VARDIR)	119	- mkdir -p $(SHELLDIR); fi
117	- -mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save	120	- rm -rf $(INSTDIR) $(VARDIR)
118	+ -mkdir -p ${DESTDIR}$(SHELLDIR)	121	- -mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save
119	+ -rm -rf ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR)	122	+ -if test -n '${DESTDIR}$(SHELLDIR)'; then \
120	+ -mkdir -p ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR)	123	+ mkdir -p ${DESTDIR}$(SHELLDIR); fi
121	-rmdir ./-p	124	+ rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
122	- -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	125	+ -mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
123	- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	126	if test -d ./-p; then rmdir ./-p; fi
124	- chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	127	- -$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save
		128	- $(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save
		129	# order counts here:
		130	- chmod $(DIRPERM) $(INSTDIR)
		131	- chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save
125	# set up the game files	132	# set up the game files
126	( $(MAKE) dofiles )	133	( $(MAKE) dofiles )
127	# set up some additional files	134	# set up some additional files
128	- touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile	135	- touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile
129	- -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \	136	- -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile ; \
130	- $(CHGRP) $(GAMEGRP) perm record logfile ; \	137	- $(CHGRP) $(GAMEGRP) perm record logfile xlogfile ; \
131	- chmod $(FILEPERM) perm record logfile )	138	- chmod $(VARFILEPERM) perm record logfile xlogfile )
132	+ touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile	139	+ touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile
		140	true; $(POSTINSTALL)
133	# and a reminder	141	# and a reminder
134	@echo You may also want to reinstall the man pages via the doc Makefile.	142	@echo You may also want to reinstall the man pages via the doc Makefile.
135

Lines 1-10 Link Here

(-)games/nethack36/files/patch-sys-unix-Makefile.utl (-5 / +7 lines)
1	--- sys/unix/Makefile.utl.orig Mon Apr 17 22:36:44 2000	1	--- sys/unix/Makefile.utl.orig 2015-12-07 08:26:01 UTC
2	+++ sys/unix/Makefile.utl Wed Oct 10 19:48:36 2001	2	+++ sys/unix/Makefile.utl
3	@@ -89,7 +89,17 @@	3	@@ -92,8 +92,18 @@ NHSROOT=..
4	# flags for debugging:	4	# flags for debugging:
5	# CFLAGS = -g -I../include	5	# CFLAGS = -g -I../include
6		6
7	-CFLAGS = -O -I../include	7	-#CFLAGS = -O -I../include
		8	-#LFLAGS =
8	+CFLAGS += -I../include	9	+CFLAGS += -I../include
9	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")	10	+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
10	+CFLAGS += -DX11_GRAPHICS	11	+CFLAGS += -DX11_GRAPHICS
Lines 16-21 Link Here
16	+CFLAGS += -DGNOME_GRAPHICS	17	+CFLAGS += -DGNOME_GRAPHICS
17	+endif	18	+endif
18	+	19	+
19	LFLAGS =	20	+LFLAGS =
20		21
21	LIBS =	22	LIBS =
		23

Lines 1-13 Link Here

(-)games/nethack36/files/patch-win-tty-termcap.c (-13 / +13 lines)
1	--- win/tty/termcap.c.orig Thu Jun 19 16:12:47 2003	1	--- win/tty/termcap.c.orig 2015-11-11 10:05:22 UTC
2	+++ win/tty/termcap.c Thu Jun 19 16:13:00 2003	2	+++ win/tty/termcap.c
3	@@ -217,10 +217,6 @@	3	@@ -206,10 +206,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 */
7	-# ifndef MINIMAL_TERM	7	-#ifndef MINIMAL_TERM
8	- if(!tgetflag("bs"))	8	- if (!tgetflag("bs"))
9	- error("Terminal must backspace.");	9	- error("Terminal must backspace.");
10	-# endif	10	-#endif
11	BC = tbufptr;	11	BC = tbufptr;
12	tbufptr += 2;	12	tbufptr += 2;
13	*BC = '\b';	13	*BC = '\b';

Line 0 Link Here

(-)games/nethack36/files/patch-win_Qt_qt__win.cpp (+23 lines)
	1	--- win/Qt/qt_win.cpp.orig 2015-06-12 06:32:45 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_