Update to 3.0; based on 3.0beta version by the author and color patches

by Chuck Cranor, and some cleanup by me: now with color-support and
8 new levels.

7 files changed, 32 insertions, 93 deletions

diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index cc01bdb9dcd..ca6effe929a 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/19 20:00:06 wiz Exp $
 #
 
-DISTNAME=	golddig2
-PKGNAME=	golddig-2.0
+DISTNAME=	golddigC3.0
+PKGNAME=	golddig-3.0
 CATEGORIES=	games x11
-MASTER_SITES=	ftp://uiarchive.cso.uiuc.edu/pub/systems/linux/sunsite/games/arcade/
+MASTER_SITES=	http://www.netbsd.org/~chuck/gz/
 
-MAINTAINER=	root@garbled.net
+MAINTAINER=	wiz@netbsd.org
 COMMENT=	Fast action game designed for use with X
 
 USE_X11BASE=	yes
 
-post-extract:
-	${RM} ${WRKSRC}/golddig ${WRKSRC}/makelev ${WRKSRC}/*.o
+post-build:
+	for f in ${WRKSRC}/golddig.6 ${WRKSRC}/gdedit.6; do \
+		${SED} "s|@PREFIX@|${PREFIX}|g" $$f > $$f.new && \
+		${MV} $$f.new $$f; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/golddig/files/md5 b/games/golddig/files/md5
index 4ee595749d5..f73cf6bff15 100644
--- a/games/golddig/files/md5
+++ b/games/golddig/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:33 agc Exp $
+$NetBSD: md5,v 1.3 2001/03/19 20:00:07 wiz Exp $
 
-MD5 (golddig2.tar.gz) = d79493162bb06540afc3dd7c016f20e4
+SHA1 (golddigC3.0.tar.gz) = b3fe98fec9a9a155aef7065f6641bcf358342339
diff --git a/games/golddig/files/patch-sum b/games/golddig/files/patch-sum
index 9e606283a43..d5a4dfbefdc 100644
--- a/games/golddig/files/patch-sum
+++ b/games/golddig/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:56 agc Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/19 20:00:07 wiz Exp $
 
-MD5 (patch-aa) = 2786ebdc3cd8d0c49bc739013ac0b88a
-MD5 (patch-ab) = 89ba65c35a93990b2248a34c2be64e4f
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/games/golddig/patches/patch-aa b/games/golddig/patches/patch-aa
deleted file mode 100644
index 7f7895b13ea..00000000000
--- a/games/golddig/patches/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1998/09/14 06:54:00 garbled Exp $
---- Makefile.orig	Tue Feb  8 21:11:37 1994
-+++ Makefile	Sun Sep 13 23:44:23 1998
-@@ -10,12 +10,12 @@
- EDITOR = makelev
- # Directory where games binaries are stored
- #BIN = /usr/public/${HOSTTYPE}/games
--BIN = /usr/local/games
-+BIN = $(PREFIX)/bin
- # Directory where the library for this game will be stored
--LIB = /usr/local/games/lib/${GAME}
-+LIB = $(PREFIX)/share/${GAME}
- # Directory where manual pages are kept
- MANEXT = 6
--MAN = /usr/local/man/man${MANEXT}
-+MAN = $(PREFIX)/man/man${MANEXT}
- # Font used to display score
- SCOREFONT = -adobe-times-bold-r-normal--18-180-75-75-p-99-iso8859-1
- # Height of SCOREFONT
-@@ -28,25 +28,26 @@
- # Some common choices for CFLAGS.
- #CFLAGS = -O2
- #CFLAGS = -O
--CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL 
-+CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -I$(X11BASE)/include
- #CFLAGS = -g
- #LDFLAGS = -L /usr/X11/lib -lbsd -s
--LDFLAGS = -L /usr/X11/lib -s
-+LDFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
- 
- all: ${GAME} ${EDITOR}
- 
- install: all
--	-mkdir ${LIB}
--	cp ${GAME} ${EDITOR} ${BIN}
-+	-mkdir -p ${LIB}
-+	install -s -o bin -g games -m 2755 ${GAME} ${BIN}
-+	install -s -o bin -g games -m 2755 ${EDITOR} ${BIN}
- # The next line sets up the level files so that anyone can edit all of
- # the levels.  Remove this line to have better security.
--	chmod 4755 ${BIN}/${EDITOR}
--	touch ${LIB}/scores
-+	cat /dev/null >>/var/games/golddig.scores
-+	chown bin:games /var/games/golddig.scores
-+	chmod 664 /var/games/golddig.scores
- # Allow anyone to modify the high score file.  An alternative is to
- # change the mode bits of ${GAME} to be 4755.
--	chmod 666 ${LIB}/scores
--	cp goldlev* default ${LIB}
--	cp golddig.p ${MAN}/golddig.${MANEXT}
-+	install -o bin -g bin -m 0644 goldlev* default ${LIB}
-+	install -o root -g wheel -m 0644 golddig.p ${MAN}/golddig.${MANEXT}
- 
- update: all
- 	cp ${GAME} ${EDITOR} ${BIN}
diff --git a/games/golddig/patches/patch-ab b/games/golddig/patches/patch-ab
deleted file mode 100644
index 4f98b931372..00000000000
--- a/games/golddig/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/09/13 22:13:09 garbled Exp $
---- scores.c.orig	Sun Sep 13 14:57:47 1998
-+++ scores.c	Sun Sep 13 14:58:45 1998
-@@ -31,7 +31,7 @@
-   int numscore,cur,numgame;
- 
-   /* Generate name of high score file */
--  sprintf(buf,"%s/scores",LIB);
-+  sprintf(buf,"/var/games/golddig.scores");
-   /* Open high score file */
-   sfile = fopen(buf,"r");
-   /* Set default values for number of games and high scores */
-@@ -98,7 +98,7 @@
-   }
- 
-   /* Save new high score list to score file */
--  sprintf(buf,"%s/scores",LIB);
-+  sprintf(buf,"/var/games/golddig.scores");
-   sfile = fopen(buf,"w");
-   if(sfile == NULL) {
-     perror(buf);
diff --git a/games/golddig/pkg/DESCR b/games/golddig/pkg/DESCR
index efc1a8580a6..2ea4ea6e694 100644
--- a/games/golddig/pkg/DESCR
+++ b/games/golddig/pkg/DESCR
@@ -1,3 +1,4 @@
-Golddig  is a fast action game designed for use with the X
-window system.  makelev is used to  create  and  edit  new
-levels which can be used by golddig.
+Golddig is a fast action game designed for use with the X
+window system.  gdedit is used to create and edit new levels 
+which can be used by golddig.   Version 3.0 includes support
+for color displays and comes with 26 levels.
diff --git a/games/golddig/pkg/PLIST b/games/golddig/pkg/PLIST
index 028f6749d22..d607a35492d 100644
--- a/games/golddig/pkg/PLIST
+++ b/games/golddig/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 1998/09/13 22:13:08 garbled Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/19 20:00:08 wiz Exp $
 bin/golddig
-bin/makelev
+bin/gdedit
 man/man6/golddig.6
+man/man6/gdedit.6
 share/golddig/goldlev001
 share/golddig/goldlev002
 share/golddig/goldlev003
@@ -20,5 +21,13 @@ share/golddig/goldlev015
 share/golddig/goldlev016
 share/golddig/goldlev017
 share/golddig/goldlev018
+share/golddig/goldlev019
+share/golddig/goldlev020
+share/golddig/goldlev021
+share/golddig/goldlev022
+share/golddig/goldlev023
+share/golddig/goldlev024
+share/golddig/goldlev025
+share/golddig/goldlev026
 share/golddig/default
 @dirrm share/golddig