4 files changed, 50 insertions, 39 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index 7adef69cc6cc..2deed5ed7392 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:   angband
-# Date created:        21 Feb 1997
-# Whom:                Matthew Hunt <mph@pobox.com>
-#
+# Created by: Matthew Hunt <mph@pobox.com>
 # $FreeBSD$
-#
 
 PORTNAME=	angband
-PORTVERSION=	3.3.2
+PORTVERSION=	3.4.1
 CATEGORIES=	games
-MASTER_SITES=	http://rephial.org/downloads/3.3/
+MASTER_SITES=	http://rephial.org/downloads/${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
@@ -17,21 +13,21 @@ COMMENT=	Rogue-like game with color, X11 support
 USE_GMAKE=	yes
 ALL_TARGET=	#
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-setgid=games --disable-sdl --disable-sdl-mixer --with-varpath=/var/games/angband
-.if !defined(WITHOUT_X11)
-USE_XORG=	sm x11
-CONFIGURE_ARGS+=	--with-x
-.else
-CONFIGURE_ARGS+=	--with-x=no
-.endif
-CONFIGURE_ENV=	ac_cv_path_mkdir=mkdir
-CPP=		cc -E
+CONFIGURE_ARGS=	--with-setgid=games --localstatedir=/var
+LDFLAGS+=	-lncursesw
+
+OPTIONS_DEFINE=	X11
+X11_DESC=	Enable X11 (graphical) backend
 
-pre-fetch:
-.if !defined(WITHOUT_X11)
-	@${ECHO_MSG} "You could define WITHOUT_X11, if you don't want X support"
+OPTIONS_DEFAULT=X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	sm x11
+RUN_DEPENDS=	xorg-fonts-miscbitmaps>=0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
 .else
-	@${ECHO_MSG} "Building without X support"
+CONFIGURE_ARGS+=--disable-x11
 .endif
 
 post-patch:
diff --git a/games/angband/distinfo b/games/angband/distinfo
index 785440e63fa1..b8c5cccdd7b6 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,2 +1,2 @@
-SHA256 (angband-v3.3.2.tar.gz) = 6b5127b760c988e9ef4968556ea030ac1f24611da5fdc0db90cff2bd3bced4f7
-SIZE (angband-v3.3.2.tar.gz) = 3401345
+SHA256 (angband-v3.4.1.tar.gz) = 461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945
+SIZE (angband-v3.4.1.tar.gz) = 17880537
diff --git a/games/angband/files/patch-configure b/games/angband/files/patch-configure
new file mode 100644
index 000000000000..833d52cdd3cf
--- /dev/null
+++ b/games/angband/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	2013-03-06 18:58:16.000000000 +0200
++++ configure	2013-03-06 19:08:48.000000000 +0200
+@@ -4989,6 +4989,7 @@
+ 
+ 
+   rm -f conf.ncursestest
++  with_curses=yes
+ 
+ 	if test "$with_curses" = "yes"; then
+ 
diff --git a/games/angband/pkg-plist b/games/angband/pkg-plist
index c74be7a4dca2..9f29b59234c6 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -22,30 +22,32 @@ etc/angband/edit/vault.txt
 etc/angband/pref/flvr-dvg.prf
 etc/angband/pref/flvr-new.prf
 etc/angband/pref/flvr-nmd.prf
+etc/angband/pref/flvr-shb.prf
 etc/angband/pref/flvr-xxx.prf
-etc/angband/pref/font.prf
 etc/angband/pref/font-gcu.prf
 etc/angband/pref/font-mac.prf
 etc/angband/pref/font-sdl.prf
 etc/angband/pref/font-win.prf
-etc/angband/pref/font-xxx.prf
 etc/angband/pref/font-x11.prf
-etc/angband/pref/graf.prf
+etc/angband/pref/font-xxx.prf
+etc/angband/pref/font.prf
 etc/angband/pref/graf-dvg.prf
 etc/angband/pref/graf-new.prf
 etc/angband/pref/graf-nmd.prf
+etc/angband/pref/graf-shb.prf
 etc/angband/pref/graf-xxx.prf
