- Update to 0.0.21

- Require devel/guichan >= 0.5.0
- Unbreak on 4.x

PR:		ports/103709
Submitted by:	Marcus von Appen <mva at sysfault.org> (maintainer)

3 files changed, 155 insertions, 15 deletions

diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index 03dcbb7e7ba5..d9b1b7a2eb0d 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tmw
-PORTVERSION=	0.0.20
-PORTREVISION=	1
+PORTVERSION=	0.0.21
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	themanaworld
@@ -18,22 +17,23 @@ COMMENT=	A free open source 2D MMORPG in development
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		png.5:${PORTSDIR}/graphics/png \
 		curl.3:${PORTSDIR}/ftp/curl \
-		physfs-1.0.1:${PORTSDIR}/devel/physfs \
-		guichan.0:${PORTSDIR}/devel/guichan
+		physfs-1.0.1:${PORTSDIR}/devel/physfs
+BUILD_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
+RUN_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl image mixer net
+USE_GCC=	3.2+
+USE_GETOPT_LONG=yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
-		CFLAGS="`${SDL_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CXXFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/games/tmw/distinfo b/games/tmw/distinfo
index 8a382f0c36d2..e735a29cf294 100644
--- a/games/tmw/distinfo
+++ b/games/tmw/distinfo
@@ -1,3 +1,3 @@
-MD5 (tmw-0.0.20.tar.gz) = fa6af4284774d12c98efd6d77bdd4bd7
-SHA256 (tmw-0.0.20.tar.gz) = b80f9b47d9b0d137e9fab0b781c6a61714421c422db1755de6858d3748b0df9b
-SIZE (tmw-0.0.20.tar.gz) = 2709499
+MD5 (tmw-0.0.21.tar.gz) = e13a748b8e279fa694db5eb14ac4a8a9
+SHA256 (tmw-0.0.21.tar.gz) = 180470d0d3e0977ef3f0bb8990b2aa12c5d6325b0086a955fdbff914dcf82bb3
+SIZE (tmw-0.0.21.tar.gz) = 3363620
diff --git a/games/tmw/pkg-plist b/games/tmw/pkg-plist
index 2400054aa41d..9d7bae708b47 100644
--- a/games/tmw/pkg-plist
+++ b/games/tmw/pkg-plist
@@ -47,6 +47,123 @@ share/pixmaps/tmw.png
 %%DATADIR%%/data/graphics/images/minimap_new_2-1.png
 %%DATADIR%%/data/graphics/images/minimap_new_3-1.png
 %%DATADIR%%/data/graphics/images/minimap_new_5-1.png
