Upgrade, 0.8.0 -> 0.8.1.

Split the patches into several files.
Submitted by:	Matthew Hunt <mph@pobox.com>
(Closing PR #3003.)

Also, style tweaks on Makefile.

6 files changed, 85 insertions, 89 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index cc491689deb0..553b2f497e84 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -1,20 +1,18 @@
 # New ports collection makefile for:   angband
-# Version required:    2.8.0
+# Version required:    2.8.1
 # Date created:        21 Feb 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
 # $Id$
 #
 
-DISTNAME=	angband-2.8.0
+DISTNAME=	angband-281
+PKGNAME=	angband-2.8.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/
-DISTFILES=	angband-280.tar.gz
 
 MAINTAINER=	mph@pobox.com
 
-WRKSRC=		${WRKDIR}/angband-280
 USE_X11=	yes
-PATCH_STRIP=	-p1
 
 .include <bsd.port.mk>
diff --git a/games/angband/distinfo b/games/angband/distinfo
index b6c3b511673c..a5025621f5c7 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1 +1 @@
-MD5 (angband-280.tar.gz) = c488458e21659d7b14d660f7baacba47
+MD5 (angband-281.tar.gz) = 925e7244445a84968a436e33d3346411
diff --git a/games/angband/files/patch-aa b/games/angband/files/patch-aa
index 42eddaa6dbf6..a6739d10f6bd 100644
--- a/games/angband/files/patch-aa
+++ b/games/angband/files/patch-aa
@@ -1,6 +1,5 @@
-diff -r -P -u ../../angband-280/Makefile angband-280/Makefile
---- ../../angband-280/Makefile	Wed Dec 31 19:00:00 1969
-+++ angband-280/Makefile	Thu Feb 20 19:54:23 1997
+--- Makefile.orig	Mon Mar 31 20:08:53 1997
++++ Makefile	Mon Mar 31 20:08:53 1997
 @@ -0,0 +1,17 @@
 +# My makefile for Angband
 +# Matthew Hunt <mph@pobox.com>
@@ -11,44 +10,11 @@ diff -r -P -u ../../angband-280/Makefile angband-280/Makefile
 +	cd src && make
 +
 +install: angband
-+	install -c -o games -g bin -m 4755 angband ${PREFIX}/bin
-+	mkdir -p ${PREFIX}/lib/X11/angband
-+	(cd lib && tar cf - * ) | (cd ${PREFIX}/lib/X11/angband && tar xf - )
-+#	install -c lib/* ${PREFIX}/lib/X11/angband
-+	/usr/sbin/chown -R games.bin ${PREFIX}/lib/X11/angband
-+	(cd ${PREFIX}/lib/X11/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 && \
 +		/bin/chmod 1777 save user )
-diff -r -P -u ../../angband-280/src/Makefile angband-280/src/Makefile
---- ../../angband-280/src/Makefile	Sun Oct 13 20:06:49 1996
-+++ angband-280/src/Makefile	Thu Feb 20 19:56:09 1997
-@@ -136,8 +136,8 @@
- ##
- ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
- ##
--#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/X11/angband/\" -D"USE_XAW" -D"USE_GCU"
-+LIBS = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
- 
- 
- ##
-diff -r -P -u ../../angband-280/src/config.h angband-280/src/config.h
---- ../../angband-280/src/config.h	Sun Oct 13 19:13:01 1996
-+++ angband-280/src/config.h	Thu Feb 20 19:56:09 1997
-@@ -48,13 +48,13 @@
-  * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
-  * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
-  */
--/* #define SPECIAL_BSD */
-+#define SPECIAL_BSD
- 
- 
- /*
-  * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
-  */
--/* #define USE_TPOSIX */
-+#define USE_TPOSIX
- 
- /*
-  * OPTION: Use the "termio" methods in "main-gcu.c"
diff --git a/games/angband/files/patch-ac b/games/angband/files/patch-ac
new file mode 100644
index 000000000000..275e8c0dcfb0
--- /dev/null
+++ b/games/angband/files/patch-ac
@@ -0,0 +1,18 @@
+--- src/config.h.orig	Tue Mar  4 12:19:58 1997
++++ src/config.h	Mon Mar 31 20:10:18 1997
+@@ -48,13 +48,13 @@
+  * OPTION: define "SPECIAL_BSD" for using certain versions of UNIX
+  * that use the 4.4BSD Lite version of Curses in "main-gcu.c"
+  */
+-/* #define SPECIAL_BSD */
++#define SPECIAL_BSD
+ 
+ 
+ /*
+  * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
+  */
+-/* #define USE_TPOSIX */
++#define USE_TPOSIX
+ 
+ /*
+  * OPTION: Use the "termio" methods in "main-gcu.c"
diff --git a/games/angband/files/patch-ad b/games/angband/files/patch-ad
new file mode 100644
index 000000000000..aef51b9b9df1
--- /dev/null
+++ b/games/angband/files/patch-ad
@@ -0,0 +1,13 @@
+--- src/Makefile.orig	Sat Mar  8 05:52:32 1997
++++ src/Makefile	Mon Mar 31 20:10:52 1997
+@@ -136,8 +136,8 @@
+ ##
+ ## Variation -- Use "main-xaw.c" instead of "main-x11.c"
+ ##
+-#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 8bee6f02f80f..36ed85376d11 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -1,43 +1,44 @@
 bin/angband
-lib/X11/angband/apex/scores.raw
-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/version.txt
-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/user/font-ami.prf
-lib/X11/angband/user/font-ibm.prf
-lib/X11/angband/user/font-win.prf
-lib/X11/angband/user/graf-ami.prf
-lib/X11/angband/user/graf-win.prf
-lib/X11/angband/user/pref-acn.prf
-lib/X11/angband/user/pref-emx.prf
-lib/X11/angband/user/pref-ibm.prf
-lib/X11/angband/user/pref-lsl.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-xaw.prf
-lib/X11/angband/user/pref.prf
-lib/X11/angband/file/dead.txt
-lib/X11/angband/file/news.txt
-@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
-@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
+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