- Update to 0.5.5

3 files changed, 193 insertions, 159 deletions

diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index 093e43d3bccf..e5ab7dccb8b0 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nazghul
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.5.5
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -21,8 +20,13 @@ USE_SDL=	sdl image
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+LDFLAGS+=	-lpng
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	${REINPLACE_CMD} -i "" 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/scheme.c
 
+post-configure:
+	${REINPLACE_CMD} -i "" -e 's|^LDFLAGS =*|LDFLAGS =-lpng|g' ${WRKSRC}/src/Makefile
+
 .include <bsd.port.mk>
diff --git a/games/nazghul/distinfo b/games/nazghul/distinfo
index 991256897a14..9a66d0c190dd 100644
--- a/games/nazghul/distinfo
+++ b/games/nazghul/distinfo
@@ -1,3 +1,3 @@
-MD5 (nazghul-0.5.4.tar.gz) = fa94fa1f82dbdf61e1544dbe1cdeecf1
-SHA256 (nazghul-0.5.4.tar.gz) = 83e7c30e7d869cac578d14b030d4b76c95d28e752d8ec41a5190253a72383c18
-SIZE (nazghul-0.5.4.tar.gz) = 1588505
+MD5 (nazghul-0.5.5.tar.gz) = 8ab410c2fe7ba8827898d2604a18372a
+SHA256 (nazghul-0.5.5.tar.gz) = 1488e4d1f1f6e2c28812a1c9bca68e3101e7558b215e915614f498c655d379e0
+SIZE (nazghul-0.5.5.tar.gz) = 2217273
diff --git a/games/nazghul/pkg-plist b/games/nazghul/pkg-plist
index 31586e6bef3a..c35cf799904b 100644
--- a/games/nazghul/pkg-plist
+++ b/games/nazghul/pkg-plist
@@ -1,228 +1,258 @@
-bin/nazghul
 bin/haxima.sh
+bin/nazghul
 %%DATADIR%%/haxima/abandoned-cellar.scm
-%%DATADIR%%/haxima/green-tower-lower.scm
-%%DATADIR%%/haxima/portcullis.scm
 %%DATADIR%%/haxima/abandoned-farm.scm
-%%DATADIR%%/haxima/green-tower.scm
-%%DATADIR%%/haxima/potions.png
 %%DATADIR%%/haxima/abe.scm
-%%DATADIR%%/haxima/gregor.scm
-%%DATADIR%%/haxima/potions.scm
+%%DATADIR%%/haxima/abigail.scm
 %%DATADIR%%/haxima/ability.scm
-%%DATADIR%%/haxima/gregors-hut.scm
-%%DATADIR%%/haxima/pre-entry-hooks.scm
 %%DATADIR%%/haxima/absalot.scm
-%%DATADIR%%/haxima/gwen.scm
-%%DATADIR%%/haxima/prices.scm
 %%DATADIR%%/haxima/addons.png
-%%DATADIR%%/haxima/hackle.scm
-%%DATADIR%%/haxima/prison.scm
+%%DATADIR%%/haxima/adornments.png
 %%DATADIR%%/haxima/ai.scm
-%%DATADIR%%/haxima/start-new-game.scm
-%%DATADIR%%/haxima/raise-merciful-death.scm
 %%DATADIR%%/haxima/alchemist.scm
-%%DATADIR%%/haxima/henry.scm
-%%DATADIR%%/haxima/reagents.png
 %%DATADIR%%/haxima/alex.scm
-%%DATADIR%%/haxima/horse.wav
-%%DATADIR%%/haxima/reagents.scm
 %%DATADIR%%/haxima/altar-room.scm
-%%DATADIR%%/haxima/ifc.scm
-%%DATADIR%%/haxima/road_to_absalot.scm
 %%DATADIR%%/haxima/amy.scm
-%%DATADIR%%/haxima/ilya.scm
-%%DATADIR%%/haxima/roland.scm
+%%DATADIR%%/haxima/anaxes.scm
 %%DATADIR%%/haxima/ancient-derelict.scm
-%%DATADIR%%/haxima/ini.scm
-%%DATADIR%%/haxima/rowing.wav
 %%DATADIR%%/haxima/angela.scm
