- Update to 3.0.8

6 files changed, 167 insertions, 118 deletions

diff --git a/games/angband/Makefile b/games/angband/Makefile
index 4f4efc0deecd..a805e1d62ddd 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	angband
-PORTVERSION=	3.0.6
-PORTREVISION=	1
+PORTVERSION=	3.0.8
 CATEGORIES=	games
-MASTER_SITES=	http://angband.oook.cz/download/
+MASTER_SITES=	http://rephial.org/downloads/ \
+		http://angband.oook.cz/download/
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Rogue-like game with color, X11 support
 
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-setgid=games
 .if !defined(WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	sm x11
 CONFIGURE_ARGS+=	--with-x
 .else
 CONFIGURE_ARGS+=	--with-x=no
@@ -33,6 +34,13 @@ pre-fetch:
 	@${ECHO_MSG} "Building without X support"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lSM|-L${LOCALBASE}/lib -lSM|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| $$(INCLUDEDIR)||' ${WRKSRC}/mk/objective.mk
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/src/autoconf.h
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/angband/distinfo b/games/angband/distinfo
index 54737b003b7e..25d63be0356e 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,3 +1,3 @@
-MD5 (angband-3.0.6.tar.gz) = 4c31b1b3679dff20db6a5fcb182c3e96
-SHA256 (angband-3.0.6.tar.gz) = 9d5f2d37ce126c774840e3fd86c1ea174fe6a1a4a4f35c1429cb0a1480073651
-SIZE (angband-3.0.6.tar.gz) = 1570831
+MD5 (angband-3.0.8.tar.gz) = 2362dfd676352d764a348e37208c13fa
+SHA256 (angband-3.0.8.tar.gz) = 4129be9c8ee684004085120ec88532a12d617c321e9c6facc2b8dc7e9c3f03bd
+SIZE (angband-3.0.8.tar.gz) = 2339226
diff --git a/games/angband/files/patch-lib-edit-Makefile b/games/angband/files/patch-lib-edit-Makefile
new file mode 100644
index 000000000000..d64f9ee6ac49
--- /dev/null
+++ b/games/angband/files/patch-lib-edit-Makefile
@@ -0,0 +1,10 @@
+--- lib/edit/Makefile.orig	Tue Apr 24 16:22:36 2007
++++ lib/edit/Makefile	Tue Jul 10 22:40:58 2007
+@@ -9,6 +9,7 @@
+ 	flavor.txt:${DATA_PATH}/edit    \
+ 	limits.txt:${DATA_PATH}/edit    \
+ 	monster.txt:${DATA_PATH}/edit   \
++	object.txt:${DATA_PATH}/edit    \
+ 	p_class.txt:${DATA_PATH}/edit   \
+ 	p_hist.txt:${DATA_PATH}/edit    \
+ 	p_race.txt:${DATA_PATH}/edit    \
diff --git a/games/angband/files/pkg-message.in b/games/angband/files/pkg-message.in
index d3bf8049dd3e..45ba5c5b3491 100644
--- a/games/angband/files/pkg-message.in
+++ b/games/angband/files/pkg-message.in
@@ -5,9 +5,9 @@
 
  To use graphical tiles, use -g:
    angband -g
-   Note: you have to download graphical tiles from www.thangorodrim.net
+   Note: you have to download graphical tiles from angband.oook.cz
    manually and place them in %%PREFIX%%/share/angband/lib/xtra/graf
 
- Tip: If you're experiencing display issues while playing angband in 
-      syscons, try setting your TERM environment variable to 'mvterm'  
+ Tip: If you're experiencing display issues while playing angband in
+      syscons, try setting your TERM environment variable to 'mvterm'
  =======================================================================
diff --git a/games/angband/pkg-descr b/games/angband/pkg-descr
index 7f544ee18d06..fc97bde6e0f4 100644
--- a/games/angband/pkg-descr
+++ b/games/angband/pkg-descr
@@ -5,4 +5,4 @@ the Master of the dungeon: Morgoth himself!  Your character, the dungeon, and
 all the monsters are represented on the screen using ASCII characters.  Game
 also provides graphical tiles mode.
 
-WWW: http://www.thangorodrim.net/
+WWW: http://rephial.org/
diff --git a/games/angband/pkg-plist b/games/angband/pkg-plist
index 1dc36aa916a2..f1b68b12e1ea 100644
--- a/games/angband/pkg-plist
+++ b/games/angband/pkg-plist
@@ -1,109 +1,140 @@
 bin/angband
-share/angband/lib/apex/delete.me
-share/angband/lib/apex/scores.raw
-share/angband/lib/bone/delete.me
-share/angband/lib/data/artifact.raw
-share/angband/lib/data/cost_adj.raw
-share/angband/lib/data/delete.me
-share/angband/lib/data/ego_item.raw
-share/angband/lib/data/flavor.raw
-share/angband/lib/data/limits.raw
-share/angband/lib/data/monster.raw
-share/angband/lib/data/object.raw
-share/angband/lib/data/p_class.raw
-share/angband/lib/data/p_hist.raw
-share/angband/lib/data/p_race.raw
-share/angband/lib/data/prices.raw
-share/angband/lib/data/shop_own.raw
-share/angband/lib/data/terrain.raw
-share/angband/lib/data/vault.raw
-share/angband/lib/edit/artifact.txt
-share/angband/lib/edit/cost_adj.txt
-share/angband/lib/edit/ego_item.txt
-share/angband/lib/edit/flavor.txt
-share/angband/lib/edit/limits.txt
-share/angband/lib/edit/monster.txt
-share/angband/lib/edit/object.txt
-share/angband/lib/edit/p_class.txt
-share/angband/lib/edit/p_hist.txt
-share/angband/lib/edit/p_race.txt
-share/angband/lib/edit/shop_own.txt
-share/angband/lib/edit/terrain.txt
-share/angband/lib/edit/vault.txt
-share/angband/lib/file/dead.txt
-share/angband/lib/file/news.txt
-share/angband/lib/help/attack.txt
-share/angband/lib/help/birth.txt
-share/angband/lib/help/command.txt
-share/angband/lib/help/dungeon.txt
-share/angband/lib/help/general.txt
-share/angband/lib/help/help.hlp
-share/angband/lib/help/option.txt
-share/angband/lib/help/playing.txt
-share/angband/lib/help/version.txt
-share/angband/lib/info/delete.me
-share/angband/lib/pref/flvr-dvg.prf
-share/angband/lib/pref/flvr-new.prf
-share/angband/lib/pref/flvr-xxx.prf
-share/angband/lib/pref/font-ami.prf
-share/angband/lib/pref/font-dos.prf
-share/angband/lib/pref/font-ibm.prf
-share/angband/lib/pref/font-mac.prf
-share/angband/lib/pref/font-win.prf
-share/angband/lib/pref/font-x11.prf
-share/angband/lib/pref/font-xxx.prf
-share/angband/lib/pref/font.prf
-share/angband/lib/pref/graf-ami.prf
-share/angband/lib/pref/graf-dvg.prf
-share/angband/lib/pref/graf-gcu.prf
-share/angband/lib/pref/graf-ibm.prf
-share/angband/lib/pref/graf-lsl.prf
-share/angband/lib/pref/graf-mac.prf
-share/angband/lib/pref/graf-new.prf
-share/angband/lib/pref/graf-win.prf
-share/angband/lib/pref/graf-x11.prf
-share/angband/lib/pref/graf-xxx.prf
-share/angband/lib/pref/graf.prf
-share/angband/lib/pref/message.prf
-share/angband/lib/pref/pref-acn.prf
-share/angband/lib/pref/pref-ami.prf
-share/angband/lib/pref/pref-dos.prf
-share/angband/lib/pref/pref-emx.prf
-share/angband/lib/pref/pref-gcu.prf
-share/angband/lib/pref/pref-mac.prf
-share/angband/lib/pref/pref-win.prf
-share/angband/lib/pref/pref-x11.prf
-share/angband/lib/pref/pref.prf
-share/angband/lib/pref/user-mac.prf
-share/angband/lib/pref/user.prf
-share/angband/lib/pref/xtra-dvg.prf
-share/angband/lib/pref/xtra-new.prf
-share/angband/lib/pref/xtra-xxx.prf
-share/angband/lib/save/delete.me
-share/angband/lib/script/birth.lua
-share/angband/lib/script/event.lua
-share/angband/lib/script/init.lua
-share/angband/lib/script/object.lua
-share/angband/lib/script/player.lua
-share/angband/lib/script/spell.lua
-share/angband/lib/script/store.lua
-share/angband/lib/script/test.lua
-share/angband/lib/script/trace.lua
-share/angband/lib/user/delete.me
-share/angband/lib/xtra/delete.me
-share/angband/lib/xtra/font/16x16.txt
-@dirrm share/angband/lib/apex
-@dirrm share/angband/lib/bone
-@dirrm share/angband/lib/data
-@dirrm share/angband/lib/edit
-@dirrm share/angband/lib/file
-@dirrm share/angband/lib/help
-@dirrm share/angband/lib/info
-@dirrm share/angband/lib/pref
-@dirrm share/angband/lib/save
-@dirrm share/angband/lib/script
-@dirrm share/angband/lib/user
-@dirrm share/angband/lib/xtra/font
-@dirrm share/angband/lib/xtra
-@dirrm share/angband/lib
+share/angband/apex/delete.me
+share/angband/apex/scores.raw
+share/angband/bone/delete.me
+share/angband/data/artifact.raw
+share/angband/data/cost_adj.raw
+share/angband/data/delete.me
+share/angband/data/ego_item.raw
+share/angband/data/flavor.raw
+share/angband/data/limits.raw
+share/angband/data/monster.raw
+share/angband/data/object.raw
+share/angband/data/p_class.raw
+share/angband/data/p_hist.raw
+share/angband/data/p_race.raw
+share/angband/data/prices.raw
+share/angband/data/shop_own.raw
+share/angband/data/terrain.raw
+share/angband/data/vault.raw
+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
+share/angband/edit/p_class.txt
+share/angband/edit/p_hist.txt
+share/angband/edit/p_race.txt
+share/angband/edit/shop_own.txt
+share/angband/edit/spell.txt
+share/angband/edit/terrain.txt
+share/angband/edit/vault.txt
+share/angband/file/dead.txt
+share/angband/file/news.txt
+share/angband/help/attack.txt
+share/angband/help/birth.txt
+share/angband/help/command.txt
+share/angband/help/dungeon.txt
+share/angband/help/general.txt
+share/angband/help/option.txt
+share/angband/help/playing.txt
+share/angband/help/version.txt
+share/angband/info/delete.me
+share/angband/pref/flvr-dvg.prf
+share/angband/pref/flvr-new.prf
+share/angband/pref/flvr-xxx.prf
+share/angband/pref/font-mac.prf
+share/angband/pref/font-win.prf
+share/angband/pref/font-x11.prf
+share/angband/pref/font-xxx.prf
+share/angband/pref/font.prf
+share/angband/pref/graf-dvg.prf
+share/angband/pref/graf-mac.prf
+share/angband/pref/graf-new.prf
+share/angband/pref/graf-win.prf
+share/angband/pref/graf-x11.prf
+share/angband/pref/graf-xxx.prf
+share/angband/pref/graf.prf
+share/angband/pref/message.prf
+share/angband/pref/pref-acn.prf
+share/angband/pref/pref-gcu.prf
+share/angband/pref/pref-mac.prf
+share/angband/pref/pref-sdl.prf
+share/angband/pref/pref-x11.prf
+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
+share/angband/save/delete.me
+share/angband/user/delete.me
+share/angband/xtra/font/copying.txt
+share/angband/xtra/font/10x17b.fon
+share/angband/xtra/font/10x17.fon
+share/angband/xtra/font/10x20.fon
+share/angband/xtra/font/12x20b.fon
+share/angband/xtra/font/12x20.fon
+share/angband/xtra/font/12x24.fon
+share/angband/xtra/font/16x25b.fon
+share/angband/xtra/font/16x25.fon
+share/angband/xtra/font/5x8.fon
+share/angband/xtra/font/6x10.fon
+share/angband/xtra/font/6x12.fon
+share/angband/xtra/font/6x13b.fon
+share/angband/xtra/font/6x13.fon
+share/angband/xtra/font/7x13b.fon
+share/angband/xtra/font/7x13.fon
+share/angband/xtra/font/8x13b.fon
+share/angband/xtra/font/8x13c.fon
+share/angband/xtra/font/8x13.fon
+share/angband/xtra/font/8x16b.fon
+share/angband/xtra/font/8x16.fon
+share/angband/xtra/font/9x15b.fon
+share/angband/xtra/font/9x15.fon
+share/angband/xtra/graf/backgrnd.bmp
+share/angband/xtra/graf/mask.bmp
+share/angband/xtra/graf/16x16.bmp
+share/angband/xtra/graf/16x16.png
+share/angband/xtra/graf/32x32.png
+share/angband/xtra/graf/8x13.bmp
+share/angband/xtra/graf/8x8.bmp
+share/angband/xtra/graf/8x8.png
+share/angband/xtra/sound/breath.wav
+share/angband/xtra/sound/clunk.wav
+share/angband/xtra/sound/death.wav
+share/angband/xtra/sound/destroy.wav
+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/kill.wav
+share/angband/xtra/sound/level.wav
+share/angband/xtra/sound/miss1.wav
+share/angband/xtra/sound/miss.wav
+share/angband/xtra/sound/money.wav
+share/angband/xtra/sound/opendoor.wav
+share/angband/xtra/sound/shutdoor.wav
+share/angband/xtra/sound/sound.cfg
+share/angband/xtra/sound/thump.wav
+share/angband/xtra/sound/vomit.wav
+@dirrm share/angband/apex
+@dirrm share/angband/bone
+@dirrm share/angband/data
+@dirrm share/angband/edit
+@dirrm share/angband/file
+@dirrm share/angband/help
+@dirrm share/angband/info
+@dirrm share/angband/pref
+@dirrm share/angband/save
+@dirrm share/angband/user
+@dirrm share/angband/xtra/sound
+@dirrm share/angband/xtra/graf
+@dirrm share/angband/xtra/font
+@dirrm share/angband/xtra
 @dirrm share/angband