[UPDATE/FIX] games/angband

["Niall O'Higgins" <niallo_(_at_)_netsoc_(_dot_)_ucd_(_dot_)_ie>]

Hi,

On my -current/amd64 machine the games/angband port would freeze and
consume 100% cpu indefinately.

I upgraded the port to angband 3.0.5, which is at once both a much
needed update (2.9.3 was like 2001 I think) and a fix for this freeze problem. 

I have left the port as is aside from updating the two patches and the packing list. 

The deinstall script could be nicer.

Mail to the maintainer bounced so I'm sending this here. 

Tested ok on -current/amd64 and -current/sparc64. It compiled fine on
3.6/alpha, too.

Diff attached. Comments welcome.

Index: Makefile
===================================================================
RCS file: /usr/repository/ports/games/angband/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	28 Nov 2004 22:41:15 -0000	1.12
+++ Makefile	24 Feb 2005 20:15:20 -0000
@@ -4,7 +4,7 @@
 COMMENT=		"rogue-like game with X11 support"
 COMMENT-no_x11=		"rogue-like game"
 
-DISTNAME=		angband-2.9.3
+DISTNAME=		angband-3.0.5
 CATEGORIES=     	games
 
 HOMEPAGE=		http://thangorodrim.angband.org/
Index: distinfo
===================================================================
RCS file: /usr/repository/ports/games/angband/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	5 Jan 2005 17:41:07 -0000	1.2
+++ distinfo	24 Feb 2005 20:17:50 -0000
@@ -1,4 +1,4 @@
-MD5 (angband-2.9.3.tar.gz) = 0d52080bce9f248b73cf2af5dfbb1675
-RMD160 (angband-2.9.3.tar.gz) = a933a6b70b436080e7eab68ebcc8f7b74e158e7f
-SHA1 (angband-2.9.3.tar.gz) = 36c97211a3462028978acc3a600efed93fdfa3bc
-SIZE (angband-2.9.3.tar.gz) = 1070062
+MD5 (angband-3.0.5.tar.gz) = cc61e55baf4ffdcf9bfc6caa14935ec0
+RMD160 (angband-3.0.5.tar.gz) = f22ac3b1e1b109be803c2712f8ba23b605b97eca
+SHA1 (angband-3.0.5.tar.gz) = 80841e97d92837ed0a279c4c9edb686c74fd32a0
+SIZE (angband-3.0.5.tar.gz) = 1496319
Index: patches/patch-configure
===================================================================
RCS file: /usr/repository/ports/games/angband/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure	11 Aug 2001 17:18:50 -0000	1.1
+++ patches/patch-configure	24 Feb 2005 20:38:31 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-configure,v 1.1 2001/08/11 17:18:50 lebel Exp $
---- configure.orig	Sat Aug 11 12:56:43 2001
-+++ configure	Sat Aug 11 12:57:29 2001
-@@ -843,10 +843,10 @@ fi
+--- configure	2005/02/24 20:36:35	1.1
++++ configure	2005/02/24 20:37:56
+@@ -1764,11 +1764,10 @@
  
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define DEFAULT_PATH "$game_datadir"
 +#define DEFAULT_PATH "$TRUEPREFIX/share/angband"
- EOF
+ _ACEOF
  
 -DEFAULT_PATH="$game_datadir"
-+DEFAULT_PATH="$TRUEPREFIX/share/angband"
- 
+-
++#define DEFAULT_PATH "$TRUEPREFIX/share/angband"
  
- # Extract the first word of "gcc", so it can be a program name with args.
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
Index: patches/patch-src_init2_c
===================================================================
RCS file: /usr/repository/ports/games/angband/patches/patch-src_init2_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_init2_c
--- patches/patch-src_init2_c	11 Aug 2001 17:18:50 -0000	1.1
+++ patches/patch-src_init2_c	24 Feb 2005 21:01:19 -0000
@@ -1,15 +1,9 @@
-$OpenBSD: patch-src_init2_c,v 1.1 2001/08/11 17:18:50 lebel Exp $
---- src/init2.c.orig	Sat Aug  4 07:11:13 2001
-+++ src/init2.c	Sat Aug 11 12:42:38 2001
-@@ -133,16 +133,13 @@ void init_file_paths(char *path)
+--- src/init2.c	2005/02/24 20:54:51	1.1
++++ src/init2.c	2005/02/24 20:56:56
+@@ -135,12 +135,10 @@
  	/*** Build the sub-directory names ***/
  
  	/* Build a path name */