-%%DATADIR%%/haxima/init.scm
-%%DATADIR%%/haxima/rune.png
 %%DATADIR%%/haxima/angriss-lair.scm
-%%DATADIR%%/haxima/items.scm
-%%DATADIR%%/haxima/runes.scm
 %%DATADIR%%/haxima/angriss.scm
-%%DATADIR%%/haxima/jake.scm
-%%DATADIR%%/haxima/scrolls.png
 %%DATADIR%%/haxima/ankh-shrine.scm
-%%DATADIR%%/haxima/jeffreys.scm
-%%DATADIR%%/haxima/scrolls.scm
 %%DATADIR%%/haxima/anne.scm
-%%DATADIR%%/haxima/jess.scm
-%%DATADIR%%/haxima/selene.scm
 %%DATADIR%%/haxima/arms.png
-%%DATADIR%%/haxima/jewelry.png
-%%DATADIR%%/haxima/shapes.png
 %%DATADIR%%/haxima/arms.scm
-%%DATADIR%%/haxima/jewelry.scm
-%%DATADIR%%/haxima/shard.scm
-%%DATADIR%%/haxima/bakup.scm
-%%DATADIR%%/haxima/jim.scm
-%%DATADIR%%/haxima/shroom.scm
+%%DATADIR%%/haxima/bandit-hideout.scm
 %%DATADIR%%/haxima/bart.scm
-%%DATADIR%%/haxima/joel.scm
-%%DATADIR%%/haxima/silas.scm
 %%DATADIR%%/haxima/beds.scm
-%%DATADIR%%/haxima/jones.scm
-%%DATADIR%%/haxima/slimy-cavern.scm
+%%DATADIR%%/haxima/bigobjects.png
 %%DATADIR%%/haxima/bill.scm
-%%DATADIR%%/haxima/jorn.scm
-%%DATADIR%%/haxima/slimy-cavern-zones.scm
 %%DATADIR%%/haxima/bim.scm
-%%DATADIR%%/haxima/kalcifax.scm
-%%DATADIR%%/haxima/slywan.scm
+%%DATADIR%%/haxima/blendterrains.scm
+%%DATADIR%%/haxima/bodies.png
 %%DATADIR%%/haxima/bole.scm
-%%DATADIR%%/haxima/kama.scm
-%%DATADIR%%/haxima/sounds.scm
 %%DATADIR%%/haxima/books.png
-%%DATADIR%%/haxima/kathryn.scm
-%%DATADIR%%/haxima/special.png
 %%DATADIR%%/haxima/books.scm
-%%DATADIR%%/haxima/keep_crypt_mech.scm
-%%DATADIR%%/haxima/special.scm
 %%DATADIR%%/haxima/bridge.scm
-%%DATADIR%%/haxima/keep.scm
-%%DATADIR%%/haxima/species.scm
+%%DATADIR%%/haxima/brundegardt.scm
 %%DATADIR%%/haxima/camping-map.scm
-%%DATADIR%%/haxima/kobj.scm
-%%DATADIR%%/haxima/spells.scm
 %%DATADIR%%/haxima/cannon.wav
-%%DATADIR%%/haxima/kraken-lakes.scm
-%%DATADIR%%/haxima/spider.scm
+%%DATADIR%%/haxima/cast-ui.scm
+%%DATADIR%%/haxima/clothes.png
+%%DATADIR%%/haxima/combat-maps.scm
+%%DATADIR%%/haxima/containers.scm
+%%DATADIR%%/haxima/conv.scm
+%%DATADIR%%/haxima/crypt.scm
+%%DATADIR%%/haxima/cursor.png
 %%DATADIR%%/haxima/chanticleer.scm
-%%DATADIR%%/haxima/kun.scm
-%%DATADIR%%/haxima/splash.png
 %%DATADIR%%/haxima/charset.png
-%%DATADIR%%/haxima/lever.scm
-%%DATADIR%%/haxima/sprite-sets.scm
 %%DATADIR%%/haxima/chester.scm