+%%DATADIR%%/data/graphics/images/ambient/clouds.png
+%%DATADIR%%/data/graphics/images/ambient/sandstorm.png
+%%DATADIR%%/data/graphics/images/ambient/spotlight.png
+%%DATADIR%%/data/graphics/items/armor-chest-cottonshirt.png
+%%DATADIR%%/data/graphics/items/armor-chest-desertshirt.png
+%%DATADIR%%/data/graphics/items/armor-chest-leathershirt.png
+%%DATADIR%%/data/graphics/items/armor-chest-woolsweater.png
+%%DATADIR%%/data/graphics/items/armor-feet-boots.png
+%%DATADIR%%/data/graphics/items/armor-hands-leathergloves.png
+%%DATADIR%%/data/graphics/items/armor-hands-minergloves.png
+%%DATADIR%%/data/graphics/items/armor-hands-scarabarmlet.png
+%%DATADIR%%/data/graphics/items/armor-hands-wintergloves.png
+%%DATADIR%%/data/graphics/items/armor-head-fancyhat.png
+%%DATADIR%%/data/graphics/items/armor-head-minershat.png
+%%DATADIR%%/data/graphics/items/armor-head-santahat.png
+%%DATADIR%%/data/graphics/items/armor-head-silkheadband.png
+%%DATADIR%%/data/graphics/items/armor-head-standardheadband.png
+%%DATADIR%%/data/graphics/items/armor-legs-cottonshorts.png
+%%DATADIR%%/data/graphics/items/armor-legs-jeanshorts.png
+%%DATADIR%%/data/graphics/items/armor-shield-bladeshield.png
+%%DATADIR%%/data/graphics/items/armor-shield-britshield.png
+%%DATADIR%%/data/graphics/items/armor-shield-knightshield.png
+%%DATADIR%%/data/graphics/items/armor-shield-leathershield.png
+%%DATADIR%%/data/graphics/items/armor-shield-steelshield.png
+%%DATADIR%%/data/graphics/items/armor-shield-woodenshield.png
+%%DATADIR%%/data/graphics/items/generic-bluehint.png
+%%DATADIR%%/data/graphics/items/generic-bluepresentbox.png
+%%DATADIR%%/data/graphics/items/generic-bottleofsand.png
+%%DATADIR%%/data/graphics/items/generic-bugleg.png
+%%DATADIR%%/data/graphics/items/generic-casinocoins.png
+%%DATADIR%%/data/graphics/items/generic-coinbag.png
+%%DATADIR%%/data/graphics/items/generic-emptybottle.png
+%%DATADIR%%/data/graphics/items/generic-greenhint.png
+%%DATADIR%%/data/graphics/items/generic-greenpresentbox.png
+%%DATADIR%%/data/graphics/items/generic-greyhint.png
+%%DATADIR%%/data/graphics/items/generic-magentahint.png
+%%DATADIR%%/data/graphics/items/generic-maggotslime.png
+%%DATADIR%%/data/graphics/items/generic-orangehint.png
+%%DATADIR%%/data/graphics/items/generic-otherbluehint.png
+%%DATADIR%%/data/graphics/items/generic-petal.png
+%%DATADIR%%/data/graphics/items/generic-purplehint.png
+%%DATADIR%%/data/graphics/items/generic-purplepresentbox.png
+%%DATADIR%%/data/graphics/items/generic-rawlog.png
+%%DATADIR%%/data/graphics/items/generic-redhint.png
+%%DATADIR%%/data/graphics/items/generic-redscorpionstinger.png
+%%DATADIR%%/data/graphics/items/generic-scorpionstinger.png
+%%DATADIR%%/data/graphics/items/generic-smallmushroom.png
+%%DATADIR%%/data/graphics/items/generic-tealhint.png
+%%DATADIR%%/data/graphics/items/generic-treasurekey.png
+%%DATADIR%%/data/graphics/items/generic-yellowhint.png
+%%DATADIR%%/data/graphics/items/use-food-apple.png
+%%DATADIR%%/data/graphics/items/use-food-beer.png
+%%DATADIR%%/data/graphics/items/use-food-bottleofwater.png
+%%DATADIR%%/data/graphics/items/use-food-cake.png
+%%DATADIR%%/data/graphics/items/use-food-candy.png
+%%DATADIR%%/data/graphics/items/use-food-candycane.png
+%%DATADIR%%/data/graphics/items/use-food-cherrycake.png
+%%DATADIR%%/data/graphics/items/use-food-chickenleg.png
+%%DATADIR%%/data/graphics/items/use-food-chocolatebar.png
+%%DATADIR%%/data/graphics/items/use-food-decorcandy.png
+%%DATADIR%%/data/graphics/items/use-food-easteregg.png
+%%DATADIR%%/data/graphics/items/use-food-gingerbreadman.png
+%%DATADIR%%/data/graphics/items/use-food-milk.png
+%%DATADIR%%/data/graphics/items/use-food-orangecupcake.png
+%%DATADIR%%/data/graphics/items/use-food-roastedmaggot.png
+%%DATADIR%%/data/graphics/items/use-food-xmascake.png
+%%DATADIR%%/data/graphics/items/use-food-xmascandycane.png
+%%DATADIR%%/data/graphics/items/use-potion-cactusdrink.png
+%%DATADIR%%/data/graphics/items/use-potion-cactuspotion.png
+%%DATADIR%%/data/graphics/items/use-potion-concentrationpotion.png
+%%DATADIR%%/data/graphics/items/use-potion-ironpotion.png
+%%DATADIR%%/data/graphics/items/weapon-arrow-arrow.png
+%%DATADIR%%/data/graphics/items/weapon-arrow-iron.png
+%%DATADIR%%/data/graphics/items/weapon-axe-axe.png
+%%DATADIR%%/data/graphics/items/weapon-axe-blacksmithsaxe.png
+%%DATADIR%%/data/graphics/items/weapon-axe-hatchet.png
+%%DATADIR%%/data/graphics/items/weapon-axe-meatcleaver.png
+%%DATADIR%%/data/graphics/items/weapon-bow-bow.png
+%%DATADIR%%/data/graphics/items/weapon-bow-desertbow.png
+%%DATADIR%%/data/graphics/items/weapon-bow-forestbow.png
+%%DATADIR%%/data/graphics/items/weapon-bow-shortbow.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-boneknife.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-dagger.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-knive.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-rockknive.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-setzer.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-sharpknife.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-shortsword.png
+%%DATADIR%%/data/graphics/items/weapon-dagger-stiletto.png
+%%DATADIR%%/data/graphics/items/weapon-mace-club.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-bardiche.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-dualspear.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-halberd.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-heavypike.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-heavyspear.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-pike.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-scorpion.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-spear.png
+%%DATADIR%%/data/graphics/items/weapon-polearm-trident.png
+%%DATADIR%%/data/graphics/items/weapon-staff-crescentrod.png
+%%DATADIR%%/data/graphics/items/weapon-staff-staffoffire.png
+%%DATADIR%%/data/graphics/items/weapon-staff-staffofice.png
+%%DATADIR%%/data/graphics/items/weapon-sword-jackal.png
+%%DATADIR%%/data/graphics/items/weapon-staff-staffoflife.png
+%%DATADIR%%/data/graphics/items/weapon-sword-baselard.png
+%%DATADIR%%/data/graphics/items/weapon-sword-bastardsword.png
+%%DATADIR%%/data/graphics/items/weapon-sword-beheader.png
+%%DATADIR%%/data/graphics/items/weapon-sword-broadsword.png
+%%DATADIR%%/data/graphics/items/weapon-sword-falchion.png
+%%DATADIR%%/data/graphics/items/weapon-sword-firesword.png
+%%DATADIR%%/data/graphics/items/weapon-sword-longsword.png
+%%DATADIR%%/data/graphics/items/weapon-sword-rapier.png
+%%DATADIR%%/data/graphics/items/weapon-sword-sabre.png
+%%DATADIR%%/data/graphics/items/weapon-sword-sandcutter.png
+%%DATADIR%%/data/graphics/items/weapon-sword-scimitar.png
+%%DATADIR%%/data/graphics/items/weapon-sword-sword.png
+%%DATADIR%%/data/graphics/items/weapon-thrown-bonedarts.png
 %%DATADIR%%/data/graphics/sprites/emotions.png
 %%DATADIR%%/data/graphics/sprites/hairstyle1.png
 %%DATADIR%%/data/graphics/sprites/hairstyle1.xml