--	strcpy(tail, "apex");
--	ANGBAND_DIR_APEX = string_make(path);
-+	ANGBAND_DIR_APEX = string_make("/var/games/angband/apex");
- 
- 	/* Build a path name */
 -	strcpy(tail, "bone");
 -	ANGBAND_DIR_BONE = string_make(path);
 +	ANGBAND_DIR_BONE = string_make("/var/games/angband/bone");
@@ -21,13 +15,18 @@
  
  	/* Build a path name */
  	strcpy(tail, "edit");
-@@ -161,8 +158,7 @@ void init_file_paths(char *path)
- 	ANGBAND_DIR_INFO = string_make(path);
+@@ -195,12 +193,10 @@
+ #else /* USE_PRIVATE_SAVE_PATH */
+ 
+ 	/* Build a path name */
+-	strcpy(tail, "apex");
+-	ANGBAND_DIR_APEX = string_make(path);
++	ANGBAND_DIR_APEX = string_make("/var/games/angband/apex");
  
  	/* Build a path name */
 -	strcpy(tail, "save");
 -	ANGBAND_DIR_SAVE = string_make(path);
 +	ANGBAND_DIR_SAVE = string_make("/var/games/angband/save");
  
- 	/* Build a path name */
- 	strcpy(tail, "pref");
+ #endif /* USE_PRIVATE_SAVE_PATH */
+ 
Index: pkg/PLIST
===================================================================
RCS file: /usr/repository/ports/games/angband/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST	22 Sep 2004 11:14:51 -0000	1.8
+++ pkg/PLIST	24 Feb 2005 21:15:29 -0000
@@ -1,4 +1,4 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.8 2004/09/22 11:14:51 espie Exp $
+_(_at_)_comment $OpenBSD$
 bin/angband
 share/angband/
 @comment share/angband/apex/
@@ -8,6 +8,7 @@
 share/angband/edit/artifact.txt
 share/angband/edit/cost_adj.txt
 share/angband/edit/ego_item.txt
+share/angband/edit/flavor.txt
 share/angband/edit/limits.txt
 share/angband/edit/monster.txt
 share/angband/edit/object.txt
@@ -32,6 +33,9 @@
 share/angband/help/version.txt
 share/angband/info/
 share/angband/pref/
+share/angband/pref/flvr-dvg.prf
+share/angband/pref/flvr-new.prf
+share/angband/pref/flvr-xxx.prf
 share/angband/pref/font-ami.prf
 share/angband/pref/font-dos.prf
 share/angband/pref/font-ibm.prf
@@ -41,6 +45,7 @@
 share/angband/pref/font-xxx.prf
 share/angband/pref/font.prf
 share/angband/pref/graf-ami.prf
+share/angband/pref/graf-dvg.prf
 share/angband/pref/graf-gcu.prf
 share/angband/pref/graf-ibm.prf
 share/angband/pref/graf-lsl.prf
@@ -53,6 +58,7 @@
 share/angband/pref/message.prf
 share/angband/pref/pref-acn.prf
 share/angband/pref/pref-ami.prf
+share/angband/pref/pref-dos.prf
 share/angband/pref/pref-emx.prf
 share/angband/pref/pref-gcu.prf
 share/angband/pref/pref-mac.prf
@@ -61,9 +67,24 @@
 share/angband/pref/pref.prf
 share/angband/pref/user-mac.prf
 share/angband/pref/user.prf
+share/angband/pref/xtra-dvg.prf
 share/angband/pref/xtra-new.prf
 share/angband/pref/xtra-xxx.prf
 @comment share/angband/save/
+share/angband/script/
+share/angband/script/birth.lua
+share/angband/script/event.lua
+share/angband/script/init.lua
+share/angband/script/object.lua
+share/angband/script/player.lua
+share/angband/script/spell.lua
+share/angband/script/store.lua
+share/angband/script/test.lua
+share/angband/script/trace.lua
+_(_at_)_comment share/angband/user/
+share/angband/xtra/font/
+share/angband/xtra/font/16x16.txt
+_(_at_)_comment share/angband/save/
 @comment share/angband/user/
 share/angband/xtra/
 @mode 775
@@ -74,3 +95,4 @@
 @sample /var/games/angband/data/
 @sample /var/games/angband/bone/
 @extraunexec rm /var/games/angband/*/* 2>/dev/null || true
+