+%%DATADIR%%/haxima/damage.wav
+%%DATADIR%%/haxima/dank-cave.scm
+%%DATADIR%%/haxima/demon-gate.scm
+%%DATADIR%%/haxima/dennis.scm
+%%DATADIR%%/haxima/deric.scm
+%%DATADIR%%/haxima/door.scm
+%%DATADIR%%/haxima/doris.scm
+%%DATADIR%%/haxima/douglas.scm
+%%DATADIR%%/haxima/drawbridge.scm
+%%DATADIR%%/haxima/earl.scm
+%%DATADIR%%/haxima/eastpass.scm
+%%DATADIR%%/haxima/edge-spawn.scm
+%%DATADIR%%/haxima/edward.scm
+%%DATADIR%%/haxima/effects.png
+%%DATADIR%%/haxima/effects.scm
+%%DATADIR%%/haxima/enchanter.scm
+%%DATADIR%%/haxima/enchanters-tower-mech.scm
+%%DATADIR%%/haxima/enchanters-tower-zones.scm
+%%DATADIR%%/haxima/enchanters-tower.scm
+%%DATADIR%%/haxima/endless-deeps-mech.scm
+%%DATADIR%%/haxima/endless-deeps.scm
+%%DATADIR%%/haxima/engineer.scm
+%%DATADIR%%/haxima/engineers-hut.scm
+%%DATADIR%%/haxima/enter_moongate.wav
+%%DATADIR%%/haxima/eye-of-brune.scm
+%%DATADIR%%/haxima/fields.scm
+%%DATADIR%%/haxima/fing.scm
+%%DATADIR%%/haxima/fire_sea.scm
+%%DATADIR%%/haxima/food.png
+%%DATADIR%%/haxima/food.scm
+%%DATADIR%%/haxima/forsaken-prison.scm
+%%DATADIR%%/haxima/frame.png
+%%DATADIR%%/haxima/game.scm
+%%DATADIR%%/haxima/gamestart-mech.scm
+%%DATADIR%%/haxima/gamestart.scm
+%%DATADIR%%/haxima/gate-guard.scm
+%%DATADIR%%/haxima/gen.scm
+%%DATADIR%%/haxima/generic-mech.scm
+%%DATADIR%%/haxima/ghertie.scm
+%%DATADIR%%/haxima/gholet.scm
+%%DATADIR%%/haxima/glasdrin.scm
+%%DATADIR%%/haxima/goblin-kingdoms.scm
+%%DATADIR%%/haxima/green-tower-lower.scm
+%%DATADIR%%/haxima/green-tower.scm
+%%DATADIR%%/haxima/gregor.scm
+%%DATADIR%%/haxima/gregors-hut.scm
+%%DATADIR%%/haxima/gwen.scm
+%%DATADIR%%/haxima/hackle.scm
+%%DATADIR%%/haxima/henry.scm
+%%DATADIR%%/haxima/hidden.scm
+%%DATADIR%%/haxima/hirespeople.png
+%%DATADIR%%/haxima/horse.wav
+%%DATADIR%%/haxima/humanoids.png
+%%DATADIR%%/haxima/ifc.scm
+%%DATADIR%%/haxima/ilya.scm
+%%DATADIR%%/haxima/ini.scm
+%%DATADIR%%/haxima/init.scm
+%%DATADIR%%/haxima/items.scm
+%%DATADIR%%/haxima/jake.scm
+%%DATADIR%%/haxima/jeffreys.scm
+%%DATADIR%%/haxima/jess.scm
+%%DATADIR%%/haxima/jewelry.png
+%%DATADIR%%/haxima/jewelry.scm
+%%DATADIR%%/haxima/jim.scm
+%%DATADIR%%/haxima/joel.scm
+%%DATADIR%%/haxima/jones.scm
+%%DATADIR%%/haxima/jorn.scm
+%%DATADIR%%/haxima/kalcifax.scm
+%%DATADIR%%/haxima/kama.scm
+%%DATADIR%%/haxima/kathryn.scm
+%%DATADIR%%/haxima/keep.scm
+%%DATADIR%%/haxima/keep_crypt_mech.scm
+%%DATADIR%%/haxima/kern-init.scm
+%%DATADIR%%/haxima/keys.scm
+%%DATADIR%%/haxima/kobj.scm
+%%DATADIR%%/haxima/kraken-lakes.scm
+%%DATADIR%%/haxima/kun.scm
+%%DATADIR%%/haxima/landslide.scm
+%%DATADIR%%/haxima/lever.scm
 %%DATADIR%%/haxima/lia.scm
