Install spoiler files, as requested in pkg/8341; sort PLIST.

6 files changed, 136 insertions, 62 deletions

diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index 2a133ef37ce..604f818085c 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,21 +1,30 @@
-# $NetBSD: Makefile,v 1.5 2000/01/26 16:41:51 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/11 00:22:23 wiz Exp $
 #
 
 DISTNAME=		angband-283
 PKGNAME=		angband-tty-2.8.3
 CATEGORIES=		games
-MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/
+MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/ \
+			ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Source/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${SPOILERFILE}
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.phial.com/angband/
 
+CONFLICTS=		angband-x11-*
+
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 MAKEFILE=		Makefile.std
 ALL_TARGET=		angband
 
+SPOILERFILE=		angband-spoilers.tar.gz
+
 do-install:
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
 	${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
+	cd ${PREFIX}/share/angband/help && \
+		${PAX} -rzf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R bin:games ${PREFIX}/share/angband
 	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
 	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
diff --git a/games/angband-tty/files/md5 b/games/angband-tty/files/md5
index 3da52a909b9..31d6d8f7018 100644
--- a/games/angband-tty/files/md5
+++ b/games/angband-tty/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1 1998/08/27 13:18:20 garbled Exp $
+$NetBSD: md5,v 1.2 2000/09/11 00:22:23 wiz Exp $
 
 MD5 (angband-283.tar.gz) = 33c56940cf2f9c7aa265204159ab1cf8
+MD5 (angband-spoilers.tar.gz) = 935d585cdd322acf1403338ffef853f9
diff --git a/games/angband-tty/pkg/PLIST b/games/angband-tty/pkg/PLIST
index 6778a9348fd..2158ac16119 100644
--- a/games/angband-tty/pkg/PLIST
+++ b/games/angband-tty/pkg/PLIST
@@ -1,15 +1,63 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/27 13:18:21 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/09/11 00:22:23 wiz Exp $
 bin/angband
+share/angband/edit/a_info.txt
+share/angband/edit/e_info.txt
+share/angband/edit/f_info.txt
+share/angband/edit/k_info.txt
+share/angband/edit/r_info.txt
+share/angband/edit/v_info.txt
 share/angband/file/dead.txt
 share/angband/file/news.txt
-share/angband/user/font-xxx.prf
+share/angband/help/ability.spo
+share/angband/help/artifact.spo
+share/angband/help/attack.spo
+share/angband/help/attack.txt
+share/angband/help/birth.txt
+share/angband/help/books.spo
+share/angband/help/command.txt
+share/angband/help/dungeon.spo
+share/angband/help/dungeon.txt
+share/angband/help/extra.hlp
+share/angband/help/general.txt
+share/angband/help/guide.spo
+share/angband/help/help.hlp
+share/angband/help/hints.spo
+share/angband/help/magic.spo
+share/angband/help/misc.spo
+share/angband/help/mon-blow.spo
+share/angband/help/mon-desc.spo
+share/angband/help/mon-info.spo
+share/angband/help/mon-name.spo
+share/angband/help/mon-race.spo
+share/angband/help/mon-uniq.spo
+share/angband/help/mon-view.spo
+share/angband/help/monsters.hlp
+share/angband/help/obj-desc.spo
+share/angband/help/obj-good.spo
+share/angband/help/obj-long.spo
+share/angband/help/objects.hlp
+share/angband/help/option.txt
+share/angband/help/playing.txt
+share/angband/help/rumors.spo
+share/angband/help/spoiler.hlp
+share/angband/help/stats.spo
+share/angband/help/store.spo
+share/angband/help/user.hlp
+share/angband/help/various.hlp
+share/angband/help/version.txt
+share/angband/user/font-ami.prf
+share/angband/user/font-dos.prf
 share/angband/user/font-ibm.prf
 share/angband/user/font-mac.prf
 share/angband/user/font-win.prf
+share/angband/user/font-x11.prf
+share/angband/user/font-xxx.prf
 share/angband/user/font.prf
 share/angband/user/graf-ami.prf
+share/angband/user/graf-ibm.prf
 share/angband/user/graf-mac.prf
 share/angband/user/graf-win.prf
+share/angband/user/graf-x11.prf
 share/angband/user/graf-xxx.prf
 share/angband/user/graf.prf
 share/angband/user/pref-acn.prf
@@ -22,34 +70,14 @@ share/angband/user/pref-x11.prf
 share/angband/user/pref.prf
 share/angband/user/user-mac.prf
 share/angband/user/user.prf
-share/angband/user/font-x11.prf
-share/angband/user/graf-ibm.prf
-share/angband/user/font-dos.prf
-share/angband/user/graf-x11.prf
-share/angband/user/font-ami.prf
-share/angband/help/playing.txt
-share/angband/help/birth.txt
-share/angband/help/command.txt
-share/angband/help/dungeon.txt
-share/angband/help/general.txt
-share/angband/help/help.hlp
-share/angband/help/option.txt
-share/angband/help/version.txt
-share/angband/help/attack.txt
-share/angband/edit/a_info.txt
-share/angband/edit/e_info.txt
-share/angband/edit/f_info.txt
-share/angband/edit/k_info.txt
-share/angband/edit/r_info.txt
-share/angband/edit/v_info.txt
+@unexec rm -r %D/share/angband/apex
+@unexec rm -r %D/share/angband/data
+@unexec rm -r %D/share/angband/save
 @dirrm share/angband/bone
+@dirrm share/angband/edit
 @dirrm share/angband/file
-@dirrm share/angband/info
 @dirrm share/angband/help
-@dirrm share/angband/xtra
-@dirrm share/angband/edit
+@dirrm share/angband/info
 @dirrm share/angband/user
-@unexec rm -r %D/share/angband/data
-@unexec rm -r %D/share/angband/apex
-@unexec rm -r %D/share/angband/save
+@dirrm share/angband/xtra
 @dirrm share/angband
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 6e19d039a8e..4e809322cc4 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2000/01/26 16:41:53 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/11 00:22:23 wiz Exp $
 #
 
 DISTNAME=		angband-283
 PKGNAME=		angband-x11-2.8.3
 CATEGORIES=		games x11
-MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/
+MASTER_SITES=		ftp://export.andrew.cmu.edu/angband/Source/ \
+			ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Source/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} angband-spoilers.tar.gz
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.phial.com/angband/
 
 CONFLICTS=		angband-tty-*
 
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 MAKEFILE=		Makefile.std
 ALL_TARGET=		angband
