5 files changed, 72 insertions, 45 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index 1180b0cacf71..6b66d06e1767 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -6,38 +6,47 @@
 #
 
 PORTNAME=	angband
-PORTVERSION=	2.8.3
+PORTVERSION=	2.9.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/ \
-		http://people.FreeBSD.org/~mph/distfiles/
-DISTNAME=	angband-283
-DISTFILES=	angband-283.tar.gz ext-x11-283.tar.gz angband-data.tar.gz
+		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/ \
+		http://www.netlaputa.ne.jp/~t-ogawa/
+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
 
 MAINTAINER=	mph@freebsd.org
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+
 USE_X_PREFIX=	yes
 DIST_SUBDIR=	angband
 
-EXTRACT_ONLY=	angband-283.tar.gz ext-x11-283.tar.gz
-
-EXTSRC=		${WRKDIR}/ext-x11-283
+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
+	${CP} ${WRKSRC}/src/makefile.std ${WRKSRC}/src/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/angband ${PREFIX}/bin/angband
+	${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-data.tar.gz)
+	(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
-	${INSTALL_DATA} ${EXTSRC}/lib/xtra/tiles.raw \
-		${PREFIX}/lib/X11/angband/xtra
 	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/games/angband/distinfo b/games/angband/distinfo
index c767d6804332..76fd6e19b809 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,3 +1,3 @@
-MD5 (angband/angband-283.tar.gz) = 33c56940cf2f9c7aa265204159ab1cf8
-MD5 (angband/ext-x11-283.tar.gz) = 05b9b5c0c06bddc24f9e5b62cc4764c7
-MD5 (angband/angband-data.tar.gz) = 019d7f8484bfb458578f5c0f822fea22
+MD5 (angband/angband-290-src.tar.gz) = 1f95231aa1afcc23e9b0d43e092c9f8c
+MD5 (angband/angband-290-graf.zip) = 060a8ba5c00000fb641c11371c51b049
+MD5 (angband/angband-290-data.tar.gz) = 15604f13fdede445bdd9436a92135358
diff --git a/games/angband/files/patch-ad b/games/angband/files/patch-ad
index ab45c2154585..4b6c366c4462 100644
--- a/games/angband/files/patch-ad
+++ b/games/angband/files/patch-ad
@@ -1,22 +1,24 @@
---- src/Makefile.orig	Thu Dec  2 10:00:10 1999
-+++ src/Makefile	Thu Dec  2 10:12:47 1999
-@@ -94,7 +94,7 @@
+--- 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
+ # 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$(X11BASE)/lib -lX11 -lcurses -ltermcap
+@@ -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-descr b/games/angband/pkg-descr
index 9a2484a90cea..6003f05175e0 100644
--- a/games/angband/pkg-descr
+++ b/games/angband/pkg-descr
@@ -1,7 +1,4 @@
 A roguelike game derived from Moria.  Features unique
 monsters, artifact items, color support, X11 support.
 
-WWW: http://www.phial.com/angband/
-
-The author posted a list of changes in version 2.8.2 to
-rec.games.roguelike.angband.  This article is in files/CHANGES-2.8.2.
+WWW: http://thangorodrim.angband.org/
diff --git a/games/angband/pkg-plist b/games/angband/pkg-plist
index 2e7cb33406d0..99791ab68aa2 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -1,9 +1,9 @@
 bin/angband
 lib/X11/angband/apex/scores.raw
-lib/X11/angband/data/f_info.raw
-lib/X11/angband/data/k_info.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
@@ -24,19 +24,22 @@ 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-dos.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-xxx.prf
-lib/X11/angband/user/graf-ibm.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
@@ -48,17 +51,29 @@ 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/xtra/tiles.raw
+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/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/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
@@ -70,13 +85,17 @@ lib/X11/angband/xtra/tiles.raw
 @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/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/info
+@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