DESTDIRify nethack. Merge patches and distinfo. Some other improvements.

From Rhialto in PR 45010.

11 files changed, 35 insertions, 377 deletions

diff --git a/games/nethack-x11/MESSAGE b/games/nethack-x11/MESSAGE
index 797410823f9..a08faecdcbc 100644
--- a/games/nethack-x11/MESSAGE
+++ b/games/nethack-x11/MESSAGE
@@ -1,12 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/09/28 12:41:40 rillig Exp $
+$NetBSD: MESSAGE,v 1.5 2011/06/01 11:20:30 wiz Exp $
 
 You can run the X11 NetHack by typing "nethack x11".
 
-A custom NetHack font was installed.  You must add
-${PREFIX}/lib/X11/fonts/misc to fontpath and set
+Two fonts were installed for NetHack.  You must add
+${PREFIX}/lib/X11/fonts/misc to fontpath and set one of
 
 NetHack*map*font: nh10
+NetHack*map*font: -misc-fixed-medium-r-normal-ibmpc-14-120-75-75-c-80-iso8859-1
 
 in ${PREFIX}/lib/X11/app-defaults/NetHack to use it.
 Tiled mode is enabled by:
@@ -15,4 +16,12 @@ NetHack.tile_file: x11tiles
 
 Also see ${PREFIX}/share/nethackdir340/nethack.x11.rc
 
+You may also want to set this environment variable, so NetHack can
+find its app-defaults file:
+
+XFILESEARCHPATH=%D:/usr/pkg/lib/X11/%T/%N%C:/usr/pkg/lib/X11/%T/%N
+
+To fall back to tty mode, use "NETHACKOPTIONS=windowtype:tty nethack"
+or set that option in your .nethackrc file.
+
 ===========================================================================
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 1c997eef25c..92c0b366f78 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.37 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2011/06/01 11:20:30 wiz Exp $
 #
 
 .include "../../games/nethack-lib/Makefile.common"
 
 PKGNAME=		nethack-x11-${NETHACK_VERSION}
-PKGREVISION=		3
-COMMENT=		The X11 version of NetHack
+PKGREVISION=		4
+COMMENT=		The X11+tty version of NetHack
 
 CATEGORIES+=		x11
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}{,nb*}:../../games/nethack-lib
 
-
-BUILD_TARGET=		x11tiles nethack
+BUILD_TARGET=		nethack x11tiles rip.xpm
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
 
@@ -20,13 +19,22 @@ FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 
 INSTALLATION_DIRS=	lib/X11/app-defaults lib/X11/fonts/misc
 
