7054109 Move nethack to userland
authorRich Burridge <rich.burridge@oracle.com>
Tue, 14 Jun 2011 13:02:49 -0700
changeset 301 ab9eef4f4029
parent 300 6bbccb36ba62
child 302 0b738df97c00
7054109 Move nethack to userland
components/meta-packages/history/SUNWnethack.p5m
components/nethack/Makefile
components/nethack/nethack.copyright
components/nethack/nethack.p5m
components/nethack/patches/nethack.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWnethack.p5m	Tue Jun 14 13:02:49 2011 -0700
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=games/[email protected] type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nethack/Makefile	Tue Jun 14 13:02:49 2011 -0700
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		nethack
+COMPONENT_VERSION=	3.4.3
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-343-src.tgz
+COMPONENT_ARCHIVE_HASH=	sha1:c26537093c38152bc0fbcec20468d975b35f59fd
+COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
+
+include ../../make-rules/prep.mk
+include ../../make-rules/justmake.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL=0
+
+# Need to use Makefiles in the sys/unix directory and copy them into various
+# other directories.
+#
+COMPONENT_PREP_ACTION= (cd $(SOURCE_DIR)/sys/unix ; sh setup.sh)
+
+COMPONENT_INSTALL_ARGS += CHOWN=true
+COMPONENT_INSTALL_ARGS += CHGRP=true
+COMPONENT_INSTALL_ARGS += ROOT=$(PROTO_DIR)
+
+PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+	sed -e 's/^!\(NetHack.tomb\)/\1/' -e 's/^!\(NetHack.pet\)/\1/' \
+		-e 's/^!\(NetHack.tile_file\)/\1/' \
+		$(COMPONENT_SRC)/win/X11/NetHack.ad \
+		> $(PROTO_DIR)/usr/lib/nethack/NetHack.ad
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nethack/nethack.copyright	Tue Jun 14 13:02:49 2011 -0700
@@ -0,0 +1,150 @@
+----------------------------------------------------------------------
+"NetHack, Copyright 1985-2003"
+Copyright 1991 University of Wisconsin-Madison
+Copyright (c) 1983 Regents of the University of California.
+Copyright (C) 1987-1990 by Ken Arromdee
+Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+Copyright (C) 1991,1993,1995 by Robert Patrick Rankin
+Copyright (C) 1998 by Anthony Taylor <[email protected]>
+Copyright (C) 1998 by Erik Andersen <[email protected]>
+Copyright (C) 2001-2003 by Alex Kompel <[email protected]>
+Copyright (C) 2002 by Dylan Alex Simon
+Copyright (c) 1988-1989 AT&T
+Copyright (c) 1989,1992 Janet Walz
+Copyright (c) 1989 Mike Threepoint
+Copyright (c) 1989-1996 by Jean-Christophe Collet
+Copyright (c) 1986-1995 by M. Stephenson
+Copyright (c) 1989y Norm Meluch and Stephen Spackman
+Copyright (c) 1991-1993 P. Winner
+Copyright (c) 1990-1993 by David Cohrs
+Copyright (c) 1989,1991-1993 Izchak Miller
+Copyright (c) 1992 by Jon Watte
+Copyright (c) 1991-1996 Gregg Wonderly, Naperville Illinois
+Copyright (c) 1994 by Boudewijn Wayers
+Copyright (c) 1994-1996 Andrew Church, Olney, Maryland
+Copyright (c) 1990-1996,2002 by Dean Luick
+Copyright (c) 1991 Michael Hamel
+Copyright (c) 1998-1999,2002 by Kevin Hugo
+Copyright (c) 2002 Mark Modrall
+Copyright (c) 1989 Benson I. Margulies
+Copyright (c) 1989 Steve Linhart
+Copyright (c) 1989 Eric Raymond
+Copyright (c) 1999-2002 Christian Bressler
+Copyright (c) 1993 David Hairston
+Copyright (c) 2000 Janne Salmij??rv
+Copyright (c) 1992 Hao-Yang Wang, Jonathan Handler
+Copyright (c) 1990-1996 Kenneth Lorber
+Copyright (c) 1992-1993 Jon W{tte 1993.
+Copyright (c) 1997 Michael Allison
+Copyright (c) 1990-2003 NetHack PC Development Team 1990-2003
+Copyright (c) 1993 Macintosh NetHack Port Team
+Copyright (c) 1992-1999 the NetHack Development Team
+Copyright (c) 1988-1992 Olaf Seibert
+Copyright (c) 2001 Slash'EM development team
+Copyright (c) 1988 Steve Creps
+Copyright (c) 1985-2003 Stichting Mathematisch Centrum, Amsterdam
+Copyright (c) Timo Hakulinen, 1990, 1991, 1992, 1993, 1996.
+Copyright (c) 1999-2002 Yitzhak Sapir
+Copyright (c) 1996-2001 Warwick Allison
+Copyright (c) 1986 Scott R. Turner, [email protected]
+Copyright (c) 1990 David Koblas
+COPYRIGHT "Copyright 1989-1991 Network Computing Devices, Inc."
+with acknowledgements to Kevin Darcy
+----------------------------------------------------------------------
+                    NETHACK GENERAL PUBLIC LICENSE
+                    (Copyright 1989 M. Stephenson)
+
+               (Based on the BISON general public license,
+                   copyright 1988 Richard M. Stallman)
+
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed.  You can also use this wording to
+ make the terms for other programs.
+
+  The license agreements of most software companies keep you at the mercy of
+those companies.  By contrast, our general public license is intended to give
+everyone the right to share NetHack.  To make sure that you get the rights we
+want you to have, we need to make restrictions that forbid anyone to deny you
+these rights or to ask you to surrender the rights.  Hence this license
+agreement.
+
+  Specifically, we want to make sure that you have the right to give away
+copies of NetHack, that you receive source code or else can get it if you
+want it, that you can change NetHack or use pieces of it in new free
+programs, and that you know you can do these things.
+
+  To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights.  For example, if you distribute copies
+of NetHack, you must give the recipients all the rights that you have.  You
+must make sure that they, too, receive or can get the source code.  And you
+must tell them their rights.
+
+  Also, for our own protection, we must make certain that everyone finds out
+that there is no warranty for NetHack.  If NetHack is modified by someone
+else and passed on, we want its recipients to know that what they have is
+not what we distributed.
+
+  Therefore we (Mike Stephenson and other holders of NetHack copyrights) make
+the following terms which say what you must do to be allowed to distribute or
+change NetHack.
+
+
+                        COPYING POLICIES
+
+  1. You may copy and distribute verbatim copies of NetHack source code as
+you receive it, in any medium, provided that you keep intact the notices on
+all files that refer to copyrights, to this License Agreement, and to the
+absence of any warranty; and give any other recipients of the NetHack
+program a copy of this License Agreement along with the program.
+
+  2. You may modify your copy or copies of NetHack or any portion of it, and
+copy and distribute such modifications under the terms of Paragraph 1 above
+(including distributing this License Agreement), provided that you also do the
+following:
+
+    a) cause the modified files to carry prominent notices stating that you
+    changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish, that in
+    whole or in part contains or is a derivative of NetHack or any part
+    thereof, to be licensed at no charge to all third parties on terms
+    identical to those contained in this License Agreement (except that you
+    may choose to grant more extensive warranty protection to some or all
+    third parties, at your option)
+
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty protection
+    in exchange for a fee.
+
+  3. You may copy and distribute NetHack (or a portion or derivative of it,
+under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete machine-readable source code, which
+    must be distributed under the terms of Paragraphs 1 and 2 above; or,
+
+    b) accompany it with full information as to how to obtain the complete
+    machine-readable source code from an appropriate archive site.  (This
+    alternative is allowed only for noncommercial distribution.)
+
+For these purposes, complete source code means either the full source
+distribution as originally released over Usenet or updated copies of the
+files in this distribution used to create the object code or executable.
+
+  4. You may not copy, sublicense, distribute or transfer NetHack except as
+expressly provided under this License Agreement.  Any attempt otherwise to
+copy, sublicense, distribute or transfer NetHack is void and your rights to
+use the program under this License agreement shall be automatically
+terminated.  However, parties who have received computer software programs
+from you with this License Agreement will not have their licenses terminated
+so long as such parties remain in full compliance.
+
+
+Stated plainly:  You are permitted to modify NetHack, or otherwise use parts
+of NetHack, provided that you comply with the conditions specified above;
+in particular, your modified NetHack or program containing parts of NetHack
+must remain freely available as provided in this License Agreement.  In
+other words, go ahead and share NetHack, but don't try to stop anyone else
+from sharing it farther.
+
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nethack/nethack.p5m	Tue Jun 14 13:02:49 2011 -0700
@@ -0,0 +1,198 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/games/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue.  The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard."
+set name=pkg.summary value="A single-player dungeon exploration game"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Games
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url \
+    value=http://www.nethack.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/172
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license nethack.copyright license=Nethack
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/nethack
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man6
+dir path=var
+dir path=var/games
+dir path=var/games/nethack mode=0775 group=games
+dir path=var/games/nethack/save mode=0775 group=games
+
+file path=usr/bin/nethack
+file path=usr/lib/nethack/Arc-fila.lev
+file path=usr/lib/nethack/Arc-filb.lev
+file path=usr/lib/nethack/Arc-goal.lev
+file path=usr/lib/nethack/Arc-loca.lev
+file path=usr/lib/nethack/Arc-strt.lev
+file path=usr/lib/nethack/Bar-fila.lev
+file path=usr/lib/nethack/Bar-filb.lev
+file path=usr/lib/nethack/Bar-goal.lev
+file path=usr/lib/nethack/Bar-loca.lev
+file path=usr/lib/nethack/Bar-strt.lev
+file path=usr/lib/nethack/Cav-fila.lev
+file path=usr/lib/nethack/Cav-filb.lev
+file path=usr/lib/nethack/Cav-goal.lev
+file path=usr/lib/nethack/Cav-loca.lev
+file path=usr/lib/nethack/Cav-strt.lev
+file path=usr/lib/nethack/Hea-fila.lev
+file path=usr/lib/nethack/Hea-filb.lev
+file path=usr/lib/nethack/Hea-goal.lev
+file path=usr/lib/nethack/Hea-loca.lev
+file path=usr/lib/nethack/Hea-strt.lev
+file path=usr/lib/nethack/Kni-fila.lev
+file path=usr/lib/nethack/Kni-filb.lev
+file path=usr/lib/nethack/Kni-goal.lev
+file path=usr/lib/nethack/Kni-loca.lev
+file path=usr/lib/nethack/Kni-strt.lev
+file path=usr/lib/nethack/Mon-fila.lev
+file path=usr/lib/nethack/Mon-filb.lev
+file path=usr/lib/nethack/Mon-goal.lev
+file path=usr/lib/nethack/Mon-loca.lev
+file path=usr/lib/nethack/Mon-strt.lev
+file path=usr/lib/nethack/NetHack.ad
+file path=usr/lib/nethack/Pri-fila.lev
+file path=usr/lib/nethack/Pri-filb.lev
+file path=usr/lib/nethack/Pri-goal.lev
+file path=usr/lib/nethack/Pri-loca.lev
+file path=usr/lib/nethack/Pri-strt.lev
+file path=usr/lib/nethack/Ran-fila.lev
+file path=usr/lib/nethack/Ran-filb.lev
+file path=usr/lib/nethack/Ran-goal.lev
+file path=usr/lib/nethack/Ran-loca.lev
+file path=usr/lib/nethack/Ran-strt.lev
+file path=usr/lib/nethack/Rog-fila.lev
+file path=usr/lib/nethack/Rog-filb.lev
+file path=usr/lib/nethack/Rog-goal.lev
+file path=usr/lib/nethack/Rog-loca.lev
+file path=usr/lib/nethack/Rog-strt.lev
+file path=usr/lib/nethack/Sam-fila.lev
+file path=usr/lib/nethack/Sam-filb.lev
+file path=usr/lib/nethack/Sam-goal.lev
+file path=usr/lib/nethack/Sam-loca.lev
+file path=usr/lib/nethack/Sam-strt.lev
+file path=usr/lib/nethack/Tou-fila.lev
+file path=usr/lib/nethack/Tou-filb.lev
+file path=usr/lib/nethack/Tou-goal.lev
+file path=usr/lib/nethack/Tou-loca.lev
+file path=usr/lib/nethack/Tou-strt.lev
+file path=usr/lib/nethack/Val-fila.lev
+file path=usr/lib/nethack/Val-filb.lev
+file path=usr/lib/nethack/Val-goal.lev
+file path=usr/lib/nethack/Val-loca.lev
+file path=usr/lib/nethack/Val-strt.lev
+file path=usr/lib/nethack/Wiz-fila.lev
+file path=usr/lib/nethack/Wiz-filb.lev
+file path=usr/lib/nethack/Wiz-goal.lev
+file path=usr/lib/nethack/Wiz-loca.lev
+file path=usr/lib/nethack/Wiz-strt.lev
+file path=usr/lib/nethack/air.lev
+file path=usr/lib/nethack/asmodeus.lev
+file path=usr/lib/nethack/astral.lev
+file path=usr/lib/nethack/baalz.lev
+file path=usr/lib/nethack/bigrm-1.lev
+file path=usr/lib/nethack/bigrm-2.lev
+file path=usr/lib/nethack/bigrm-3.lev
+file path=usr/lib/nethack/bigrm-4.lev
+file path=usr/lib/nethack/bigrm-5.lev
+file path=usr/lib/nethack/castle.lev
+file path=usr/lib/nethack/cmdhelp
+file path=usr/lib/nethack/data
+file path=usr/lib/nethack/dungeon
+file path=usr/lib/nethack/earth.lev
+file path=usr/lib/nethack/fakewiz1.lev
+file path=usr/lib/nethack/fakewiz2.lev
+file path=usr/lib/nethack/fire.lev
+file path=usr/lib/nethack/help
+file path=usr/lib/nethack/hh
+file path=usr/lib/nethack/history
+file path=usr/lib/nethack/juiblex.lev
+file path=usr/lib/nethack/knox.lev
+file path=usr/lib/nethack/license
+file path=usr/lib/nethack/medusa-1.lev
+file path=usr/lib/nethack/medusa-2.lev
+file path=usr/lib/nethack/minefill.lev
+file path=usr/lib/nethack/minend-1.lev
+file path=usr/lib/nethack/minend-2.lev
+file path=usr/lib/nethack/minend-3.lev
+file path=usr/lib/nethack/minetn-1.lev
+file path=usr/lib/nethack/minetn-2.lev
+file path=usr/lib/nethack/minetn-3.lev
+file path=usr/lib/nethack/minetn-4.lev
+file path=usr/lib/nethack/minetn-5.lev
+file path=usr/lib/nethack/minetn-6.lev
+file path=usr/lib/nethack/minetn-7.lev
+file path=usr/lib/nethack/nethack mode=2555 group=games
+file path=usr/lib/nethack/opthelp
+file path=usr/lib/nethack/options
+file path=usr/lib/nethack/oracle.lev
+file path=usr/lib/nethack/oracles
+file path=usr/lib/nethack/orcus.lev
+file path=usr/lib/nethack/pet_mark.xbm
+file path=usr/lib/nethack/quest.dat
+file path=usr/lib/nethack/recover mode=0555
+file path=usr/lib/nethack/rip.xpm
+file path=usr/lib/nethack/rumors
+file path=usr/lib/nethack/sanctum.lev
+file path=usr/lib/nethack/soko1-1.lev
+file path=usr/lib/nethack/soko1-2.lev
+file path=usr/lib/nethack/soko2-1.lev
+file path=usr/lib/nethack/soko2-2.lev
+file path=usr/lib/nethack/soko3-1.lev
+file path=usr/lib/nethack/soko3-2.lev
+file path=usr/lib/nethack/soko4-1.lev
+file path=usr/lib/nethack/soko4-2.lev
+file path=usr/lib/nethack/tower1.lev
+file path=usr/lib/nethack/tower2.lev
+file path=usr/lib/nethack/tower3.lev
+file path=usr/lib/nethack/valley.lev
+file path=usr/lib/nethack/water.lev
+file path=usr/lib/nethack/wizard1.lev
+file path=usr/lib/nethack/wizard2.lev
+file path=usr/lib/nethack/wizard3.lev
+file path=usr/lib/nethack/wizhelp
+file path=usr/lib/nethack/x11tiles
+
+file nethack.6 path=usr/share/man/man6/nethack.6
+
+file path=var/games/nethack/logfile mode=0664 group=games \
+    original_name=SUNWnethack:var/games/nethack/logfile preserve=true
+file path=var/games/nethack/perm mode=0664 group=games \
+    original_name=SUNWnethack:var/games/nethack/perm preserve=true
+file path=var/games/nethack/record mode=0664 group=games \
+    original_name=SUNWnethack:var/games/nethack/record preserve=true
+
+legacy pkg=SUNWnethack \
+	desc="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue.  The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard." \
+	name="Nethack - a single-player dungeon exploration game"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nethack/patches/nethack.patch	Tue Jun 14 13:02:49 2011 -0700
@@ -0,0 +1,152 @@
+--- include/config.h.old	Sun Dec  7 15:39:13 2003
++++ include/config.h	Sun Mar 30 12:37:01 2008
[email protected]@ -43,7 +43,7 @@
+  * Some combinations make no sense.  See the installation document.
+  */
+ #define TTY_GRAPHICS	/* good old tty based graphics */
+-/* #define X11_GRAPHICS */	/* X11 interface */
++#define X11_GRAPHICS	/* X11 interface */
+ /* #define QT_GRAPHICS */	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
+ /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */
[email protected]@ -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
[email protected]@ -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 "/usr/bin/gzip"	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz"		/* normal gzip extension */
+ #endif
+ 
+ #ifndef COMPRESS
[email protected]@ -204,7 +204,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/nethackdir"
++#  define HACKDIR "/usr/lib/nethack"
+ # endif
+ 
+ /*
[email protected]@ -300,7 +300,7 @@
+  * functions that have been macroized.
+  */
+ 
+-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
++#define VISION_TABLES 1 /* use vision tables generated at compile time */
+ #ifndef VISION_TABLES
+ # ifndef NO_MACRO_CPATH
+ #  define MACRO_CPATH	/* use clear_path macros instead of functions */
+--- include/unixconf.h.old	2003-12-07 15:39:13.000000000 -0800
++++ include/unixconf.h	2007-09-27 09:12:36.692549857 -0700
[email protected]@ -96,13 +96,13 @@
+  */
+ 
+ /* #define NO_FILE_LINKS */	/* if no hard links */
+-/* #define LOCKDIR "/usr/games/lib/nethackdir" */	/* where to put locks */
++#define LOCKDIR "/var/games/nethack" /* where to put locks */
+ 
+ /*
+  * If you want the static parts of your playground on a read-only file
+  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
+  */
+-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
++#define VAR_PLAYGROUND "/var/games/nethack"
+ 
+ 
+ /*
[email protected]@ -132,7 +132,7 @@
+  * "extra output" method is used, but not all systems provide access to
+  * a fine-grained timer.
+  */
+-/* #define TIMED_DELAY */	/* usleep() */
++#define TIMED_DELAY 1	/* usleep() */
+ #endif
+ 
+ /*
+--- sys/unix/Makefile.src.old	Sun Dec  7 15:39:13 2003
++++ sys/unix/Makefile.src	Sun Mar 30 12:38:36 2008
[email protected]@ -214,8 +214,8 @@
+ 
+ #
+ #
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC)
++WINOBJ = $(WINTTYOBJ) $(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
[email protected]@ -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 = -L/usr/openwin/lib -R/usr/openwin/lib -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
[email protected]@ -255,7 +255,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = -Wl,-zignore $(WINTTYLIB) $(WINX11LIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+--- sys/unix/Makefile.top.old	Sun Dec  7 15:39:13 2003
++++ sys/unix/Makefile.top	Sun Mar 30 12:42:20 2008
[email protected]@ -22,7 +22,7 @@
+ 
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
++GAMEPERM = 02755
+ FILEPERM = 0644
+ EXEPERM  = 0755
+ DIRPERM  = 0755
[email protected]@ -35,14 +35,15 @@
+ # 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
+-VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++GAMEDIR  = $(ROOT)/$(PREFIX)/lib/$(GAME)
++CLIENT_GAMEDIR = $(PREFIX)/lib/$(GAME)
++VARDIR  = $(ROOT)/var/games/nethack
++SHELLDIR = $(ROOT)/$(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+ VARDATND = 
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
+-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
++VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
+ # for BeOS
[email protected]@ -186,7 +187,7 @@
+ 	cp src/$(GAME) $(GAMEDIR)
+ 	cp util/recover $(GAMEDIR)
+ 	-rm -f $(SHELLDIR)/$(GAME)
+-	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
++	sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_GAMEDIR);' \
+ 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
+ 		< sys/unix/nethack.sh \
+ 		> $(SHELLDIR)/$(GAME)