Upgrade to 2.8.2

PR:		4566
Submitted by:	Matthew Hunt <mph@pobox.com>

5 files changed, 120 insertions, 64 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index 553b2f497e84..883a28194afa 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   angband
-# Version required:    2.8.1
+# Version required:    2.8.2
 # Date created:        21 Feb 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id$
+# $Id: Makefile,v 1.2 1997/03/31 11:27:16 max Exp $
 #
 
-DISTNAME=	angband-281
-PKGNAME=	angband-2.8.1
+DISTNAME=	angband-282
+PKGNAME=	angband-2.8.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/
 
diff --git a/games/angband/distinfo b/games/angband/distinfo
index a5025621f5c7..e6b9254a5b0f 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1 +1 @@
-MD5 (angband-281.tar.gz) = 925e7244445a84968a436e33d3346411
+MD5 (angband-282.tar.gz) = bcf842af57b0312f620a72f9db23995a
diff --git a/games/angband/files/patch-aa b/games/angband/files/patch-aa
index a6739d10f6bd..a1a86335cff8 100644
--- a/games/angband/files/patch-aa
+++ b/games/angband/files/patch-aa
@@ -1,20 +1,22 @@
---- Makefile.orig	Mon Mar 31 20:08:53 1997
-+++ Makefile	Mon Mar 31 20:08:53 1997
-@@ -0,0 +1,17 @@
+--- Makefile.orig	Thu Sep 18 12:53:12 1997
++++ Makefile	Thu Sep 18 12:55:59 1997
+@@ -0,0 +1,19 @@
 +# My makefile for Angband
 +# Matthew Hunt <mph@pobox.com>
 +
++CFLAGS+=-I/usr/X11R6/include -D"USE_XAW" -D"USE_GCU" -DDEFAULT_PATH=\\\"$(PREFIX)/lib/X11/angband\\\"
++
 +all:	angband
 +
 +angband:
-+	cd src && make
++	cd src && make "CFLAGS=$(CFLAGS)"
 +
 +install: angband
