Install x11tiles the proper way for nethack-x11. This fixes the problem

of nethack-x11 not having `pretty' graphics reported by Julian Coleman on
tech-pkg

3 files changed, 14 insertions, 17 deletions

diff --git a/games/nethack-lib/files/patch-sum b/games/nethack-lib/files/patch-sum
index 476221df821..47c9db45a58 100644
--- a/games/nethack-lib/files/patch-sum
+++ b/games/nethack-lib/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.7 2000/08/21 19:57:07 pooka Exp $
+$NetBSD: patch-sum,v 1.8 2000/11/27 22:31:03 pooka Exp $
 
 MD5 (patch-aa) = 98c413b5d1b5c3b021e30a91e1d6da0b
-MD5 (patch-ab) = 069a69492f8662fdb097ffb5f527b557
+MD5 (patch-ab) = 3f975bd5a040d55a622d22096ae3399e
 MD5 (patch-ac) = d775a25ca6c4680d41858f2c52d1854c
 MD5 (patch-ad) = 1c894f6943c2b5edfcca5e36a6f43c4d
 MD5 (patch-ae) = aa584b7e7b691f5fd031efae81b9b142
diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab
index bd583b5a77b..807e3524c47 100644
--- a/games/nethack-lib/patches/patch-ab
+++ b/games/nethack-lib/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
+$NetBSD: patch-ab,v 1.6 2000/11/27 22:31:03 pooka Exp $
 
 --- sys/unix/Makefile.top.orig	Tue Jul  4 03:42:05 2000
-+++ sys/unix/Makefile.top	Mon Aug 21 22:48:26 2000
++++ sys/unix/Makefile.top	Mon Nov 27 23:14:25 2000
 @@ -14,18 +14,17 @@
  # MAKE = make
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  
  # GAMEDIR also appears in config.h as "HACKDIR".
  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,14 +34,13 @@
+@@ -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)
@@ -38,13 +38,11 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  
  # per discussion in Install.X11 and Install.Qt
 -VARDATND = 
++VARDATND = pet_mark.xbm rip.xpm
  # VARDATND = x11tiles pet_mark.xbm
--# VARDATND = x11tiles pet_mark.xbm rip.xpm
-+VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # VARDATND = x11tiles pet_mark.xbm rip.xpm
  # for Atari/Gem
- # VARDATND = nh16.img title.img GEM_RSC.RSC
- # for BeOS
-@@ -87,9 +85,12 @@
+@@ -87,9 +86,12 @@
  $(GAME):
  	( cd src ; $(MAKE) )
  
@@ -58,7 +56,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  Guidebook:
  	( cd doc ; $(MAKE) Guidebook )
  
-@@ -99,6 +100,9 @@
+@@ -99,6 +101,9 @@
  data:
  	( cd dat ; $(MAKE) data )
  
@@ -68,7 +66,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  rumors:
  	( cd dat ; $(MAKE) rumors )
  
-@@ -156,6 +160,11 @@
+@@ -156,6 +161,11 @@
  	( cd util ; $(MAKE) dlb )
  	( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
  
@@ -80,7 +78,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  
  dofiles:
  	target=`sed -n					\
-@@ -165,16 +174,13 @@
+@@ -165,16 +175,13 @@
  		-e '}' 					\
  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
@@ -98,7 +96,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
  	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
  	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
-@@ -210,16 +216,16 @@
+@@ -210,16 +217,16 @@
  # and a reminder
  	@echo You may also want to install the man pages via the doc Makefile.
  
@@ -118,7 +116,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/21 19:57:08 pooka Exp $
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
-@@ -227,6 +233,14 @@
+@@ -227,6 +234,14 @@
  	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
  			$(CHGRP) $(GAMEGRP) perm record logfile ; \
  			chmod $(FILEPERM) perm record logfile )
diff --git a/games/nethack-lib/pkg/PLIST b/games/nethack-lib/pkg/PLIST
index e5dc10c9274..b2310bf79d5 100644
--- a/games/nethack-lib/pkg/PLIST
+++ b/games/nethack-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/04/14 14:06:54 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/11/27 22:31:03 pooka Exp $
 bin/nethack
 bin/recover
 man/man6/nethack.6
@@ -8,7 +8,6 @@ man/man6/recover.6
 man/man6/dlb.6
 share/nethackdir/rip.xpm
 share/nethackdir/pet_mark.xbm
-share/nethackdir/x11tiles
 share/nethackdir/license
 share/nethackdir/quest.dat
 share/nethackdir/options