@@ -62,11 +179,26 @@ share/pixmaps/tmw.png
 %%DATADIR%%/data/graphics/sprites/hairstyle6.xml
 %%DATADIR%%/data/graphics/sprites/hairstyle7.png
 %%DATADIR%%/data/graphics/sprites/hairstyle7.xml
-%%DATADIR%%/data/graphics/sprites/items.png
 %%DATADIR%%/data/graphics/sprites/item001.png
 %%DATADIR%%/data/graphics/sprites/item001.xml
 %%DATADIR%%/data/graphics/sprites/item002.png
 %%DATADIR%%/data/graphics/sprites/item002.xml
+%%DATADIR%%/data/graphics/sprites/item003.png
+%%DATADIR%%/data/graphics/sprites/item003.xml
+%%DATADIR%%/data/graphics/sprites/item004.png
+%%DATADIR%%/data/graphics/sprites/item004.xml
+%%DATADIR%%/data/graphics/sprites/item005.png
+%%DATADIR%%/data/graphics/sprites/item005.xml
+%%DATADIR%%/data/graphics/sprites/item006.png
+%%DATADIR%%/data/graphics/sprites/item006.xml
+%%DATADIR%%/data/graphics/sprites/item007.png
+%%DATADIR%%/data/graphics/sprites/item007.xml
+%%DATADIR%%/data/graphics/sprites/item008.png
+%%DATADIR%%/data/graphics/sprites/item008.xml
+%%DATADIR%%/data/graphics/sprites/item009.png
+%%DATADIR%%/data/graphics/sprites/item009.xml
+%%DATADIR%%/data/graphics/sprites/item010.png
+%%DATADIR%%/data/graphics/sprites/item010.xml
 %%DATADIR%%/data/graphics/sprites/monster0.png
 %%DATADIR%%/data/graphics/sprites/monster0.xml
 %%DATADIR%%/data/graphics/sprites/monster1.png
