6 files changed, 105 insertions, 190 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index ffa8481be7c9..baefbaccf876 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -6,48 +6,16 @@
 #
 
 PORTNAME=	angband
-PORTVERSION=	2.9.0
+PORTVERSION=	3.0.1
 CATEGORIES=	games
-MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/ \
-		ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Source/ \
-		ftp://ftp.sunet.se/pub/games/Angband/Source/ \
-		ftp://mirror.aarnet.edu.au/pub/games/roguelike/angband/Source/ \
-		ftp://export.andrew.cmu.edu/angband/Extra/ \
-		ftp://ftp.greyhelm.com/pub/Games/Angband/Angband-2.7.x/Extra/ \
-		ftp://ftp.sunet.se/pub/games/Angband/Extra/ \
-		ftp://mirror.aarnet.edu.au/pub/games/roguelike/angband/Extra/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mph
-DISTNAME=	angband-290
-DISTFILES=	angband-290-src.tar.gz angband-290-graf.zip \
-		angband-290-data.tar.gz
-EXTRACT_ONLY=	angband-290-src.tar.gz
+MASTER_SITES=	ftp://clockwork.dementia.org/angband/Source/  \
+		ftp://ftp.sunet.se/pub/games/Angband/Source/
 
 MAINTAINER=	mph@freebsd.org
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+GNU_CONFIGURE=	yes
+USE_XLIB=	yes
 