-%%DATADIR%%/haxima/sprites.scm
-%%DATADIR%%/haxima/combat-maps.scm
 %%DATADIR%%/haxima/lich-tomb.scm
-%%DATADIR%%/haxima/step.scm
-%%DATADIR%%/haxima/containers.scm
 %%DATADIR%%/haxima/loc.scm
-%%DATADIR%%/haxima/steward.scm
-%%DATADIR%%/haxima/conv.scm
 %%DATADIR%%/haxima/lost-halls.scm
-%%DATADIR%%/haxima/talking-ankh.scm
-%%DATADIR%%/haxima/crypt.scm
 %%DATADIR%%/haxima/luximene.scm
-%%DATADIR%%/haxima/tblit.scm
 %%DATADIR%%/haxima/main-menu.scm
-%%DATADIR%%/haxima/terrains.scm
-%%DATADIR%%/haxima/damage.wav
-%%DATADIR%%/haxima/terrain-to-ptype.scm
-%%DATADIR%%/haxima/dank-cave.scm
 %%DATADIR%%/haxima/mans-hideout.scm
-%%DATADIR%%/haxima/tetzl.scm
-%%DATADIR%%/haxima/demon-gate.scm
+%%DATADIR%%/haxima/map.png
 %%DATADIR%%/haxima/may.scm
-%%DATADIR%%/haxima/the-man.scm
-%%DATADIR%%/haxima/dennis.scm
 %%DATADIR%%/haxima/meaney.scm
-%%DATADIR%%/haxima/thiefs_den.scm
-%%DATADIR%%/haxima/deric.scm
 %%DATADIR%%/haxima/melvin.scm
-%%DATADIR%%/haxima/thorald.scm
-%%DATADIR%%/haxima/door.scm
 %%DATADIR%%/haxima/merciful-death.scm
-%%DATADIR%%/haxima/thud.scm
-%%DATADIR%%/haxima/doris.scm
 %%DATADIR%%/haxima/mesmeme.scm
-%%DATADIR%%/haxima/timer.scm
-%%DATADIR%%/haxima/douglas.scm
 %%DATADIR%%/haxima/miggs.scm
-%%DATADIR%%/haxima/tools.png
-%%DATADIR%%/haxima/drawbridge.scm
+%%DATADIR%%/haxima/mimic.scm
 %%DATADIR%%/haxima/money.png
-%%DATADIR%%/haxima/tools.scm
-%%DATADIR%%/haxima/earl.scm
 %%DATADIR%%/haxima/money.scm
-%%DATADIR%%/haxima/tooth.scm
-%%DATADIR%%/haxima/eastpass.scm
 %%DATADIR%%/haxima/monster-generator.scm
-%%DATADIR%%/haxima/town-entry.scm
-%%DATADIR%%/haxima/edge-spawn.scm
+%%DATADIR%%/haxima/monsters.png
+%%DATADIR%%/haxima/moon.scm
 %%DATADIR%%/haxima/moongate-clearing.scm
-%%DATADIR%%/haxima/traps_1.scm
-%%DATADIR%%/haxima/effects.scm
 %%DATADIR%%/haxima/moongate.scm
-%%DATADIR%%/haxima/traps_2.scm
-%%DATADIR%%/haxima/enchanter.scm
-%%DATADIR%%/haxima/moon.scm
-%%DATADIR%%/haxima/traps_3_mechs.scm
-%%DATADIR%%/haxima/enchanters-tower.scm
 %%DATADIR%%/haxima/moons.png
-%%DATADIR%%/haxima/traps_3.scm
-%%DATADIR%%/haxima/enchanters-tower-zones.scm
 %%DATADIR%%/haxima/mouse.scm
-%%DATADIR%%/haxima/traps_4.scm
-%%DATADIR%%/haxima/engineer.scm
 %%DATADIR%%/haxima/mushroom-cave.scm
