Fix a path in Makequest and remove hack.sh (it never worked).

OK tb@

3 files changed, 4 insertions, 90 deletions

diff --git a/games/hack/Makequest b/games/hack/Makequest
index 2aa9328c7c2..d704bcaaf99 100644
--- a/games/hack/Makequest
+++ b/games/hack/Makequest
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makequest,v 1.3 2001/01/28 23:41:42 niklas Exp $
+#	$OpenBSD: Makequest,v 1.4 2017/06/20 20:40:54 akfaew Exp $
 #	$NetBSD: Makequest,v 1.2 1995/03/23 08:29:08 cgd Exp $
 #
 # Hack or Quest Makefile.
@@ -9,7 +9,7 @@ TERMLIB = -lcurses
 
 # make hack
 GAME = quest
-GAMEDIR = /usr/games/lib/questdir
+GAMEDIR = /var/games/questdir
 CFLAGS = -g -DQUEST
 HACKCSRC = hack.Decl.c\
 	hack.apply.c hack.bones.c hack.c hack.cmd.c hack.do.c\
@@ -37,7 +37,7 @@ HSOURCES = hack.h hack.mfndpos.h config.h\
 
 SOURCES = $(CSOURCES) $(HSOURCES)
 
-AUX = data help hh rumors hack.6 hack.sh
+AUX = data help hh rumors hack.6
 
 DISTR = $(SOURCES) $(AUX) READ_ME Makefile date.h hack.onames.h
 
diff --git a/games/hack/READ_ME b/games/hack/READ_ME
index 1ff723a375a..f61c17c1214 100644
--- a/games/hack/READ_ME
+++ b/games/hack/READ_ME
@@ -1,4 +1,4 @@
-$OpenBSD: READ_ME,v 1.3 2001/01/28 23:41:42 niklas Exp $
+$OpenBSD: READ_ME,v 1.4 2017/06/20 20:40:54 akfaew Exp $
 $NetBSD: READ_ME,v 1.2 1995/03/23 08:29:12 cgd Exp $
 
 Hack is a display oriented dungeons & dragons - like game.
@@ -31,12 +31,6 @@ Files for hack:
 			(Some of these contain information on the game,
 			others are just plain stupid. Additional rumors
 			are appreciated.)
-	hack.sh		A shell script.
-			(We have hack.sh in /usr/games/hack and
-			hack in /usr/games/lib/hackdir/hack and all the other
-			hack stuff in /usr/games/lib/hackdir - perhaps this
-			will make the script clear.
-			There is no need for you to use it.)
 	READ_ME		This file.
 	Original_READ_ME Jay Fenlason's READ_ME
 
@@ -88,8 +82,6 @@ $ hack [-d hackdir] [maxnrofplayers]
 (for playing) or
 $ hack [-d hackdir] -s [listofusers | limit | all]
 (for seeing part of the scorelist).
-The shell file hack (in this kit called hack.sh) takes care of
-calling hack with the right arguments.
 
 Send complaints, bug reports, suggestions for improvements to
 mcvax!aeb - in real life Andries Brouwer.
diff --git a/games/hack/hack.sh b/games/hack/hack.sh
deleted file mode 100644
index 440d9960a93..00000000000
--- a/games/hack/hack.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: hack.sh,v 1.3 2003/03/16 21:22:36 camield Exp $
-#	$NetBSD: hack.sh,v 1.2 1995/03/23 08:31:30 cgd Exp $
-
-#
-# Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
-# Amsterdam
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# - Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# - Neither the name of the Stichting Centrum voor Wiskunde en
-# Informatica, nor the names of its contributors may be used to endorse or
-# promote products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-# THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-HACKDIR=/usr/games/lib/hackdir
-HACK=$HACKDIR/hack
-MAXNROFPLAYERS=4
-
-cd $HACKDIR
-case $1 in
-	-s*)
-		exec $HACK $@
-		;;
-	*)
-		exec $HACK $@ $MAXNROFPLAYERS
-		;;
-esac