+etc/angband/pref/graf.prf
 etc/angband/pref/message.prf
 etc/angband/pref/pref.prf
 etc/angband/pref/user.prf
 etc/angband/pref/xtra-dvg.prf
 etc/angband/pref/xtra-new.prf
 etc/angband/pref/xtra-nmd.prf
+etc/angband/pref/xtra-shb.prf
 etc/angband/pref/xtra-xxx.prf
 share/angband/file/crown.txt
 share/angband/file/dead.txt
 share/angband/file/news.txt
-share/angband/help/330.txt
 share/angband/help/attack.txt
 share/angband/help/birth.txt
 share/angband/help/command.txt
@@ -55,9 +57,17 @@ share/angband/help/general.txt
 share/angband/help/help.hlp
 share/angband/help/option.txt
 share/angband/help/playing.txt
+share/angband/help/readme.txt
 share/angband/help/version.txt
 share/angband/info/readme.txt
 share/angband/xtra/angband.glade
+share/angband/xtra/font/10x14x.fon
+share/angband/xtra/font/10x14xb.fon
+share/angband/xtra/font/10x20x.fon
+share/angband/xtra/font/12x18x.fon
+share/angband/xtra/font/12x24x.fon
+share/angband/xtra/font/16x16x.fon
+share/angband/xtra/font/16x24x.fon
 share/angband/xtra/font/5x8x.fon
 share/angband/xtra/font/6x10x.fon
 share/angband/xtra/font/6x12x.fon
@@ -65,26 +75,21 @@ share/angband/xtra/font/6x13x.fon
 share/angband/xtra/font/6x13xb.fon
 share/angband/xtra/font/7x13x.fon
 share/angband/xtra/font/7x13xb.fon
-share/angband/xtra/font/8x8x.fon
-share/angband/xtra/font/8x8xb.fon
 share/angband/xtra/font/8x12x.fon
 share/angband/xtra/font/8x12xb.fon
 share/angband/xtra/font/8x13x.fon
 share/angband/xtra/font/8x16x.fon
+share/angband/xtra/font/8x8x.fon
+share/angband/xtra/font/8x8xb.fon
 share/angband/xtra/font/9x15x.fon
 share/angband/xtra/font/9x15xb.fon
-share/angband/xtra/font/10x14x.fon
-share/angband/xtra/font/10x14xb.fon
-share/angband/xtra/font/10x20x.fon
-share/angband/xtra/font/12x18x.fon
-share/angband/xtra/font/12x24x.fon
-share/angband/xtra/font/16x16x.fon
-share/angband/xtra/font/16x24x.fon
 share/angband/xtra/graf/16x16.png
 share/angband/xtra/graf/32x32.png
+share/angband/xtra/graf/64x64.png
 share/angband/xtra/graf/8x16.png
 share/angband/xtra/graf/8x8.png
-share/angband/xtra/icon/angband-gtk.desktop
+share/angband/xtra/graf/graphics.txt
+share/angband/xtra/graf/mr_att.png
 share/angband/xtra/icon/angband-sdl.desktop
 share/angband/xtra/icon/angband-x11.desktop
 share/angband/xtra/icon/att-128.png
@@ -100,13 +105,13 @@ share/angband/xtra/sound/drop.wav
 share/angband/xtra/sound/eat.wav
 share/angband/xtra/sound/flee.wav
 share/angband/xtra/sound/hallu.wav
-share/angband/xtra/sound/hit1.wav
 share/angband/xtra/sound/hit.wav
-share/angband/xtra/sound/kill1.wav
+share/angband/xtra/sound/hit1.wav
 share/angband/xtra/sound/kill.wav
+share/angband/xtra/sound/kill1.wav
 share/angband/xtra/sound/level.wav
-share/angband/xtra/sound/miss1.wav
 share/angband/xtra/sound/miss.wav
+share/angband/xtra/sound/miss1.wav
 share/angband/xtra/sound/money.wav
 share/angband/xtra/sound/opendoor.wav
 share/angband/xtra/sound/shutdoor.wav