-%%DATADIR%%/haxima/treasury.scm
-%%DATADIR%%/haxima/engineers-hut.scm
+%%DATADIR%%/haxima/nate.scm
 %%DATADIR%%/haxima/naz.scm
-%%DATADIR%%/haxima/trigrave.scm
-%%DATADIR%%/haxima/enter_moongate.wav
 %%DATADIR%%/haxima/necromancer.scm
-%%DATADIR%%/haxima/troll.scm
-%%DATADIR%%/haxima/fields.scm
 %%DATADIR%%/haxima/necromancers-lair.scm
-%%DATADIR%%/haxima/tutorial_cave.scm
-%%DATADIR%%/haxima/fing.scm
+%%DATADIR%%/haxima/newfolks.png
+%%DATADIR%%/haxima/newmonst.png
+%%DATADIR%%/haxima/newterrain.png
 %%DATADIR%%/haxima/nossifer.scm
-%%DATADIR%%/haxima/tutorial.scm
-%%DATADIR%%/haxima/fire_sea.scm
 %%DATADIR%%/haxima/npc-types.scm
-%%DATADIR%%/haxima/tutorial_town.scm
-%%DATADIR%%/haxima/food.png
 %%DATADIR%%/haxima/objs.scm
-%%DATADIR%%/haxima/tutorial_wilderness.scm
-%%DATADIR%%/haxima/food.scm
 %%DATADIR%%/haxima/occs.scm
-%%DATADIR%%/haxima/urt.scm
-%%DATADIR%%/haxima/forsaken-prison.scm
 %%DATADIR%%/haxima/old-absalot.scm
-%%DATADIR%%/haxima/vehicles.scm
-%%DATADIR%%/haxima/frame.png
 %%DATADIR%%/haxima/old-mine.scm
-%%DATADIR%%/haxima/void-temple.scm
-%%DATADIR%%/haxima/game.scm
 %%DATADIR%%/haxima/oparine.scm
-%%DATADIR%%/haxima/walk.wav
-%%DATADIR%%/haxima/gate-guard.scm
 %%DATADIR%%/haxima/oscar.scm
-%%DATADIR%%/haxima/warritrix.scm
-%%DATADIR%%/haxima/generic-mech.scm
 %%DATADIR%%/haxima/palette.scm
-%%DATADIR%%/haxima/westpass.scm
-%%DATADIR%%/haxima/gen.scm
 %%DATADIR%%/haxima/parties.scm
-%%DATADIR%%/haxima/yellow-slime.scm
-%%DATADIR%%/haxima/ghertie.scm
 %%DATADIR%%/haxima/patch.scm
-%%DATADIR%%/haxima/zane.scm
-%%DATADIR%%/haxima/gholet.scm
-%%DATADIR%%/haxima/player.scm
-%%DATADIR%%/haxima/zones.scm
-%%DATADIR%%/haxima/glasdrin.scm
+%%DATADIR%%/haxima/pitfalls.png
+%%DATADIR%%/haxima/pitfalls.scm
 %%DATADIR%%/haxima/poor-house.scm
-%%DATADIR%%/haxima/signs.png
-%%DATADIR%%/haxima/goblin-kingdoms.scm
 %%DATADIR%%/haxima/portals.scm
+%%DATADIR%%/haxima/portcullis.scm
+%%DATADIR%%/haxima/potions.png
+%%DATADIR%%/haxima/potions.scm
+%%DATADIR%%/haxima/powers.scm
+%%DATADIR%%/haxima/pre-entry-hooks.scm
+%%DATADIR%%/haxima/prices.scm
+%%DATADIR%%/haxima/prison.scm
+%%DATADIR%%/haxima/r2a_mech.scm
+%%DATADIR%%/haxima/raise-merciful-death.scm
+%%DATADIR%%/haxima/reagents.png
+%%DATADIR%%/haxima/reagents.scm
+%%DATADIR%%/haxima/road_to_absalot.scm
+%%DATADIR%%/haxima/roland.scm
+%%DATADIR%%/haxima/rowing.wav
+%%DATADIR%%/haxima/rune.png
+%%DATADIR%%/haxima/runes.scm
 %%DATADIR%%/haxima/runestones.png