+DISTINFO_FILE?=		${.CURDIR}/../nethack-lib/distinfo
+PATCHDIR=		${.CURDIR}/../nethack-lib/patches
+
+SPECIAL_PERMS+=		${PREFIX}/bin/nethack-x11			\
+			    ${GAMEPERM}
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/${NETHACK_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/win/X11/NetHack.ad \
-	    ${PREFIX}/lib/X11/app-defaults/NetHack
-	@${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf ${PREFIX}/lib/X11/fonts/misc
-	@${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
-	    ${PREFIX}/share/${NETHACK_DIR}/nethack.x11.rc
+	${INSTALL_DATA} ${WRKSRC}/dat/x11tiles \
+	    ${DESTDIR}${GAMEDIR}
+	${INSTALL_DATA} ${WRKSRC}/win/X11/NetHack.ad \
+	    ${DESTDIR}${PREFIX}/lib/X11/app-defaults/NetHack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf \
+	    ${DESTDIR}${PREFIX}/lib/X11/fonts/misc
+	${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.bdf \
+	    ${DESTDIR}${PREFIX}/lib/X11/fonts/misc
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
+	    ${DESTDIR}${GAMEDIR}/nethack.x11.rc
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/nethack-x11/PLIST b/games/nethack-x11/PLIST
index b1f2507eaa1..5c3c3937c13 100644
--- a/games/nethack-x11/PLIST
+++ b/games/nethack-x11/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/08 10:17:30 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/06/01 11:20:30 wiz Exp $
 bin/nethack-x11
-share/nethackdir340/x11tiles
-share/nethackdir340/nethack.x11.rc
 lib/X11/app-defaults/NetHack
+lib/X11/fonts/misc/ibm.bdf
 lib/X11/fonts/misc/nh10.bdf
+share/nethackdir340/nethack.x11.rc
+share/nethackdir340/x11tiles
diff --git a/games/nethack-x11/distinfo b/games/nethack-x11/distinfo
deleted file mode 100644
index 84e89e50b24..00000000000
--- a/games/nethack-x11/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.16 2005/12/19 19:42:08 joerg Exp $
-
-SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
-RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
-Size (nethack-343-src.tgz) = 3497458 bytes
-SHA1 (patch-aa) = b20a15dcb6db150aab19648068a186156bf76b90
-SHA1 (patch-ab) = 73a1ac287ded70f371bb38c82cdbcd36182ce3a5
-SHA1 (patch-ac) = 7be58a01d37d632f8eb8041f2811f482c3cc9686
-SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
-SHA1 (patch-af) = c7640150409d97a7930fef476191d34c08c6f741
-SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = 48b5972b9db3330d7087ff16816e0ae9b4ff208e
diff --git a/games/nethack-x11/patches/patch-aa b/games/nethack-x11/patches/patch-aa
deleted file mode 100644
index 440d7f1e5b1..00000000000
--- a/games/nethack-x11/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/03/05 15:21:01 pooka Exp $
-
---- include/config.h.orig	2003-12-08 01:39:13.000000000 +0200
-+++ include/config.h	2004-03-05 16:26:56.000000000 +0200
-@@ -42,8 +42,8 @@
-  * Define all of those you want supported in your binary.
-  * Some combinations make no sense.  See the installation document.
-  */
--#define TTY_GRAPHICS	/* good old tty based graphics */
--/* #define X11_GRAPHICS */	/* X11 interface */
-+/* #define TTY_GRAPHICS */	/* good old tty based graphics */
-+#define X11_GRAPHICS		/* X11 interface */
- /* #define QT_GRAPHICS */	/* Qt interface */
- /* #define GNOME_GRAPHICS */	/* Gnome interface */
- /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
-@@ -114,7 +114,7 @@
- #endif
- 
- #ifndef DEFAULT_WINDOW_SYS
--# define DEFAULT_WINDOW_SYS "tty"
-+# define DEFAULT_WINDOW_SYS "x11"
- #endif
- 
- #ifdef X11_GRAPHICS
-@@ -126,7 +126,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 +169,11 @@
- 
- #ifdef UNIX
- /* 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 "@GZIP_PROGRAM@"		/* FSF gzip compression */
-+#define COMPRESS_EXTENSION ".gz"		/* normal gzip extension */
- #endif
- 
- #ifndef COMPRESS
-@@ -204,7 +204,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"
-+#  define HACKDIR "XXXPREFIXXXX/share/nethackdir340"
- # endif
- 
- /*
-@@ -300,7 +300,7 @@
-  * functions that have been macroized.
-  */
- 
--/* #define VISION_TABLES */ /* use vision tables generated at compile time */
-+#define VISION_TABLES /* use vision tables generated at compile time */
- #ifndef VISION_TABLES
- # ifndef NO_MACRO_CPATH
- #  define MACRO_CPATH	/* use clear_path macros instead of functions */
diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab
deleted file mode 100644
index c2aa0916c81..00000000000
--- a/games/nethack-x11/patches/patch-ab
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2004/03/05 15:21:01 pooka Exp $
-
---- sys/unix/Makefile.top.orig	2003-12-08 01:39:13.000000000 +0200
-+++ sys/unix/Makefile.top	2004-03-05 15:40:57.000000000 +0200
-@@ -14,18 +14,17 @@
- # MAKE = make
- 
- # make NetHack
--PREFIX	 = /usr
- GAME     = nethack
- # GAME     = nethack.prg
--GAMEUID  = games
--GAMEGRP  = bin
-+GAMEUID  = root
-+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 = 2755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,12 +34,12 @@
- # 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)
--GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
-+GAMEDIR  = $(PREFIX)/share/$(GAME)dir340
- VARDIR  = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+SHELLDIR = $(PREFIX)/bin
- 
- # per discussion in Install.X11 and Install.Qt
--VARDATND = 
-+VARDATND =  pet_mark.xbm rip.xpm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
-@@ -87,9 +86,12 @@
- $(GAME):
- 	( cd src ; $(MAKE) )
- 
--all:	$(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
-+all:	$(GAME) datastuff
- 	@echo "Done."
- 
-+datastuff: recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
-+	@echo "Data Sets Built."
-+
- # Note: many of the dependencies below are here to allow parallel make
- # to generate valid output
- 
-@@ -183,18 +185,15 @@
- 		-e '}' 					\
- 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
- 	$(MAKE) dofiles-$${target-nodlb}
--	cp src/$(GAME) $(GAMEDIR)
--	cp util/recover $(GAMEDIR)
-+	cp util/recover $(PREFIX)/bin
- 	-rm -f $(SHELLDIR)/$(GAME)
- 	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
- 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
-+		-e 's;XXXPREFIXXXX;$(PREFIX);' \
- 		< sys/unix/nethack.sh \
- 		> $(SHELLDIR)/$(GAME)
- # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
--			$(CHGRP) $(GAMEGRP) $(GAME) recover )
--	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
--	chmod $(EXEPERM) $(GAMEDIR)/recover
-+	chmod $(EXEPERM) $(PREFIX)/bin/recover
- 	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
- 	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
- 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
-@@ -230,16 +229,16 @@
- # and a reminder
- 	@echo You may also want to install the man pages via the doc Makefile.
- 
--install: $(GAME) recover $(VARDAT) dungeon spec_levs
-+install-dat: recover $(VARDAT) dungeon spec_levs
- # set up the directories
- # not all mkdirs have -p; those that don't will create a -p directory
- 	-mkdir -p $(SHELLDIR)
--	-rm -rf $(GAMEDIR) $(VARDIR)
- 	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
- 	-rmdir ./-p
- 	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
- 	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
--	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
-+	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR)
-+	chmod 770 $(VARDIR)/save
- # set up the game files
- 	( $(MAKE) dofiles )
- # set up some additional files
-@@ -247,9 +246,20 @@
- 	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
- 			$(CHGRP) $(GAMEGRP) perm record logfile ; \
- 			chmod $(FILEPERM) perm record logfile )
-+	-touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
-+	-touch -c $(VARDIR)/save/*
-+	-mkdir -p $(PREFIX)/share/doc/nethack
-+	cp doc/Guidebook $(PREFIX)/share/doc/nethack
-+	chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/nethack/Guidebook
-+	chmod $(FILEPERM) $(PREFIX)/share/doc/nethack/Guidebook
- # and a reminder
- 	@echo You may also want to reinstall the man pages via the doc Makefile.
- 
-+binfiles: $(GAME)
-+	cp src/$(GAME) $(SHELLDIR)/$(GAME)$(GTYPE)
-+	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)$(GTYPE) ; \
-+		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)$(GTYPE) )
-+	 chmod $(GAMEPERM) $(SHELLDIR)/$(GAME)$(GTYPE)
- 
- # 'make clean' removes all the .o files, but leaves around all the executables
- # and compiled data files
diff --git a/games/nethack-x11/patches/patch-ac b/games/nethack-x11/patches/patch-ac
deleted file mode 100644
index 7f1c4424fcd..00000000000
--- a/games/nethack-x11/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/12/19 19:42:08 joerg Exp $
-
---- include/system.h.orig	2003-12-08 01:39:13.000000000 +0200
-+++ include/system.h	2004-03-05 15:44:53.000000000 +0200
-@@ -79,10 +79,10 @@
- # if !defined(__SC__) && !defined(LINUX)
- E  long NDECL(random);
- # endif
--# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
-+# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
--#  if !defined(bsdi) && !defined(__FreeBSD__)
-+#  if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
-@@ -132,7 +132,7 @@
- E void FDECL(qsort, (genericptr_t,size_t,size_t,
- 		     int(*)(const genericptr,const genericptr)));
- #else
--# if defined(BSD) || defined(ULTRIX)
-+# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__)
- E  int qsort();
- # else
- #  if !defined(LATTICE) && !defined(AZTEC_50)
-@@ -421,7 +421,7 @@
- # ifdef HPUX
- E unsigned int	FDECL(strlen, (char *));
- #  else
--#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
-+#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) && !defined(__DragonFly__)
- E int	FDECL(strlen, (const char *));
- #   endif
- #  endif /* HPUX */
-@@ -521,7 +521,7 @@
- #  endif
- # endif
- 
--# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
-+# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__)
- E time_t FDECL(time, (time_t *));
- # else
- E long FDECL(time, (time_t *));
diff --git a/games/nethack-x11/patches/patch-ae b/games/nethack-x11/patches/patch-ae
deleted file mode 100644
index 897d633eb7b..00000000000
--- a/games/nethack-x11/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/03/05 15:21:01 pooka Exp $
-
---- sys/unix/Makefile.doc.orig	2003-02-23 16:43:39.000000000 +0200
-+++ sys/unix/Makefile.doc	2003-03-01 16:36:19.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= $(PREFIX)/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
diff --git a/games/nethack-x11/patches/patch-af b/games/nethack-x11/patches/patch-af
deleted file mode 100644
index be80d38a973..00000000000
--- a/games/nethack-x11/patches/patch-af
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-af,v 1.4 2004/03/05 15:21:01 pooka Exp $
-
---- include/unixconf.h.orig	2003-12-08 01:39:13.000000000 +0200
-+++ include/unixconf.h	2004-03-05 15:47:53.000000000 +0200
-@@ -19,20 +19,20 @@
-  */
- 
- /* 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 */
- 
- 
- /* define any of the following that are appropriate */
--#define SVR4		/* use in addition to SYSV for System V Release 4 */
-+/* #define SVR4	*/	/* use in addition to SYSV for System V Release 4 */
- 			/* including Solaris 2+ */
- #define NETWORK		/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
-@@ -47,7 +47,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
-@@ -171,7 +171,7 @@
- #  ifdef AMS
- #define AMS_MAILBOX	"/Mailbox"
- #  else
--#   if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#   if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define DEF_MAILREADER	"/usr/bin/mail"
- #   else
- #define DEF_MAILREADER	"/usr/ucb/Mail"
diff --git a/games/nethack-x11/patches/patch-ag b/games/nethack-x11/patches/patch-ag
deleted file mode 100644
index 380089daeb9..00000000000
--- a/games/nethack-x11/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2004/03/05 15:21:01 pooka Exp $
-
---- src/mail.c.orig	Wed Aug  9 21:02:04 2000
-+++ src/mail.c	Thu Aug 10 18:32:30 2000
-@@ -71,7 +71,7 @@
- # if !defined(MAILPATH) && (defined(LINUX) || defined(__osf__))
- #  define MAILPATH "/var/spool/mail/"
- # endif
--# if !defined(MAILPATH) && defined(__FreeBSD__)
-+# if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(__NetBSD__))
- #  define MAILPATH "/var/mail/"
- # endif
- # if !defined(MAILPATH) && (defined(BSD) || defined(ULTRIX))
diff --git a/games/nethack-x11/patches/patch-ah b/games/nethack-x11/patches/patch-ah
deleted file mode 100644
index 4b4b3d22035..00000000000
--- a/games/nethack-x11/patches/patch-ah
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2003/09/02 00:30:57 pooka Exp $
-
---- sys/unix/Makefile.src.orig	2003-08-30 03:08:04.000000000 +0300
-+++ sys/unix/Makefile.src	2003-09-02 03:08:18.000000000 +0300
-@@ -151,8 +151,8 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O -I../include
--LFLAGS = 
-+CFLAGS += -I../include -I${X11BASE}/include
-+LFLAGS = ${LDFLAGS}
- 
- # 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
-@@ -214,8 +214,8 @@
- 
- #
- #
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINX11SRC)
-+WINOBJ = $(WINX11OBJ)
- 
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -235,7 +235,7 @@
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
- # WINX11LIB = -lXaw -lXmu -lXt -lX11
- # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
-@@ -255,7 +255,7 @@
- # libraries for BeOS 
- WINBELIB = -lbe
- 
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINX11LIB)
- 
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)