@@ -103,6 +235,8 @@ share/pixmaps/tmw.png
 %%DATADIR%%/data/graphics/sprites/monster16.xml
 %%DATADIR%%/data/graphics/sprites/monster17.png
 %%DATADIR%%/data/graphics/sprites/monster17.xml
+%%DATADIR%%/data/graphics/sprites/monster18.png
+%%DATADIR%%/data/graphics/sprites/monster18.xml
 %%DATADIR%%/data/graphics/sprites/npcs.png
 %%DATADIR%%/data/graphics/sprites/npc.xml
 %%DATADIR%%/data/graphics/sprites/player_female_base.png
@@ -126,6 +260,8 @@ share/pixmaps/tmw.png
 %%DATADIR%%/data/graphics/tiles/inn.png
 %%DATADIR%%/data/graphics/tiles/mountain.png
 %%DATADIR%%/data/graphics/tiles/snow_building.png
+%%DATADIR%%/data/graphics/tiles/snow_x2.png
+%%DATADIR%%/data/graphics/tiles/snow_x3.png
 %%DATADIR%%/data/graphics/tiles/snowset.png
 %%DATADIR%%/data/help/about.txt
 %%DATADIR%%/data/help/changes.txt
@@ -151,6 +287,8 @@ share/pixmaps/tmw.png
 %%DATADIR%%/data/maps/new_9-1.tmx.gz
 %%DATADIR%%/data/maps/new_11-1.tmx.gz
 %%DATADIR%%/data/maps/new_12-1.tmx.gz
+%%DATADIR%%/data/maps/new_13-1.tmx.gz
+%%DATADIR%%/data/maps/new_14-1.tmx.gz
 %%DATADIR%%/data/sfx/bow_shoot_1.ogg
 %%DATADIR%%/data/sfx/fist-swish.ogg
 %%DATADIR%%/data/sfx/levelup.ogg
@@ -160,7 +298,9 @@ share/pixmaps/tmw.png
 @dirrm %%DATADIR%%/data/help
 @dirrm %%DATADIR%%/data/graphics/tiles
 @dirrm %%DATADIR%%/data/graphics/sprites
+@dirrm %%DATADIR%%/data/graphics/images/ambient
 @dirrm %%DATADIR%%/data/graphics/images
+@dirrm %%DATADIR%%/data/graphics/items
 @dirrm %%DATADIR%%/data/graphics/gui
 @dirrm %%DATADIR%%/data/graphics
 @dirrm %%DATADIR%%/data