-%%DATADIR%%/haxima/newmonst.png
-%%DATADIR%%/haxima/newfolks.png
+%%DATADIR%%/haxima/scrolls.png
+%%DATADIR%%/haxima/scrolls.scm
+%%DATADIR%%/haxima/selene.scm
+%%DATADIR%%/haxima/shapes.png
+%%DATADIR%%/haxima/shard.scm
+%%DATADIR%%/haxima/shroom.scm
+%%DATADIR%%/haxima/signs.png
+%%DATADIR%%/haxima/silas.scm
+%%DATADIR%%/haxima/slimy-cavern-zones.scm
+%%DATADIR%%/haxima/slimy-cavern.scm
+%%DATADIR%%/haxima/slywan.scm
+%%DATADIR%%/haxima/sounds.scm
+%%DATADIR%%/haxima/special.png
+%%DATADIR%%/haxima/special.scm
+%%DATADIR%%/haxima/species.scm
+%%DATADIR%%/haxima/spells.png
+%%DATADIR%%/haxima/spells.scm
+%%DATADIR%%/haxima/spider.scm
+%%DATADIR%%/haxima/splash.png
+%%DATADIR%%/haxima/sprite-sets.scm
+%%DATADIR%%/haxima/sprites.scm
+%%DATADIR%%/haxima/start-new-game.scm
+%%DATADIR%%/haxima/step.scm
+%%DATADIR%%/haxima/steward.scm
+%%DATADIR%%/haxima/talking-ankh.scm
+%%DATADIR%%/haxima/tblit.scm
+%%DATADIR%%/haxima/terrain-to-ptype.scm
+%%DATADIR%%/haxima/terrains.scm
+%%DATADIR%%/haxima/tetzl.scm
+%%DATADIR%%/haxima/the-man.scm
+%%DATADIR%%/haxima/thiefs_den.scm
+%%DATADIR%%/haxima/thorald.scm
+%%DATADIR%%/haxima/thud.scm
+%%DATADIR%%/haxima/tim.scm
+%%DATADIR%%/haxima/timer.scm
+%%DATADIR%%/haxima/tools.png
+%%DATADIR%%/haxima/tools.scm
+%%DATADIR%%/haxima/tooth.scm
 %%DATADIR%%/haxima/tower.png
-%%DATADIR%%/haxima/newterrain.png
-%%DATADIR%%/haxima/hidden.scm
-%%DATADIR%%/haxima/blendterrains.scm
-%%DATADIR%%/haxima/endless-deeps-mech.scm
-%%DATADIR%%/haxima/endless-deeps.scm
-%%DATADIR%%/haxima/abigail.scm
-%%DATADIR%%/haxima/r2a_mech.scm
+%%DATADIR%%/haxima/town-entry.scm
+%%DATADIR%%/haxima/traps.scm
+%%DATADIR%%/haxima/traps_1.scm
+%%DATADIR%%/haxima/traps_2.scm
+%%DATADIR%%/haxima/traps_3.scm
+%%DATADIR%%/haxima/traps_3_mechs.scm
+%%DATADIR%%/haxima/traps_4.scm
+%%DATADIR%%/haxima/treasury.scm
+%%DATADIR%%/haxima/trigrave.scm
+%%DATADIR%%/haxima/troll.scm
+%%DATADIR%%/haxima/tutorial.scm
+%%DATADIR%%/haxima/tutorial_cave.scm
+%%DATADIR%%/haxima/tutorial_town.scm
+%%DATADIR%%/haxima/tutorial_wilderness.scm
+%%DATADIR%%/haxima/urt.scm
+%%DATADIR%%/haxima/vehicles.scm
+%%DATADIR%%/haxima/void-temple.scm
+%%DATADIR%%/haxima/walk.wav
+%%DATADIR%%/haxima/warritrix.scm
+%%DATADIR%%/haxima/weather-vane.scm
+%%DATADIR%%/haxima/westpass.scm
+%%DATADIR%%/haxima/wind-bridge.scm
+%%DATADIR%%/haxima/yellow-slime.scm
+%%DATADIR%%/haxima/zane.scm
+%%DATADIR%%/haxima/zones.scm
 @dirrm %%DATADIR%%/haxima
 @dirrm %%DATADIR%%