-+	install -c -o games -g bin -m 4755 testing ${PREFIX}/bin/angband
-+	mkdir -p ${PREFIX}/lib/angband
-+	(cd lib && tar cf - * ) | (cd ${PREFIX}/lib/angband && tar xf - )
-+#	install -c lib/* ${PREFIX}/lib/angband
-+	/usr/sbin/chown -R games.bin ${PREFIX}/lib/angband
-+	(cd ${PREFIX}/lib/angband && \
-+		/bin/chmod 755 apex bone data edit file help info xtra && \
++	install -c -o bin -g games -m 2755 angband ${PREFIX}/bin/angband
++	mkdir -p ${PREFIX}/lib/X11/angband
++	(cd lib && tar cf - * ) | (cd ${PREFIX}/lib/X11/angband && tar xf - )
++	/usr/sbin/chown -R bin.games ${PREFIX}/lib/X11/angband
++	(cd ${PREFIX}/lib/X11/angband && \
++		/bin/chmod 775 apex bone data edit file help info xtra && \
 +		/bin/chmod 1777 save user )
++	install -o games -g games -m 664 /dev/null ${PREFIX}/lib/X11/angband/apex/scores.raw
diff --git a/games/angband/files/patch-ad b/games/angband/files/patch-ad
index aef51b9b9df1..ecc7256dcd9c 100644
--- a/games/angband/files/patch-ad
+++ b/games/angband/files/patch-ad
@@ -1,12 +1,30 @@
---- src/Makefile.orig	Sat Mar  8 05:52:32 1997
-+++ src/Makefile	Mon Mar 31 20:10:52 1997
-@@ -136,8 +136,8 @@
+--- src/Makefile.orig	Fri Sep  5 18:01:33 1997
++++ src/Makefile	Fri Sep  5 18:05:13 1997
+@@ -94,7 +94,7 @@
+ #
+ # This is my compiler of choice, it seems to work most everywhere
+ #
+-CC = gcc
++#CC = gcc
+ 
+ 
+ #
+@@ -115,8 +115,8 @@
+ # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
+ # attempt to "guess" at many of these flags based on your system.
+ #
+-CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
+-LIBS = -lX11 -lcurses -ltermcap
++#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
++#LIBS = -L/usr/X11-lX11 -lcurses -ltermcap
+ 
+ 
  ##
+@@ -137,7 +137,7 @@
  ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
  ##
--#CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
+ #CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
 -#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
-+CFLAGS = -Wall -O1 -pipe -I/usr/X11R6/include -DDEFAULT_PATH=\"${PREFIX}/lib/angband/\" -D"USE_XAW" -D"USE_GCU"
 +LIBS = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
  
  
diff --git a/games/angband/pkg-plist b/games/angband/pkg-plist
index 36ed85376d11..322371a47520 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -1,44 +1,80 @@
 bin/angband
-lib/angband/help/attack.txt
-lib/angband/help/birth.txt
-lib/angband/help/command.txt
-lib/angband/help/dungeon.txt
-lib/angband/help/general.txt
-lib/angband/help/help.hlp
-lib/angband/help/option.txt
-lib/angband/help/version.txt
-lib/angband/edit/a_info.txt
-lib/angband/edit/e_info.txt
-lib/angband/edit/f_info.txt
-lib/angband/edit/k_info.txt
-lib/angband/edit/r_info.txt
-lib/angband/edit/v_info.txt
-lib/angband/user/font-ami.prf
-lib/angband/user/font-ibm.prf
-lib/angband/user/font-win.prf
-lib/angband/user/graf-ami.prf
-lib/angband/user/graf-win.prf
-lib/angband/user/pref-acn.prf
-lib/angband/user/graf-mac.prf
-lib/angband/user/xtra-gcu.prf
-lib/angband/user/pref-emx.prf
-lib/angband/user/pref-ibm.prf
-lib/angband/user/pref-lsl.prf
-lib/angband/user/pref-mac.prf
-lib/angband/user/pref-win.prf
-lib/angband/user/pref-x11.prf
-lib/angband/user/pref-xaw.prf
-lib/angband/user/pref.prf
-lib/angband/file/dead.txt
-lib/angband/file/news.txt
-@exec mkdir -p %D/lib/angband/bone
-@exec mkdir -p %D/lib/angband/data
-@exec mkdir -p %D/lib/angband/info
-@exec mkdir -p %D/lib/angband/save
-@exec mkdir -p %D/lib/angband/xtra
-@dirrm lib/angband/bone
-@dirrm lib/angband/data
-@dirrm lib/angband/info
-@dirrm lib/angband/save
-@dirrm lib/angband/xtra
-
+lib/X11/angband/apex/scores.raw
+lib/X11/angband/edit/a_info.txt
+lib/X11/angband/edit/e_info.txt
+lib/X11/angband/edit/f_info.txt
+lib/X11/angband/edit/k_info.txt
+lib/X11/angband/edit/r_info.txt
+lib/X11/angband/edit/v_info.txt
+lib/X11/angband/file/dead.txt
+lib/X11/angband/file/news.txt
+lib/X11/angband/help/attack.txt
+lib/X11/angband/help/birth.txt
+lib/X11/angband/help/command.txt
+lib/X11/angband/help/dungeon.txt
+lib/X11/angband/help/general.txt
+lib/X11/angband/help/help.hlp
+lib/X11/angband/help/option.txt
+lib/X11/angband/help/playing.txt
+lib/X11/angband/help/version.txt
+lib/X11/angband/user/font-ami.prf
+lib/X11/angband/user/font-ibm.prf
+lib/X11/angband/user/font-mac.prf
+lib/X11/angband/user/font-win.prf
+lib/X11/angband/user/font.prf
+lib/X11/angband/user/graf-ami.prf
+lib/X11/angband/user/graf-mac.prf
+lib/X11/angband/user/graf-win.prf
+lib/X11/angband/user/graf-xxx.prf
+lib/X11/angband/user/graf.prf
+lib/X11/angband/user/pref-acn.prf
+lib/X11/angband/user/pref-ami.prf
+lib/X11/angband/user/pref-emx.prf
+lib/X11/angband/user/pref-gcu.prf
+lib/X11/angband/user/pref-mac.prf
+lib/X11/angband/user/pref-win.prf
+lib/X11/angband/user/pref-x11.prf
+lib/X11/angband/user/pref.prf
+lib/X11/angband/user/user-mac.prf
+lib/X11/angband/user/user.prf
+@exec mkdir -p %D/lib/X11/angband/bone
+@exec mkdir -p %D/lib/X11/angband/data
+@exec mkdir -p %D/lib/X11/angband/info
+@exec mkdir -p %D/lib/X11/angband/save
+@exec mkdir -p %D/lib/X11/angband/xtra
+@exec mkdir -p %D/lib/X11/angband/apex
+@exec mkdir -p %D/lib/X11/angband/edit
+@exec mkdir -p %D/lib/X11/angband/file
+@exec mkdir -p %D/lib/X11/angband/help
+@exec mkdir -p %D/lib/X11/angband/user
+@exec chown bin.games %D/lib/X11/angband/apex
+@exec chown bin.games %D/lib/X11/angband/bone
+@exec chown bin.games %D/lib/X11/angband/data
+@exec chown bin.games %D/lib/X11/angband/edit
+@exec chown bin.games %D/lib/X11/angband/file
+@exec chown bin.games %D/lib/X11/angband/help
+@exec chown bin.games %D/lib/X11/angband/info
+@exec chown bin.games %D/lib/X11/angband/xtra
+@exec chown bin.games %D/lib/X11/angband/save
+@exec chown bin.games %D/lib/X11/angband/user
+@exec chmod 775 %D/lib/X11/angband/apex
+@exec chmod 775 %D/lib/X11/angband/bone
+@exec chmod 775 %D/lib/X11/angband/data
+@exec chmod 775 %D/lib/X11/angband/edit
+@exec chmod 775 %D/lib/X11/angband/file
+@exec chmod 775 %D/lib/X11/angband/help
+@exec chmod 775 %D/lib/X11/angband/info
+@exec chmod 775 %D/lib/X11/angband/xtra
+@exec chmod 1777 %D/lib/X11/angband/save
+@exec chmod 1777 %D/lib/X11/angband/user
+@exec chmod 664 %D/lib/X11/angband/apex/scores.raw
+@dirrm lib/X11/angband/bone
+@dirrm lib/X11/angband/data
+@dirrm lib/X11/angband/info
+@dirrm lib/X11/angband/save
+@dirrm lib/X11/angband/xtra
+@dirrm lib/X11/angband/apex
+@dirrm lib/X11/angband/edit
+@dirrm lib/X11/angband/file
+@dirrm lib/X11/angband/help
+@dirrm lib/X11/angband/user