@@ -19,9 +22,13 @@ USE_X11=		yes
 PATCHFILES+=		${PKGSRCDIR}/games/angband-tty/patches/patch-*
 ALLFILES=		${DISTFILES}	# don't checksum shared patches
 
+SPOILERFILE=		angband-spoilers.tar.gz
+
 do-install:
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
 	${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
+	cd ${PREFIX}/share/angband/help && \
+		${PAX} -rzf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R bin:games ${PREFIX}/share/angband
 	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
 	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
diff --git a/games/angband-x11/files/md5 b/games/angband-x11/files/md5
index 87cb124caec..5218b830993 100644
--- a/games/angband-x11/files/md5
+++ b/games/angband-x11/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1 1998/12/31 15:19:15 tv Exp $
+$NetBSD: md5,v 1.2 2000/09/11 00:22:24 wiz Exp $
 
 MD5 (angband-283.tar.gz) = 33c56940cf2f9c7aa265204159ab1cf8
+MD5 (angband-spoilers.tar.gz) = 935d585cdd322acf1403338ffef853f9
diff --git a/games/angband-x11/pkg/PLIST b/games/angband-x11/pkg/PLIST
index fb31038fd6f..f458995097d 100644
--- a/games/angband-x11/pkg/PLIST
+++ b/games/angband-x11/pkg/PLIST
@@ -1,15 +1,63 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/27 13:22:09 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/09/11 00:22:24 wiz Exp $
 bin/angband
+share/angband/edit/a_info.txt
+share/angband/edit/e_info.txt
+share/angband/edit/f_info.txt
+share/angband/edit/k_info.txt
+share/angband/edit/r_info.txt
+share/angband/edit/v_info.txt
 share/angband/file/dead.txt
 share/angband/file/news.txt
-share/angband/user/font-xxx.prf
+share/angband/help/ability.spo
+share/angband/help/artifact.spo
+share/angband/help/attack.spo
+share/angband/help/attack.txt
+share/angband/help/birth.txt
+share/angband/help/books.spo
+share/angband/help/command.txt
+share/angband/help/dungeon.spo
+share/angband/help/dungeon.txt
+share/angband/help/extra.hlp
+share/angband/help/general.txt
+share/angband/help/guide.spo
+share/angband/help/help.hlp
+share/angband/help/hints.spo
+share/angband/help/magic.spo
+share/angband/help/misc.spo
+share/angband/help/mon-blow.spo
+share/angband/help/mon-desc.spo
+share/angband/help/mon-info.spo
+share/angband/help/mon-name.spo
+share/angband/help/mon-race.spo
+share/angband/help/mon-uniq.spo
+share/angband/help/mon-view.spo
+share/angband/help/monsters.hlp
+share/angband/help/obj-desc.spo
+share/angband/help/obj-good.spo
+share/angband/help/obj-long.spo
+share/angband/help/objects.hlp
+share/angband/help/option.txt
+share/angband/help/playing.txt
+share/angband/help/rumors.spo
+share/angband/help/spoiler.hlp
+share/angband/help/stats.spo
+share/angband/help/store.spo
+share/angband/help/user.hlp
+share/angband/help/various.hlp
+share/angband/help/version.txt
+share/angband/user/font-ami.prf
+share/angband/user/font-dos.prf
 share/angband/user/font-ibm.prf
 share/angband/user/font-mac.prf
 share/angband/user/font-win.prf
+share/angband/user/font-x11.prf
+share/angband/user/font-xxx.prf
 share/angband/user/font.prf
 share/angband/user/graf-ami.prf
+share/angband/user/graf-ibm.prf
 share/angband/user/graf-mac.prf
 share/angband/user/graf-win.prf
+share/angband/user/graf-x11.prf
 share/angband/user/graf-xxx.prf
 share/angband/user/graf.prf
 share/angband/user/pref-acn.prf
@@ -22,34 +70,14 @@ share/angband/user/pref-x11.prf
 share/angband/user/pref.prf
 share/angband/user/user-mac.prf
 share/angband/user/user.prf
-share/angband/user/font-x11.prf
-share/angband/user/graf-ibm.prf
-share/angband/user/font-dos.prf
-share/angband/user/graf-x11.prf
-share/angband/user/font-ami.prf
-share/angband/help/playing.txt
-share/angband/help/birth.txt
-share/angband/help/command.txt
-share/angband/help/dungeon.txt
-share/angband/help/general.txt
-share/angband/help/help.hlp
-share/angband/help/option.txt
-share/angband/help/version.txt
-share/angband/help/attack.txt
-share/angband/edit/a_info.txt
-share/angband/edit/e_info.txt
-share/angband/edit/f_info.txt
-share/angband/edit/k_info.txt
-share/angband/edit/r_info.txt
-share/angband/edit/v_info.txt
+@unexec rm -r %D/share/angband/apex
+@unexec rm -r %D/share/angband/data
+@unexec rm -r %D/share/angband/save
 @dirrm share/angband/bone
+@dirrm share/angband/edit
 @dirrm share/angband/file
-@dirrm share/angband/info
 @dirrm share/angband/help
-@dirrm share/angband/xtra
-@dirrm share/angband/edit
+@dirrm share/angband/info
 @dirrm share/angband/user
-@unexec rm -r %D/share/angband/data
-@unexec rm -r %D/share/angband/apex
-@unexec rm -r %D/share/angband/save
+@dirrm share/angband/xtra
 @dirrm share/angband