-USE_X_PREFIX=	yes
-DIST_SUBDIR=	angband
-
-post-extract:
-	(cd ${WRKSRC}/lib/xtra/graf && unzip ${DISTDIR}/${DIST_SUBDIR}/angband-290-graf.zip)
-
-pre-patch:
-	${CP} ${WRKSRC}/src/makefile.std ${WRKSRC}/src/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/angband ${PREFIX}/bin/angband
-	find ${WRKSRC}/lib -name delete.me -delete
-	${MKDIR} ${PREFIX}/lib/X11/angband
-	(cd ${WRKSRC}/lib && ${TAR} cf - * ) | (cd ${PREFIX}/lib/X11/angband && tar xf - )
-	(cd ${PREFIX} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/angband-290-data.tar.gz)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/X11/angband
-	(cd ${PREFIX}/lib/X11/angband && \
-		${CHMOD} 555 apex bone data edit file help info xtra ; \
-		${CHMOD} 1777 save user \
-		)
-	${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 /dev/null ${PREFIX}/lib/X11/angband/apex/scores.raw
-	@${CAT} ${PKGMESSAGE}
+CONFIGURE_ARGS=	--with-setgid=games --with-x
 
 .include <bsd.port.mk>
diff --git a/games/angband/distinfo b/games/angband/distinfo
index 76fd6e19b809..21beeb82b95c 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,3 +1 @@
-MD5 (angband/angband-290-src.tar.gz) = 1f95231aa1afcc23e9b0d43e092c9f8c
-MD5 (angband/angband-290-graf.zip) = 060a8ba5c00000fb641c11371c51b049
-MD5 (angband/angband-290-data.tar.gz) = 15604f13fdede445bdd9436a92135358
+MD5 (angband-3.0.1.tar.gz) = 125586130fa3aca38b22755d3c4bc988
diff --git a/games/angband/files/patch-aa b/games/angband/files/patch-aa
deleted file mode 100644
index 3c8cdb8348f6..000000000000
--- a/games/angband/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Thu Dec  2 10:13:33 1999
-+++ Makefile	Thu Dec  2 10:27:53 1999
-@@ -0,0 +1,9 @@
-+# My makefile for Angband
-+# Matthew Hunt <mph@FreeBSD.org>
-+
-+CFLAGS+=-I${X11BASE}/include -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH=\\\"$(PREFIX)/lib/X11/angband\\\"
-+
-+all:	angband
-+
-+angband:
-+	cd src && make "CFLAGS=$(CFLAGS)"
diff --git a/games/angband/files/patch-ac b/games/angband/files/patch-ac
deleted file mode 100644
index 3041fbb6363d..000000000000
--- a/games/angband/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/config.h.orig	Wed Feb 11 05:30:28 1998
-+++ src/config.h	Sat Sep 18 18:20:32 1999
-@@ -52,7 +52,7 @@
- /*
-  * 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
deleted file mode 100644
index 4b6c366c4462..000000000000
--- a/games/angband/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/Makefile.orig	Sun Apr 16 01:12:37 2000
-+++ src/Makefile	Sun Apr 16 01:13:32 2000
-@@ -91,7 +91,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere.
- #
--CC = gcc
-+#CC = gcc
- 
- 
- #
-@@ -156,9 +156,9 @@
- ## Allows the use of Angband in the console using ncurses,
- ## as well as under X11.
- ##
--CFLAGS = -I/usr/X11R6/include -I/usr/include/ncurses -Wall -O2 -m486 \
--         -D"USE_X11" -D"USE_GCU" -D"USE_NCURSES"
--LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses
-+#CFLAGS = -I/usr/X11R6/include -I/usr/include/ncurses -Wall -O2 -m486 \
-+#         -D"USE_X11" -D"USE_GCU" -D"USE_NCURSES"
-+LIBS = -L$(X11BASE)/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses
- 
- 
- ##
diff --git a/games/angband/pkg-plist b/games/angband/pkg-plist
index 1852cc4a1176..3c095d4701ff 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -1,103 +1,99 @@
 bin/angband
-lib/X11/angband/apex/scores.raw
-lib/X11/angband/data/a_info.raw
-lib/X11/angband/data/e_info.raw
-lib/X11/angband/data/f_info.raw
-lib/X11/angband/data/k_info.raw
-lib/X11/angband/data/r_info.raw
-lib/X11/angband/data/v_info.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-dos.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-x11.prf
-lib/X11/angband/user/font-xxx.prf
-lib/X11/angband/user/font.prf
-lib/X11/angband/user/graf-ami.prf
-lib/X11/angband/user/graf-gcu.prf
-lib/X11/angband/user/graf-ibm.prf
-lib/X11/angband/user/graf-lsl.prf
-lib/X11/angband/user/graf-mac.prf
-lib/X11/angband/user/graf-new.prf
-lib/X11/angband/user/graf-win.prf
-lib/X11/angband/user/graf-x11.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
-lib/X11/angband/user/xtra-new.prf
-lib/X11/angband/user/xtra-xxx.prf
-lib/X11/angband/xtra/graf/16x16.bmp
-lib/X11/angband/xtra/graf/8x13.bmp
-lib/X11/angband/xtra/graf/8x8.bmp
-lib/X11/angband/xtra/graf/backgrnd.bmp
-lib/X11/angband/xtra/graf/mask.bmp
-lib/X11/angband/xtra/graf/readme.txt
-lib/X11/angband/xtra/sound/sound.cfg
-@exec mkdir -p %D/lib/X11/angband/apex
-@exec mkdir -p %D/lib/X11/angband/bone
-@exec mkdir -p %D/lib/X11/angband/data
-@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/info
-@exec mkdir -p %D/lib/X11/angband/save
-@exec mkdir -p %D/lib/X11/angband/user
-@exec mkdir -p %D/lib/X11/angband/xtra
-@exec mkdir -p %D/lib/X11/angband/xtra/font
-@exec mkdir -p %D/lib/X11/angband/xtra/graf
-@exec mkdir -p %D/lib/X11/angband/xtra/music
-@exec mkdir -p %D/lib/X11/angband/xtra/sound
-@exec chmod 555 %D/lib/X11/angband/apex
-@exec chmod 555 %D/lib/X11/angband/bone
-@exec chmod 555 %D/lib/X11/angband/data
-@exec chmod 555 %D/lib/X11/angband/edit
-@exec chmod 555 %D/lib/X11/angband/file
-@exec chmod 555 %D/lib/X11/angband/help
-@exec chmod 555 %D/lib/X11/angband/info
-@exec chmod 555 %D/lib/X11/angband/xtra
-@exec chmod 1777 %D/lib/X11/angband/save
-@exec chmod 1777 %D/lib/X11/angband/user
-@exec chmod 444 %D/lib/X11/angband/apex/scores.raw
-@dirrm lib/X11/angband/apex
-@dirrm lib/X11/angband/bone
-@dirrm lib/X11/angband/data
-@dirrm lib/X11/angband/edit
-@dirrm lib/X11/angband/file
-@dirrm lib/X11/angband/help
-@dirrm lib/X11/angband/info
-@dirrm lib/X11/angband/pref
-@dirrm lib/X11/angband/save
-@dirrm lib/X11/angband/user
-@dirrm lib/X11/angband/xtra/font
-@dirrm lib/X11/angband/xtra/graf
-@dirrm lib/X11/angband/xtra/music
-@dirrm lib/X11/angband/xtra/sound
-@dirrm lib/X11/angband/xtra
-@dirrm lib/X11/angband
+share/games/angband/lib/apex/delete.me
+share/games/angband/lib/apex/scores.raw
+share/games/angband/lib/bone/delete.me
+share/games/angband/lib/data/delete.me
+share/games/angband/lib/data/artifact.raw
+share/games/angband/lib/data/cost_adj.raw
+share/games/angband/lib/data/ego_item.raw
+share/games/angband/lib/data/flavor.raw
+share/games/angband/lib/data/limits.raw
+share/games/angband/lib/data/monster.raw
+share/games/angband/lib/data/object.raw
+share/games/angband/lib/data/p_class.raw
+share/games/angband/lib/data/p_hist.raw
+share/games/angband/lib/data/p_race.raw
+share/games/angband/lib/data/prices.raw
+share/games/angband/lib/data/shop_own.raw
+share/games/angband/lib/data/terrain.raw
+share/games/angband/lib/data/vault.raw
+share/games/angband/lib/edit/artifact.txt
+share/games/angband/lib/edit/cost_adj.txt
+share/games/angband/lib/edit/ego_item.txt
+share/games/angband/lib/edit/flavor.txt
+share/games/angband/lib/edit/limits.txt
+share/games/angband/lib/edit/monster.txt
+share/games/angband/lib/edit/object.txt
+share/games/angband/lib/edit/p_class.txt
+share/games/angband/lib/edit/p_hist.txt
+share/games/angband/lib/edit/p_race.txt
+share/games/angband/lib/edit/shop_own.txt
+share/games/angband/lib/edit/terrain.txt
+share/games/angband/lib/edit/vault.txt
+share/games/angband/lib/file/dead.txt
+share/games/angband/lib/file/news.txt
+share/games/angband/lib/help/help.hlp
+share/games/angband/lib/help/attack.txt
+share/games/angband/lib/help/birth.txt
+share/games/angband/lib/help/command.txt
+share/games/angband/lib/help/dungeon.txt
+share/games/angband/lib/help/general.txt
+share/games/angband/lib/help/option.txt
+share/games/angband/lib/help/playing.txt
+share/games/angband/lib/help/version.txt
+share/games/angband/lib/info/delete.me
+share/games/angband/lib/pref/flvr-xxx.prf
+share/games/angband/lib/pref/flvr-new.prf
+share/games/angband/lib/pref/font.prf
+share/games/angband/lib/pref/font-ami.prf
+share/games/angband/lib/pref/font-dos.prf
+share/games/angband/lib/pref/font-ibm.prf
+share/games/angband/lib/pref/font-mac.prf
+share/games/angband/lib/pref/font-win.prf
+share/games/angband/lib/pref/font-x11.prf
+share/games/angband/lib/pref/font-xxx.prf
+share/games/angband/lib/pref/graf.prf
+share/games/angband/lib/pref/graf-ami.prf
+share/games/angband/lib/pref/graf-gcu.prf
+share/games/angband/lib/pref/graf-ibm.prf
+share/games/angband/lib/pref/graf-lsl.prf
+share/games/angband/lib/pref/graf-mac.prf
+share/games/angband/lib/pref/graf-new.prf
+share/games/angband/lib/pref/graf-win.prf
+share/games/angband/lib/pref/graf-x11.prf
+share/games/angband/lib/pref/graf-xxx.prf
+share/games/angband/lib/pref/message.prf
+share/games/angband/lib/pref/pref.prf
+share/games/angband/lib/pref/pref-acn.prf
+share/games/angband/lib/pref/pref-ami.prf
+share/games/angband/lib/pref/pref-emx.prf
+share/games/angband/lib/pref/pref-gcu.prf
+share/games/angband/lib/pref/pref-mac.prf
+share/games/angband/lib/pref/pref-win.prf
+share/games/angband/lib/pref/pref-x11.prf
+share/games/angband/lib/pref/user.prf
+share/games/angband/lib/pref/user-mac.prf
+share/games/angband/lib/pref/xtra-new.prf
+share/games/angband/lib/pref/xtra-xxx.prf
+share/games/angband/lib/save/delete.me
+share/games/angband/lib/script/init.lua
+share/games/angband/lib/script/object.lua
+share/games/angband/lib/script/spell.lua
+share/games/angband/lib/script/test.lua
+share/games/angband/lib/script/trace.lua
+share/games/angband/lib/user/delete.me
+share/games/angband/lib/xtra/delete.me
+@dirrm share/games/angband/lib/apex
+@dirrm share/games/angband/lib/bone
+@dirrm share/games/angband/lib/data
+@dirrm share/games/angband/lib/edit
+@dirrm share/games/angband/lib/file
+@dirrm share/games/angband/lib/help
+@dirrm share/games/angband/lib/info
+@dirrm share/games/angband/lib/pref
+@dirrm share/games/angband/lib/save
+@dirrm share/games/angband/lib/script
+@dirrm share/games/angband/lib/user
+@dirrm share/games/angband/lib/xtra
+@dirrm share/games/angband/lib
+@dirrm share/games/angband